Commit c91a28be authored by Tomaz Canabrava's avatar Tomaz Canabrava

More signal / slot conversion

The overloaded member signal just hit us, to use it is a pain
but the resuting code is faster and less error prone, so it's
still a good thing to do.
Signed-off-by: 's avatarTomaz Canabrava <tomaz.canabrava@intel.com>
parent 344acaf6
...@@ -434,7 +434,7 @@ bool QGCApplication::_initForNormalAppBoot(void) ...@@ -434,7 +434,7 @@ bool QGCApplication::_initForNormalAppBoot(void)
_loadCurrentStyle(); _loadCurrentStyle();
// Exit main application when last window is closed // Exit main application when last window is closed
connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit())); connect(this, &QGCApplication::lastWindowClosed, this, QGCApplication::quit);
#ifdef __mobile__ #ifdef __mobile__
_qmlAppEngine = new QQmlApplicationEngine(this); _qmlAppEngine = new QQmlApplicationEngine(this);
......
...@@ -81,7 +81,8 @@ bool QGCFileDownload::download(const QString& remoteFile) ...@@ -81,7 +81,8 @@ bool QGCFileDownload::download(const QString& remoteFile)
connect(networkReply, &QNetworkReply::downloadProgress, this, &QGCFileDownload::downloadProgress); connect(networkReply, &QNetworkReply::downloadProgress, this, &QGCFileDownload::downloadProgress);
connect(networkReply, &QNetworkReply::finished, this, &QGCFileDownload::_downloadFinished); connect(networkReply, &QNetworkReply::finished, this, &QGCFileDownload::_downloadFinished);
connect(networkReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(_downloadError(QNetworkReply::NetworkError))); connect(networkReply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error),
this, &QGCFileDownload::_downloadError);
return true; return true;
} }
......
...@@ -43,7 +43,7 @@ signals: ...@@ -43,7 +43,7 @@ signals:
void downloadFinished(QString remoteFile, QString localFile); void downloadFinished(QString remoteFile, QString localFile);
void error(QString errorMsg); void error(QString errorMsg);
private slots: private:
void _downloadFinished(void); void _downloadFinished(void);
void _downloadError(QNetworkReply::NetworkError code); void _downloadError(QNetworkReply::NetworkError code);
}; };
......
...@@ -151,7 +151,7 @@ void QmlObjectListModel::clear(void) ...@@ -151,7 +151,7 @@ void QmlObjectListModel::clear(void)
QObject* QmlObjectListModel::removeAt(int i) QObject* QmlObjectListModel::removeAt(int i)
{ {
QObject* removedObject = _objectList[i]; QObject* removedObject = _objectList[i];
// Look for a dirtyChanged signal on the object // Look for a dirtyChanged signal on the object
if (_objectList[i]->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("dirtyChanged(bool)")) != -1) { if (_objectList[i]->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("dirtyChanged(bool)")) != -1) {
if (!_skipDirtyFirstItem || i != 0) { if (!_skipDirtyFirstItem || i != 0) {
......
...@@ -205,9 +205,11 @@ void UrlFactory::_tryCorrectGoogleVersions() ...@@ -205,9 +205,11 @@ void UrlFactory::_tryCorrectGoogleVersions()
#endif #endif
qheader.setRawHeader("User-Agent", userAgent); qheader.setRawHeader("User-Agent", userAgent);
_googleReply = _network->get(qheader); _googleReply = _network->get(qheader);
connect(_googleReply, SIGNAL(finished()), this, SLOT(_googleVersionCompleted())); connect(_googleReply, &QNetworkReply::finished, this, &UrlFactory::_googleVersionCompleted);
connect(_googleReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(_networkReplyError(QNetworkReply::NetworkError))); connect(_googleReply, &QNetworkReply::destroyed, this, &UrlFactory::_replyDestroyed);
connect(_googleReply, SIGNAL(destroyed()), this, SLOT(_replyDestroyed()));
connect(_googleReply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error),
this, &UrlFactory::_networkReplyError);
_network->setProxy(proxy); _network->setProxy(proxy);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment