Use Qt5 connect style

Signed-off-by: Patrick José Pereira <[email protected]>
ethz-asl · Jun 21, 2018 · acd1816 · acd1816
1 parent 0ee8973
commit acd1816
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/FollowMe/FollowMe.cc b/src/FollowMe/FollowMe.cc
@@ -84,19 +84,19 @@ void FollowMe::_settingsChanged()
 void FollowMe::_enable()
 {
     connect(_toolbox->qgcPositionManager(),
-            SIGNAL(positionInfoUpdated(QGeoPositionInfo)),
+            &QGCPositionManager::positionInfoUpdated,
             this,
-            SLOT(_setGPSLocation(QGeoPositionInfo)));
+            &FollowMe::_setGPSLocation);
     _gcsMotionReportTimer.setInterval(_toolbox->qgcPositionManager()->updateInterval());
     _gcsMotionReportTimer.start();
 }
 
 void FollowMe::_disable()
 {
     disconnect(_toolbox->qgcPositionManager(),
-               SIGNAL(positionInfoUpdated(QGeoPositionInfo)),
+               &QGCPositionManager::positionInfoUpdated,
                this,
-               SLOT(_setGPSLocation(QGeoPositionInfo)));
+               &FollowMe::_setGPSLocation);
     _gcsMotionReportTimer.stop();
 }
 

diff --git a/src/QtLocationPlugin/QGeoCodeReplyQGC.cpp b/src/QtLocationPlugin/QGeoCodeReplyQGC.cpp
@@ -158,7 +158,7 @@ JasonMonger kMonger;
 QGeoCodeReplyQGC::QGeoCodeReplyQGC(QNetworkReply *reply, QObject *parent)
 :   QGeoCodeReply(parent), m_reply(reply)
 {
-    connect(m_reply, SIGNAL(finished()), this, SLOT(networkReplyFinished()));
+    connect(m_reply, &QNetworkReply::finished, this, &QGeoCodeReplyQGC::networkReplyFinished);
     connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)),
             this, SLOT(networkReplyError(QNetworkReply::NetworkError)));
 

diff --git a/src/QtLocationPlugin/QGeoCodingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoCodingManagerEngineQGC.cpp
@@ -125,7 +125,7 @@ QGeoCodeReply *QGeoCodingManagerEngineQGC::geocode(const QString &address, int l
 
     QGeoCodeReplyQGC *geocodeReply = new QGeoCodeReplyQGC(reply);
 
-    connect(geocodeReply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    connect(geocodeReply, &QGeoCodeReply::finished, this, &QGeoCodingManagerEngineQGC::replyFinished);
     connect(geocodeReply, SIGNAL(error(QGeoCodeReply::Error,QString)),
             this, SLOT(replyError(QGeoCodeReply::Error,QString)));
 
@@ -156,7 +156,7 @@ QGeoCodeReply *QGeoCodingManagerEngineQGC::reverseGeocode(const QGeoCoordinate &
 
     QGeoCodeReplyQGC *geocodeReply = new QGeoCodeReplyQGC(reply);
 
-    connect(geocodeReply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    connect(geocodeReply, &QGeoCodeReply::finished, this, &QGeoCodingManagerEngineQGC::replyFinished);
     connect(geocodeReply, SIGNAL(error(QGeoCodeReply::Error,QString)),
             this, SLOT(replyError(QGeoCodeReply::Error,QString)));
 

diff --git a/src/QtLocationPlugin/QGeoMapReplyQGC.cpp b/src/QtLocationPlugin/QGeoMapReplyQGC.cpp
@@ -189,7 +189,7 @@ QGeoTiledMapReplyQGC::cacheError(QGCMapTask::TaskType type, QString /*errorStrin
 #endif
         _reply = _networkManager->get(_request);
         _reply->setParent(0);
-        connect(_reply, SIGNAL(finished()),                         this, SLOT(networkReplyFinished()));
+        connect(_reply, &QNetworkReply::finished,                         this, &QGeoTiledMapReplyQGC::networkReplyFinished);
         connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(networkReplyError(QNetworkReply::NetworkError)));
 #if !defined(__mobile__)
         _networkManager->setProxy(proxy);

diff --git a/src/qgcunittest/TCPLinkTest.cc b/src/qgcunittest/TCPLinkTest.cc
@@ -130,7 +130,7 @@ void TCPLinkTest::_connectSucceed_test(void)
 
     // We emit this signal such that it will be queued and run on the TCPLink thread. This in turn
     // allows the TCPLink object to pump the bytes through.
-    connect(this, SIGNAL(waitForBytesWritten(int)), _link, SLOT(waitForBytesWritten(int)));
+    connect(this, &TCPLinkTest::waitForBytesWritten, _link, &TCPLink::waitForBytesWritten);
     emit waitForBytesWritten(1000);
 
     // Check for loopback, both from signal received and actual bytes returned

diff --git a/src/qgcunittest/TCPLoopBackServer.cc b/src/qgcunittest/TCPLoopBackServer.cc
@@ -30,7 +30,7 @@ void TCPLoopBackServer::run(void)
     _tcpServer = new QTcpServer(this);
     Q_CHECK_PTR(_tcpServer);
 
-    bool connected = QObject::connect(_tcpServer, SIGNAL(newConnection()), this, SLOT(_newConnection()));
+    bool connected = QObject::connect(_tcpServer, &QTcpServer::newConnection, this, &TCPLoopBackServer::_newConnection);
     Q_ASSERT(connected);
     Q_UNUSED(connected); // Fix initialized-but-not-referenced warning on release builds
 
@@ -45,7 +45,7 @@ void TCPLoopBackServer::_newConnection(void)
     Q_ASSERT(_tcpServer);
     _tcpSocket = _tcpServer->nextPendingConnection();
     Q_ASSERT(_tcpSocket);
-    bool connected = QObject::connect(_tcpSocket, SIGNAL(readyRead()), this, SLOT(_readBytes()));
+    bool connected = QObject::connect(_tcpSocket, &QIODevice::readyRead, this, &TCPLoopBackServer::_readBytes);
     Q_ASSERT(connected);
     Q_UNUSED(connected); // Fix initialized-but-not-referenced warning on release builds
 }