Cleanup: de-virtualize QGeoCodeReplyPrivate

The only call to the single virtual function, extraData(), was commented
out. The subclass in the OSM plugin only wrote extra data for debug runs
and the subclass in the mock plugin is never used to test anything anyway.

So remove all this overhead. As a drive-by, refactor to member
initialization and use qsizetype for members that refer to indices in a
QList.

Change-Id: I600b4637bc367ae45d51b2a7f9a3ae0b78fb77c4
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>

3 files changed, 1 insertions, 38 deletions

diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
index 22a6d1eb..6f1262a0 100644
--- a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
+++ b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
@@ -51,7 +51,7 @@
 QT_BEGIN_NAMESPACE
 
 QGeoCodeReplyOsm::QGeoCodeReplyOsm(QNetworkReply *reply, bool includeExtraData, QObject *parent)
-:   QGeoCodeReply(*new QGeoCodeReplyOsmPrivate, parent), m_includeExtraData(includeExtraData)
+:   QGeoCodeReply(parent), m_includeExtraData(includeExtraData)
 {
     if (!reply) {
         setError(UnknownError, QStringLiteral("Null reply"));
@@ -202,21 +202,4 @@ void QGeoCodeReplyOsm::networkReplyError(QNetworkReply::NetworkError error)
     setError(QGeoCodeReply::CommunicationError, reply->errorString());
 }
 
-QGeoCodeReplyOsmPrivate::QGeoCodeReplyOsmPrivate()
-{
-
-}
-
-QGeoCodeReplyOsmPrivate::~QGeoCodeReplyOsmPrivate()
-{
-
-}
-
-QVariantMap QGeoCodeReplyOsmPrivate::extraData() const
-{
-    return m_extraData;
-}
-
 QT_END_NAMESPACE
-
-
diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.h b/src/plugins/geoservices/osm/qgeocodereplyosm.h
index f00a8bb2..a82d3e71 100644
--- a/src/plugins/geoservices/osm/qgeocodereplyosm.h
+++ b/src/plugins/geoservices/osm/qgeocodereplyosm.h
@@ -62,16 +62,6 @@ private:
     bool m_includeExtraData = false;
 };
 
-class QGeoCodeReplyOsmPrivate : public QGeoCodeReplyPrivate
-{
-public:
-    QGeoCodeReplyOsmPrivate();
-    ~QGeoCodeReplyOsmPrivate();
-    QVariantMap extraData() const override;
-
-    QVariantMap m_extraData;
-};
-
 QT_END_NAMESPACE
 
 #endif // QGEOCODEREPLYOSM_H
diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp
index d91815b2..2ca0bb8f 100644
--- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp
@@ -132,11 +132,6 @@ QGeoCodeReply *QGeoCodingManagerEngineOsm::geocode(const QString &address, int l
     QNetworkReply *reply = m_networkManager->get(request);
 
     QGeoCodeReplyOsm *geocodeReply = new QGeoCodeReplyOsm(reply, m_includeExtraData, this);
-    if (m_debugQuery) {
-        QGeoCodeReplyOsmPrivate *replyPrivate
-                = static_cast<QGeoCodeReplyOsmPrivate *>(QGeoCodeReplyPrivate::get(*geocodeReply));
-        replyPrivate->m_extraData["request_url"] = url;
-    }
 
     connect(geocodeReply, &QGeoCodeReplyOsm::finished,
             this, &QGeoCodingManagerEngineOsm::replyFinished);
@@ -169,11 +164,6 @@ QGeoCodeReply *QGeoCodingManagerEngineOsm::reverseGeocode(const QGeoCoordinate &
     QNetworkReply *reply = m_networkManager->get(request);
 
     QGeoCodeReplyOsm *geocodeReply = new QGeoCodeReplyOsm(reply, m_includeExtraData, this);
-    if (m_debugQuery) {
-        QGeoCodeReplyOsmPrivate *replyPrivate
-                = static_cast<QGeoCodeReplyOsmPrivate *>(QGeoCodeReplyPrivate::get(*geocodeReply));
-        replyPrivate->m_extraData["request_url"] = url;
-    }
 
     connect(geocodeReply, &QGeoCodeReplyOsm::finished,
             this, &QGeoCodingManagerEngineOsm::replyFinished);