Use new connect syntax

Change-Id: I0b48c6cba12902d910c4f586fa105a13d084a437
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>

diff --git a/examples/echoclient/echoclient.cpp b/examples/echoclient/echoclient.cpp
index f7ffae3..1ea3006 100644 (file)
--- a/examples/echoclient/echoclient.cpp
+++ b/examples/echoclient/echoclient.cpp
@@ -49,8 +49,8 @@ EchoClient::EchoClient(const QUrl &url, QObject *parent) :
     m_webSocket(),
     m_url(url)
 {
-    connect(&m_webSocket, SIGNAL(connected()), this, SLOT(onConnected()));
-    connect(&m_webSocket, SIGNAL(disconnected()), this, SIGNAL(closed()));
+    connect(&m_webSocket, &QWebSocket::connected, this, &EchoClient::onConnected);
+    connect(&m_webSocket, &QWebSocket::disconnected, this, &EchoClient::closed);
     m_webSocket.open(QUrl(url));
 }
 //! [constructor]
@@ -59,8 +59,8 @@ EchoClient::EchoClient(const QUrl &url, QObject *parent) :
 void EchoClient::onConnected()
 {
     qDebug() << "Websocket connected";
-    connect(&m_webSocket, SIGNAL(textMessageReceived(QString)), this,
-            SLOT(onTextMessageReceived(QString)));
+    connect(&m_webSocket, &QWebSocket::textMessageReceived,
+            this, &EchoClient::onTextMessageReceived);
     m_webSocket.write("Hello, world!");
 }
 //! [onConnected]

diff --git a/examples/echoclient/main.cpp b/examples/echoclient/main.cpp
index a13097d..e6a3a5d 100644 (file)
--- a/examples/echoclient/main.cpp
+++ b/examples/echoclient/main.cpp
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
     EchoClient client(QUrl("ws://localhost:1234"));
-    QObject::connect(&client, SIGNAL(closed()), &a, SLOT(quit()));
+    QObject::connect(&client, &EchoClient::closed, &a, &QCoreApplication::quit);
 
     Q_UNUSED(client);
 

diff --git a/examples/echoserver/echoserver.cpp b/examples/echoserver/echoserver.cpp
index ca0e09f..e1802de 100644 (file)
--- a/examples/echoserver/echoserver.cpp
+++ b/examples/echoserver/echoserver.cpp
@@ -54,8 +54,9 @@ EchoServer::EchoServer(quint16 port, QObject *parent) :
 {
     if (m_pWebSocketServer->listen(QHostAddress::Any, port)) {
         qDebug() << "Echoserver listening on port" << port;
-        connect(m_pWebSocketServer, SIGNAL(newConnection()), this, SLOT(onNewConnection()));
-        connect(m_pWebSocketServer, SIGNAL(closed()), this, SIGNAL(closed()));
+        connect(m_pWebSocketServer, &QWebSocketServer::newConnection,
+                this, &EchoServer::onNewConnection);
+        connect(m_pWebSocketServer, &QWebSocketServer::closed, this, &EchoServer::closed);
     }
 }
 //! [constructor]
@@ -74,10 +75,9 @@ void EchoServer::onNewConnection()
 {
     QWebSocket *pSocket = m_pWebSocketServer->nextPendingConnection();
 
-    connect(pSocket, SIGNAL(textMessageReceived(QString)), this, SLOT(processMessage(QString)));
-    connect(pSocket, SIGNAL(binaryMessageReceived(QByteArray)), this,
-            SLOT(processBinaryMessage(QByteArray)));
-    connect(pSocket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
+    connect(pSocket, &QWebSocket::textMessageReceived, this, &EchoServer::processMessage);
+    connect(pSocket, &QWebSocket::binaryMessageReceived, this, &EchoServer::processBinaryMessage);
+    connect(pSocket, &QWebSocket::disconnected, this, &EchoServer::socketDisconnected);
 
     m_clients << pSocket;
 }

diff --git a/examples/echoserver/main.cpp b/examples/echoserver/main.cpp
index def405f..d252a19 100644 (file)
--- a/examples/echoserver/main.cpp
+++ b/examples/echoserver/main.cpp
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
     EchoServer *server = new EchoServer(1234);
-    QObject::connect(server, SIGNAL(closed()), &a, SLOT(quit()));
+    QObject::connect(server, &EchoServer::closed, &a, &QCoreApplication::quit);
 
     return a.exec();
 }

