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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

4 files changed, 24 insertions, 23 deletions

diff --git a/examples/network/blockingfortuneclient/blockingclient.cpp b/examples/network/blockingfortuneclient/blockingclient.cpp
index 607215cf13..5a1500d084 100644
--- a/examples/network/blockingfortuneclient/blockingclient.cpp
+++ b/examples/network/blockingfortuneclient/blockingclient.cpp
@@ -96,20 +96,21 @@ BlockingClient::BlockingClient(QWidget *parent)
     buttonBox->addButton(getFortuneButton, QDialogButtonBox::ActionRole);
     buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
 
-    connect(getFortuneButton, SIGNAL(clicked()), this, SLOT(requestNewFortune()));
-    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
-
-    connect(hostLineEdit, SIGNAL(textChanged(QString)),
-            this, SLOT(enableGetFortuneButton()));
-    connect(portLineEdit, SIGNAL(textChanged(QString)),
-            this, SLOT(enableGetFortuneButton()));
+    connect(getFortuneButton, &QPushButton::clicked,
+            this, &BlockingClient::requestNewFortune);
+    connect(quitButton, &QPushButton::clicked,
+            this, &BlockingClient::close);
+
+    connect(hostLineEdit, &QLineEdit::textChanged,
+            this, &BlockingClient::enableGetFortuneButton);
+    connect(portLineEdit, &QLineEdit::textChanged,
+            this, &BlockingClient::enableGetFortuneButton);
+//! [0]
+    connect(&thread, &FortuneThread::newFortune,
+            this, &BlockingClient::showFortune);
+    connect(&thread, &FortuneThread::error,
+            this, &BlockingClient::displayError);
 //! [0]
-    connect(&thread, SIGNAL(newFortune(QString)),
-            this, SLOT(showFortune(QString)));
-//! [0] //! [1]
-    connect(&thread, SIGNAL(error(int,QString)),
-            this, SLOT(displayError(int,QString)));
-//! [1]
 
     QGridLayout *mainLayout = new QGridLayout;
     mainLayout->addWidget(hostLabel, 0, 0);
@@ -124,30 +125,30 @@ BlockingClient::BlockingClient(QWidget *parent)
     portLineEdit->setFocus();
 }
 
-//! [2]
+//! [1]
 void BlockingClient::requestNewFortune()
 {
     getFortuneButton->setEnabled(false);
     thread.requestNewFortune(hostLineEdit->text(),
                              portLineEdit->text().toInt());
 }
-//! [2]
+//! [1]
 
-//! [3]
+//! [2]
 void BlockingClient::showFortune(const QString &nextFortune)
 {
     if (nextFortune == currentFortune) {
         requestNewFortune();
         return;
     }
-//! [3]
+//! [2]
 
-//! [4]
+//! [3]
     currentFortune = nextFortune;
     statusLabel->setText(currentFortune);
     getFortuneButton->setEnabled(true);
 }
-//! [4]
+//! [3]
 
 void BlockingClient::displayError(int socketError, const QString &message)
 {
diff --git a/examples/network/blockingfortuneclient/blockingclient.h b/examples/network/blockingfortuneclient/blockingclient.h
index 2a2dd81b71..b8a7163160 100644
--- a/examples/network/blockingfortuneclient/blockingclient.h
+++ b/examples/network/blockingfortuneclient/blockingclient.h
@@ -69,7 +69,7 @@ class BlockingClient : public QWidget
     Q_OBJECT
 
 public:
-    BlockingClient(QWidget *parent = 0);
+    BlockingClient(QWidget *parent = nullptr);
 
 private slots:
     void requestNewFortune();
diff --git a/examples/network/blockingfortuneclient/fortunethread.cpp b/examples/network/blockingfortuneclient/fortunethread.cpp
index 67ac7ebfa5..24801436df 100644
--- a/examples/network/blockingfortuneclient/fortunethread.cpp
+++ b/examples/network/blockingfortuneclient/fortunethread.cpp
@@ -103,7 +103,7 @@ void FortuneThread::run()
 //! [6] //! [8]
 
         if (!socket.waitForConnected(Timeout)) {
-            emit error(socket.error(), socket.errorString());
+            emit error(socket.socketError(), socket.errorString());
             return;
         }
 //! [8] //! [11]
@@ -115,7 +115,7 @@ void FortuneThread::run()
 
         do {
             if (!socket.waitForReadyRead(Timeout)) {
-                emit error(socket.error(), socket.errorString());
+                emit error(socket.socketError(), socket.errorString());
                 return;
             }
 
diff --git a/examples/network/blockingfortuneclient/fortunethread.h b/examples/network/blockingfortuneclient/fortunethread.h
index 0cbc3961fc..b6b63d9319 100644
--- a/examples/network/blockingfortuneclient/fortunethread.h
+++ b/examples/network/blockingfortuneclient/fortunethread.h
@@ -61,7 +61,7 @@ class FortuneThread : public QThread
     Q_OBJECT
 
 public:
-    FortuneThread(QObject *parent = 0);
+    FortuneThread(QObject *parent = nullptr);
     ~FortuneThread();
 
     void requestNewFortune(const QString &hostName, quint16 port);