From 624c6fe6ee9a1fd5ca1cf787e5cddc73e8d57474 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sat, 4 Jun 2016 22:55:17 +0300 Subject: [PATCH] QmlDebug: Use Qt5-style connects The heavy lifting was done by clazy. Change-Id: I94f5c85388af1b8e06128800090222a6b64f5191 Reviewed-by: Thomas Hartmann Reviewed-by: Ulf Hermann --- src/libs/qmldebug/qmldebugclient.cpp | 3 ++- src/libs/qmldebug/qmldebugclient.h | 3 +-- src/libs/qmldebug/qpacketprotocol.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/qmldebug/qmldebugclient.cpp b/src/libs/qmldebug/qmldebugclient.cpp index aaf3de379f3..52ac357310e 100644 --- a/src/libs/qmldebug/qmldebugclient.cpp +++ b/src/libs/qmldebug/qmldebugclient.cpp @@ -385,7 +385,8 @@ void QmlDebugConnection::startLocalServer(const QString &fileName) d->server->deleteLater(); d->server = new QLocalServer(this); // QueuedConnection so that waitForNewConnection() returns true. - connect(d->server, SIGNAL(newConnection()), this, SLOT(newConnection()), Qt::QueuedConnection); + connect(d->server, &QLocalServer::newConnection, + this, &QmlDebugConnection::newConnection, Qt::QueuedConnection); d->server->listen(fileName); } diff --git a/src/libs/qmldebug/qmldebugclient.h b/src/libs/qmldebug/qmldebugclient.h index 3ea50acae5c..c8d03d56787 100644 --- a/src/libs/qmldebug/qmldebugclient.h +++ b/src/libs/qmldebug/qmldebugclient.h @@ -70,13 +70,12 @@ signals: void socketError(QAbstractSocket::SocketError error); void socketStateChanged(QAbstractSocket::SocketState state); -private slots: +private: void newConnection(); void socketConnected(); void socketDisconnected(); void protocolReadyRead(); -private: QScopedPointer d_ptr; }; diff --git a/src/libs/qmldebug/qpacketprotocol.cpp b/src/libs/qmldebug/qpacketprotocol.cpp index 1365483e322..9364ffbbbff 100644 --- a/src/libs/qmldebug/qpacketprotocol.cpp +++ b/src/libs/qmldebug/qpacketprotocol.cpp @@ -119,7 +119,7 @@ signals: void readyRead(); void invalidPacket(); -public slots: +public: void aboutToClose() { inProgress.clear();