diff --git a/examples/simplechat/chatserver.cpp b/examples/simplechat/chatserver.cpp
index 44f2748..ca36641 100644 (file)
--- a/examples/simplechat/chatserver.cpp
+++ b/examples/simplechat/chatserver.cpp
@@ -56,7 +56,8 @@ ChatServer::ChatServer(quint16 port, QObject *parent) :
     if (m_pWebSocketServer->listen(QHostAddress::Any, port))
     {
         qDebug() << "Chat Server listening on port" << port;
-        connect(m_pWebSocketServer, SIGNAL(newConnection()), this, SLOT(onNewConnection()));
+        connect(m_pWebSocketServer, &QWebSocketServer::newConnection,
+                this, &ChatServer::onNewConnection);
     }
 }
 //! [constructor]
@@ -66,8 +67,8 @@ void ChatServer::onNewConnection()
 {
     QWebSocket *pSocket = m_pWebSocketServer->nextPendingConnection();
 
-    connect(pSocket, SIGNAL(textMessageReceived(QString)), this, SLOT(processMessage(QString)));
-    connect(pSocket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
+    connect(pSocket, &QWebSocket::textMessageReceived, this, &ChatServer::processMessage);
+    connect(pSocket, &QWebSocket::disconnected, this, &ChatServer::socketDisconnected);
 
     m_clients << pSocket;
 }

diff --git a/examples/sslechoclient/sslechoclient.cpp b/examples/sslechoclient/sslechoclient.cpp
index 8d38b92..25ab17e 100644 (file)
--- a/examples/sslechoclient/sslechoclient.cpp
+++ b/examples/sslechoclient/sslechoclient.cpp
@@ -48,7 +48,7 @@ SslEchoClient::SslEchoClient(const QUrl &url, QObject *parent) :
     QObject(parent),
     m_webSocket()
 {
-    connect(&m_webSocket, SIGNAL(connected()), this, SLOT(onConnected()));
+    connect(&m_webSocket, &QWebSocket::connected, this, &SslEchoClient::onConnected);
     m_webSocket.open(QUrl(url));
 }
 //! [constructor]
@@ -57,8 +57,8 @@ SslEchoClient::SslEchoClient(const QUrl &url, QObject *parent) :
 void SslEchoClient::onConnected()
 {
     qDebug() << "Websocket connected";
-    connect(&m_webSocket, SIGNAL(textMessageReceived(QString)), this,
-            SLOT(onTextMessageReceived(QString)));
+    connect(&m_webSocket, &QWebSocket::textMessageReceived,
+            this, &SslEchoClient::onTextMessageReceived);
     m_webSocket.write("Hello, world!");
 }
 //! [onConnected]

diff --git a/examples/sslechoserver/sslechoserver.cpp b/examples/sslechoserver/sslechoserver.cpp
index f79825d..30d25d6 100644 (file)
--- a/examples/sslechoserver/sslechoserver.cpp
+++ b/examples/sslechoserver/sslechoserver.cpp
@@ -75,7 +75,8 @@ SslEchoServer::SslEchoServer(quint16 port, QObject *parent) :
     if (m_pWebSocketServer->listen(QHostAddress::Any, port))
     {
         qDebug() << "SSL Echo Server listening on port" << port;
-        connect(m_pWebSocketServer, SIGNAL(newConnection()), this, SLOT(onNewConnection()));
+        connect(m_pWebSocketServer, &QWebSocketServer::newConnection,
+                this, &SslEchoServer::onNewConnection);
     }
 }
 //! [constructor]
@@ -87,10 +88,11 @@ void SslEchoServer::onNewConnection()
 
     qDebug() << "Client connected:" << pSocket->peerName() << pSocket->origin();
 
-    connect(pSocket, SIGNAL(textMessageReceived(QString)), this, SLOT(processMessage(QString)));
-    connect(pSocket, SIGNAL(binaryMessageReceived(QByteArray)), this, SLOT(processBinaryMessage(QByteArray)));
-    connect(pSocket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
-    //connect(pSocket, SIGNAL(pong(quint64)), this, SLOT(processPong(quint64)));
+    connect(pSocket, &QWebSocket::textMessageReceived, this, &SslEchoServer::processMessage);
+    connect(pSocket, &QWebSocket::binaryMessageReceived,
+            this, &SslEchoServer::processBinaryMessage);
+    connect(pSocket, &QWebSocket::disconnected, this, &SslEchoServer::socketDisconnected);
+    //connect(pSocket, &QWebSocket::pong, this, &SslEchoServer::processPong);
 
     m_clients << pSocket;
 }