Port to pointer-to-member-function connection syntax

Rename overloads that would cause conflict and require explicit overloa
resolution via QOverload:

- Q*Reply::error -> errorOccurred (equivalent to QNetworkReply)
- Q*Engine::error -> errorOccurred (for consistency, even if no overloa
- Q*Manager::error -> errorOccurred (ditto)
- QDeclarativeGeoMap::copyrightChanged -> copyrightImageChanged

As a drive-by, change QString value parameters to const references.

Pick-to: 6.2
Change-Id: I1ab16079842540ca0a86f711d83b35c8c56135e6
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
index 5c1acaba..71049c45 100644
--- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
@@ -64,9 +64,10 @@ QGeoCodeReplyNokia::QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offs
     }
     qRegisterMetaType<QList<QGeoLocation> >();
 
-    connect(reply, SIGNAL(finished()), this, SLOT(networkFinished()));
-    connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)),
-            this, SLOT(networkError(QNetworkReply::NetworkError)));
+    connect(reply, &QNetworkReply::finished,
+            this, &QGeoCodeReplyNokia::networkFinished);
+    connect(reply, &QNetworkReply::errorOccurred,
+            this, &QGeoCodeReplyNokia::networkError);
     connect(this, &QGeoCodeReply::aborted, reply, &QNetworkReply::abort);
     connect(this, &QGeoCodeReply::aborted, [this](){ m_parsing = false; });
     connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
@@ -92,9 +93,8 @@ void QGeoCodeReplyNokia::networkFinished()
     QGeoCodeJsonParser *parser = new QGeoCodeJsonParser; // QRunnable, autoDelete = true.
     if (m_manualBoundsRequired)
         parser->setBounds(viewport());
-    connect(parser, SIGNAL(results(QList<QGeoLocation>)),
-            this, SLOT(appendResults(QList<QGeoLocation>)));
-    connect(parser, SIGNAL(error(QString)), this, SLOT(parseError(QString)));
+    connect(parser, &QGeoCodeJsonParser::results, this, &QGeoCodeReplyNokia::appendResults);
+    connect(parser, &QGeoCodeJsonParser::errorOccurred, this, &QGeoCodeReplyNokia::parseError);
 
     m_parsing = true;
     parser->parse(reply->readAll());