Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

2 files changed, 14 insertions, 12 deletions

diff --git a/examples/network/googlesuggest/googlesuggest.cpp b/examples/network/googlesuggest/googlesuggest.cpp
index d27beafd1e0..1ae515f5305 100644
--- a/examples/network/googlesuggest/googlesuggest.cpp
+++ b/examples/network/googlesuggest/googlesuggest.cpp
@@ -48,9 +48,9 @@
 **
 ****************************************************************************/
 
-//! [1]
 #include "googlesuggest.h"
 
+//! [1]
 const QString gsuggestUrl(QStringLiteral("http://google.com/complete/search?output=toolbar&q=%1"));
 //! [1]
 
@@ -74,16 +74,18 @@ GSuggestCompletion::GSuggestCompletion(QLineEdit *parent): QObject(parent), edit
 
     popup->installEventFilter(this);
 
-    connect(popup, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
-            SLOT(doneCompletion()));
+    connect(popup, &QTreeWidget::itemClicked,
+            this, &GSuggestCompletion::doneCompletion);
 
     timer.setSingleShot(true);
     timer.setInterval(500);
-    connect(&timer, SIGNAL(timeout()), SLOT(autoSuggest()));
-    connect(editor, SIGNAL(textEdited(QString)), &timer, SLOT(start()));
+    connect(&timer, &QTimer::timeout,
+            this, &GSuggestCompletion::autoSuggest);
+    connect(editor, &QLineEdit::textEdited,
+            &timer, QOverload<>::of(&QTimer::start));
 
-    connect(&networkManager, SIGNAL(finished(QNetworkReply*)),
-            this, SLOT(handleNetworkData(QNetworkReply*)));
+    connect(&networkManager, &QNetworkAccessManager::finished,
+            this, &GSuggestCompletion::handleNetworkData);
 
 }
 //! [2]
@@ -207,7 +209,7 @@ void GSuggestCompletion::preventSuggest()
 void GSuggestCompletion::handleNetworkData(QNetworkReply *networkReply)
 {
     QUrl url = networkReply->url();
-    if (networkReply->error() == QNetworkReply::NoError) {
+    if (networkReply->networkError() == QNetworkReply::NoError) {
         QVector<QString> choices;
 
         QByteArray response(networkReply->readAll());
diff --git a/examples/network/googlesuggest/searchbox.cpp b/examples/network/googlesuggest/searchbox.cpp
index d0bdb70daa1..9057c1ccdf8 100644
--- a/examples/network/googlesuggest/searchbox.cpp
+++ b/examples/network/googlesuggest/searchbox.cpp
@@ -57,11 +57,11 @@
 const QString gsearchUrl = QStringLiteral("http://www.google.com/search?q=%1");
 
 //! [1]
-SearchBox::SearchBox(QWidget *parent): QLineEdit(parent)
+SearchBox::SearchBox(QWidget *parent)
+    : QLineEdit(parent)
+    , completer(new GSuggestCompletion(this))
 {
-    completer = new GSuggestCompletion(this);
-
-    connect(this, SIGNAL(returnPressed()),this, SLOT(doSearch()));
+    connect(this, &SearchBox::returnPressed, this, &SearchBox::doSearch);
 
     setWindowTitle("Search with Google");