Refactoring: removing m_reply from GeoReply classes

This patch tries to simplify the code removing the contained m_reply
from all the Geo[Map,Route,Geocode,Places]Reply classes.
The need for m_reply was associated to the "abort" method, but this
can be solved by emitting a signal in the superclass abort() method,
and connecting that to QNetworkReply::abort() in the constructor.

Since QNetworkReplyHttpImpl always sends an OperationCanceledError
it should then be safe to call deleteLater() on the network reply
in the slot connected to QNetworkReply::error

This patch also prevents the series of
"QCoreApplication::postEvent: Unexpected null receiver" warnings
that are generated due to deletingLater already deleted objects
(abort() emits an error, the reply is destroyed inside the
onError slot, but also in the abort() method).

Finally, this patch removes the setFinished() call in
QGeoRouteReply::abort() since the documentation does not mention
this, and all the subclasses do not perform this operation and
emit the corresponding signal.
tst_qgeoroutereply has been adapted accordingly.

Change-Id: I226ee163e7bed784dd7f0da1522e651459543bca
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

14 files changed, 187 insertions, 266 deletions

diff --git a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp
index 9a5cbf48..f67fa5bb 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp
+++ b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp
@@ -48,30 +48,26 @@ QT_BEGIN_NAMESPACE
 QPlaceContentReplyImpl::QPlaceContentReplyImpl(const QPlaceContentRequest &request,
                                                QNetworkReply *reply,
                                                QPlaceManagerEngineNokiaV2 *engine)
-    :   QPlaceContentReply(engine), m_reply(reply), m_engine(engine)
+    :   QPlaceContentReply(engine), m_engine(engine)
 {
     Q_ASSERT(engine);
-    setRequest(request);
-
-    if (!m_reply)
+    if (!reply) {
+        setError(UnknownError, QStringLiteral("Null reply"));
         return;
+    }
+    setRequest(request);
 
-    m_reply->setParent(this);
-    connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished()));
-    connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)),
+    connect(reply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
             this, SLOT(replyError(QNetworkReply::NetworkError)));
+    connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort);
+    connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
 }
 
 QPlaceContentReplyImpl::~QPlaceContentReplyImpl()
 {
 }
 
-void QPlaceContentReplyImpl::abort()
-{
-    if (m_reply)
-        m_reply->abort();
-}
-
 void QPlaceContentReplyImpl::setError(QPlaceReply::Error error_, const QString &errorString)
 {
     QPlaceContentReply::setError(error_, errorString);
@@ -82,31 +78,32 @@ void QPlaceContentReplyImpl::setError(QPlaceReply::Error error_, const QString &
 
 void QPlaceContentReplyImpl::replyFinished()
 {
-    if (m_reply->isOpen()) {
-        QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll());
-        if (!document.isObject()) {
-            setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR));
-            return;
-        }
-
-        QJsonObject object = document.object();
-
-        QPlaceContent::Collection collection;
-        int totalCount;
-        QPlaceContentRequest previous;
-        QPlaceContentRequest next;
-
-        parseCollection(request().contentType(), object, &collection, &totalCount,
-                        &previous, &next, m_engine);
-
-        setTotalCount(totalCount);
-        setContent(collection);
-        setPreviousPageRequest(previous);
-        setNextPageRequest(next);
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+
+    if (reply->error() != QNetworkReply::NoError)
+        return;
+
+    QJsonDocument document = QJsonDocument::fromJson(reply->readAll());
+    if (!document.isObject()) {
+        setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR));
+        return;
     }
 
-    m_reply->deleteLater();
-    m_reply = 0;
+    QJsonObject object = document.object();
+
+    QPlaceContent::Collection collection;
+    int totalCount;
+    QPlaceContentRequest previous;
+    QPlaceContentRequest next;
+
+    parseCollection(request().contentType(), object, &collection, &totalCount,
+                    &previous, &next, m_engine);
+
+    setTotalCount(totalCount);
+    setContent(collection);
+    setPreviousPageRequest(previous);
+    setNextPageRequest(next);
 
     setFinished(true);
     emit finished();
@@ -114,13 +111,12 @@ void QPlaceContentReplyImpl::replyFinished()
 
 void QPlaceContentReplyImpl::replyError(QNetworkReply::NetworkError error)
 {
-    switch (error) {
-    case QNetworkReply::OperationCanceledError:
-        setError(CancelError, "Request canceled.");
-        break;
-    default:
-        setError(CommunicationError, "Network error.");
-    }
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+    if (error == QNetworkReply::OperationCanceledError)
+        setError(QPlaceReply::CancelError, QStringLiteral("Request cancelled"));
+    else
+        setError(QPlaceReply::CommunicationError, reply->errorString());
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.h b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.h
index c7ef7ee4..596b9a4c 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.h
+++ b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.h
@@ -54,15 +54,12 @@ public:
                            QPlaceManagerEngineNokiaV2 *engine);
     ~QPlaceContentReplyImpl();
 
-    void abort();
-
 private slots:
     void setError(QPlaceReply::Error error_, const QString &errorString);
     void replyFinished();
     void replyError(QNetworkReply::NetworkError error);
 
 private:
-    QNetworkReply *m_reply;
     QPlaceManagerEngineNokiaV2 *m_engine;
 };
 
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp
index e85b9cc7..1e7f2d2f 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp
+++ b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp
@@ -88,27 +88,23 @@ static bool countryTableContains(const QString &countryCode)
 
 QPlaceDetailsReplyImpl::QPlaceDetailsReplyImpl(QNetworkReply *reply,
                                                QPlaceManagerEngineNokiaV2 *parent)
-    :   QPlaceDetailsReply(parent), m_reply(reply), m_engine(parent)
+:   QPlaceDetailsReply(parent), m_engine(parent)
 {
-    Q_ASSERT(parent);
-
-    if (!m_reply)
+    if (!reply) {
+        setError(UnknownError, QStringLiteral("Null reply"));
         return;
-
-    m_reply->setParent(this);
-    connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    }
+    connect(reply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
+            this, SLOT(replyError(QNetworkReply::NetworkError)));
+    connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort);
+    connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
 }
 
 QPlaceDetailsReplyImpl::~QPlaceDetailsReplyImpl()
 {
 }
 
-void QPlaceDetailsReplyImpl::abort()
-{
-    if (m_reply)
-        m_reply->abort();
-}
-
 void QPlaceDetailsReplyImpl::setError(QPlaceReply::Error error_, const QString &errorString)
 {
     QPlaceReply::setError(error_, errorString);
@@ -119,23 +115,13 @@ void QPlaceDetailsReplyImpl::setError(QPlaceReply::Error error_, const QString &
 
 void QPlaceDetailsReplyImpl::replyFinished()
 {
-    if (m_reply->error() != QNetworkReply::NoError) {
-        switch (m_reply->error()) {
-        case QNetworkReply::OperationCanceledError:
-            setError(CancelError, "Request canceled.");
-            break;
-        case QNetworkReply::ContentNotFoundError:
-            setError(PlaceDoesNotExistError,
-                     QString::fromLatin1("The id, %1, does not reference an existing place")
-                     .arg(m_placeId));
-            break;
-        default:
-            setError(CommunicationError, "Network error.");
-        }
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+
+    if (reply->error() != QNetworkReply::NoError)
         return;
-    }
 
-    QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll());
+    QJsonDocument document = QJsonDocument::fromJson(reply->readAll());
     if (!document.isObject()) {
         setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR));
         return;
@@ -337,11 +323,23 @@ void QPlaceDetailsReplyImpl::replyFinished()
     place.setDetailsFetched(true);
     setPlace(place);
 
-    m_reply->deleteLater();
-    m_reply = 0;
-
     setFinished(true);
     emit finished();
 }
 
+void QPlaceDetailsReplyImpl::replyError(QNetworkReply::NetworkError error)
+{
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+    if (error == QNetworkReply::OperationCanceledError) {
+        setError(QPlaceReply::CancelError, QStringLiteral("Request cancelled"));
+    } else if (error == QNetworkReply::ContentNotFoundError) {
+        setError(QPlaceReply::PlaceDoesNotExistError,
+                 QString::fromLatin1("The id, %1, does not reference an existing place")
+                 .arg(m_placeId));
+    } else {
+        setError(QPlaceReply::CommunicationError, reply->errorString());
+    }
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.h b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.h
index 2524d04a..dc537c80 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.h
+++ b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.h
@@ -53,15 +53,14 @@ public:
     QPlaceDetailsReplyImpl(QNetworkReply *reply, QPlaceManagerEngineNokiaV2 *parent);
     ~QPlaceDetailsReplyImpl();
 
-    void abort();
     void setPlaceId(const QString &placeId) { m_placeId = placeId; }
 
 private slots:
     void setError(QPlaceReply::Error error_, const QString &errorString);
     void replyFinished();
+    void replyError(QNetworkReply::NetworkError error);
 
 private:
-    QNetworkReply *m_reply;
     QPlaceManagerEngineNokiaV2 *m_engine;
     QString m_placeId;
 };
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp
index 3a56c927..9808b539 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp
+++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp
@@ -54,29 +54,25 @@ QT_BEGIN_NAMESPACE
 QPlaceSearchReplyHere::QPlaceSearchReplyHere(const QPlaceSearchRequest &request,
                                              QNetworkReply *reply,
                                              QPlaceManagerEngineNokiaV2 *parent)
-    :   QPlaceSearchReply(parent), m_reply(reply), m_engine(parent)
+    :   QPlaceSearchReply(parent), m_engine(parent)
 {
-    Q_ASSERT(parent);
-
-    setRequest(request);
-
-    if (!m_reply)
+    if (!reply) {
+        setError(UnknownError, QStringLiteral("Null reply"));
         return;
+    }
+    setRequest(request);
 
-    m_reply->setParent(this);
-    connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    connect(reply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
+            this, SLOT(replyError(QNetworkReply::NetworkError)));
+    connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort);
+    connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
 }
 
 QPlaceSearchReplyHere::~QPlaceSearchReplyHere()
 {
 }
 
-void QPlaceSearchReplyHere::abort()
-{
-    if (m_reply)
-        m_reply->abort();
-}
-
 void QPlaceSearchReplyHere::setError(QPlaceReply::Error error_, const QString &errorString)
 {
     QPlaceReply::setError(error_, errorString);
@@ -87,23 +83,13 @@ void QPlaceSearchReplyHere::setError(QPlaceReply::Error error_, const QString &e
 
 void QPlaceSearchReplyHere::replyFinished()
 {
-    if (m_reply->error() != QNetworkReply::NoError) {
-        switch (m_reply->error()) {
-        case QNetworkReply::OperationCanceledError:
-            setError(CancelError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, CANCEL_ERROR));
-            break;
-        case QNetworkReply::ContentNotFoundError:
-            setError(PlaceDoesNotExistError,
-                     QString::fromLatin1("The id, %1, does not reference an existing place")
-                     .arg(request().recommendationId()));
-            break;
-        default:
-            setError(CommunicationError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, NETWORK_ERROR));
-        }
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+
+    if (reply->error() != QNetworkReply::NoError)
         return;
-    }
 
-    QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll());
+    QJsonDocument document = QJsonDocument::fromJson(reply->readAll());
     if (!document.isObject()) {
         setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR));
         return;
@@ -141,9 +127,6 @@ void QPlaceSearchReplyHere::replyFinished()
 
     setResults(results);
 
-    m_reply->deleteLater();
-    m_reply = 0;
-
     setFinished(true);
     emit finished();
 }
@@ -227,4 +210,19 @@ QPlaceProposedSearchResult QPlaceSearchReplyHere::parseSearchResult(const QJsonO
     return result;
 }
 
+void QPlaceSearchReplyHere::replyError(QNetworkReply::NetworkError error)
+{
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+    if (error == QNetworkReply::OperationCanceledError) {
+        setError(QPlaceReply::CancelError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, CANCEL_ERROR));
+    } else if (error == QNetworkReply::ContentNotFoundError) {
+        setError(QPlaceReply::PlaceDoesNotExistError,
+                 QString::fromLatin1("The id, %1, does not reference an existing place")
+                 .arg(request().recommendationId()));
+    } else {
+        setError(QPlaceReply::CommunicationError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, NETWORK_ERROR));
+    }
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.h b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.h
index a712ab84..b3d97a3d 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.h
+++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.h
@@ -56,17 +56,15 @@ public:
                                    QPlaceManagerEngineNokiaV2 *parent);
     ~QPlaceSearchReplyHere();
 
-    void abort();
-
 private slots:
     void setError(QPlaceReply::Error error_, const QString &errorString);
     void replyFinished();
+    void replyError(QNetworkReply::NetworkError error);
 
 private:
     QPlaceResult parsePlaceResult(const QJsonObject &item) const;
     QPlaceProposedSearchResult parseSearchResult(const QJsonObject &item) const;
 
-    QNetworkReply *m_reply;
     QPlaceManagerEngineNokiaV2 *m_engine;
 };
 
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp
index 6ed8b5a2..9882545d 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp
+++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp
@@ -46,25 +46,23 @@ QT_BEGIN_NAMESPACE
 
 QPlaceSearchSuggestionReplyImpl::QPlaceSearchSuggestionReplyImpl(QNetworkReply *reply,
                                                                  QObject *parent)
-:   QPlaceSearchSuggestionReply(parent), m_reply(reply)
+:   QPlaceSearchSuggestionReply(parent)
 {
-    if (!m_reply)
+    if (!reply) {
+        setError(UnknownError, QStringLiteral("Null reply"));
         return;
-
-    m_reply->setParent(this);
-    connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    }
+    connect(reply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
+            this, SLOT(replyError(QNetworkReply::NetworkError)));
+    connect(this, &QPlaceReply::aborted, reply, &QNetworkReply::abort);
+    connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
 }
 
 QPlaceSearchSuggestionReplyImpl::~QPlaceSearchSuggestionReplyImpl()
 {
 }
 
-void QPlaceSearchSuggestionReplyImpl::abort()
-{
-    if (m_reply)
-        m_reply->abort();
-}
-
 void QPlaceSearchSuggestionReplyImpl::setError(QPlaceReply::Error error_,
                                                const QString &errorString)
 {
@@ -76,18 +74,13 @@ void QPlaceSearchSuggestionReplyImpl::setError(QPlaceReply::Error error_,
 
 void QPlaceSearchSuggestionReplyImpl::replyFinished()
 {
-    if (m_reply->error() != QNetworkReply::NoError) {
-        switch (m_reply->error()) {
-        case QNetworkReply::OperationCanceledError:
-            setError(CancelError, "Request canceled.");
-            break;
-        default:
-            setError(CommunicationError, "Network error.");
-        }
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+
+    if (reply->error() != QNetworkReply::NoError)
         return;
-    }
 
-    QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll());
+    QJsonDocument document = QJsonDocument::fromJson(reply->readAll());
     if (!document.isObject()) {
         setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR));
         emit error(error(), errorString());
@@ -107,11 +100,18 @@ void QPlaceSearchSuggestionReplyImpl::replyFinished()
 
     setSuggestions(s);
 
-    m_reply->deleteLater();
-    m_reply = 0;
-
     setFinished(true);
     emit finished();
 }
 
+void QPlaceSearchSuggestionReplyImpl::replyError(QNetworkReply::NetworkError error)
+{
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+    if (error == QNetworkReply::OperationCanceledError)
+        setError(QPlaceReply::CancelError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, CANCEL_ERROR));
+    else
+        setError(QPlaceReply::CommunicationError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, NETWORK_ERROR));
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.h b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.h
index dbcba3ab..97ae3e1e 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.h
+++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.h
@@ -50,14 +50,10 @@ public:
     explicit QPlaceSearchSuggestionReplyImpl(QNetworkReply *reply, QObject *parent = 0);
     ~QPlaceSearchSuggestionReplyImpl();
 
-    void abort();
-
 private slots:
     void setError(QPlaceReply::Error error_, const QString &errorString);
     void replyFinished();
-
-private:
-    QNetworkReply *m_reply;
+    void replyError(QNetworkReply::NetworkError error);
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
index 73d2d4c3..53a28652 100644
--- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
@@ -47,13 +47,21 @@ QT_BEGIN_NAMESPACE
 
 QGeoCodeReplyNokia::QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offset,
                                        const QGeoShape &viewport, QObject *parent)
-:   QGeoCodeReply(parent), m_reply(reply), m_parsing(false)
+:   QGeoCodeReply(parent), m_parsing(false)
 {
+    if (!reply) {
+        setError(UnknownError, QStringLiteral("Null reply"));
+        return;
+    }
     qRegisterMetaType<QList<QGeoLocation> >();
 
-    connect(m_reply, SIGNAL(finished()), this, SLOT(networkFinished()));
-    connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)),
+    connect(reply, SIGNAL(finished()), this, SLOT(networkFinished()));
+    connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
             this, SLOT(networkError(QNetworkReply::NetworkError)));
+    connect(this, &QGeoCodeReply::aborted, reply, &QNetworkReply::abort);
+    connect(this, &QGeoCodeReply::aborted, [this](){ m_parsing = false; });
+    connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
+
 
     setLimit(limit);
     setOffset(offset);
@@ -62,29 +70,14 @@ QGeoCodeReplyNokia::QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offs
 
 QGeoCodeReplyNokia::~QGeoCodeReplyNokia()
 {
-    abort();
-}
-
-void QGeoCodeReplyNokia::abort()
-{
-    if (!m_reply) {
-        m_parsing = false;
-        return;
-    }
-
-    m_reply->abort();
-
-    m_reply->deleteLater();
-    m_reply = 0;
-    m_parsing = false;
 }
 
 void QGeoCodeReplyNokia::networkFinished()
 {
-    if (!m_reply)
-        return;
+    QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
 
-    if (m_reply->error() != QNetworkReply::NoError)
+    if (reply->error() != QNetworkReply::NoError)
         return;
 
     QGeoCodeXmlParser *parser = new QGeoCodeXmlParser;
@@ -94,23 +87,16 @@ void QGeoCodeReplyNokia::networkFinished()
     connect(parser, SIGNAL(error(QString)), this, SLOT(parseError(QString)));
 
     m_parsing = true;
-    parser->parse(m_reply->readAll());
-
-    m_reply->deleteLater();
-    m_reply = 0;
+    parser->parse(reply->readAll());
 }
 
 void QGeoCodeReplyNokia::networkError(QNetworkReply::NetworkError error)
 {
     Q_UNUSED(error)
 
-    if (!m_reply)
-        return;
-
-    setError(QGeoCodeReply::CommunicationError, m_reply->errorString());
-
-    m_reply->deleteLater();
-    m_reply = 0;
+    QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+    setError(QGeoCodeReply::CommunicationError, reply->errorString());
 }
 
 void QGeoCodeReplyNokia::appendResults(const QList<QGeoLocation> &locations)
@@ -129,7 +115,6 @@ void QGeoCodeReplyNokia::parseError(const QString &errorString)
 
     setError(QGeoCodeReply::ParseError,
              QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, RESPONSE_NOT_RECOGNIZABLE));
-    abort();
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
index 85726fca..43730403 100644
--- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
@@ -49,8 +49,6 @@ public:
     QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offset, const QGeoShape &viewport, QObject *parent = 0);
     ~QGeoCodeReplyNokia();
 
-    void abort();
-
 private Q_SLOTS:
     void networkFinished();
     void networkError(QNetworkReply::NetworkError error);
@@ -58,7 +56,6 @@ private Q_SLOTS:
     void parseError(const QString &errorString);
 
 private:
-    QNetworkReply *m_reply;
     bool m_parsing;
 };
 
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
index c95f8de3..6e1a1e85 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
@@ -42,63 +42,50 @@
 QT_BEGIN_NAMESPACE
 
 QGeoMapReplyNokia::QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent)
-        : QGeoTiledMapReply(spec, parent),
-        m_reply(reply)
+        : QGeoTiledMapReply(spec, parent)
 {
-    connect(m_reply,
+    if (!reply) {
+        setError(UnknownError, QStringLiteral("Null reply"));
+        return;
+    }
+    connect(reply,
             SIGNAL(finished()),
             this,
             SLOT(networkFinished()));
 
-    connect(m_reply,
+    connect(reply,
             SIGNAL(error(QNetworkReply::NetworkError)),
             this,
             SLOT(networkError(QNetworkReply::NetworkError)));
+    connect(this, &QGeoTiledMapReply::aborted, reply, &QNetworkReply::abort);
+    connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
 }
 
 QGeoMapReplyNokia::~QGeoMapReplyNokia()
 {
 }
 
-QNetworkReply *QGeoMapReplyNokia::networkReply() const
-{
-    return m_reply;
-}
-
-void QGeoMapReplyNokia::abort()
-{
-    if (!m_reply)
-        return;
-
-    m_reply->abort();
-}
-
 void QGeoMapReplyNokia::networkFinished()
 {
-    if (!m_reply)
-        return;
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
 
-    if (m_reply->error() != QNetworkReply::NoError)
+    if (reply->error() != QNetworkReply::NoError)
         return;
 
-    setMapImageData(m_reply->readAll());
+    setMapImageData(reply->readAll());
     setMapImageFormat("png");
     setFinished(true);
-
-    m_reply->deleteLater();
-    m_reply = 0;
 }
 
 void QGeoMapReplyNokia::networkError(QNetworkReply::NetworkError error)
 {
-    if (!m_reply)
-        return;
-
-    if (error != QNetworkReply::OperationCanceledError)
-        setError(QGeoTiledMapReply::CommunicationError, m_reply->errorString());
-    setFinished(true);
-    m_reply->deleteLater();
-    m_reply = 0;
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+    if (error == QNetworkReply::OperationCanceledError)
+        setFinished(true);
+    else
+        setError(QGeoTiledMapReply::CommunicationError, reply->errorString());
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
index 55759914..d835757c 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
@@ -52,16 +52,9 @@ public:
     QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTileSpec &spec, QObject *parent = 0);
     ~QGeoMapReplyNokia();
 
-    void abort();
-
-    QNetworkReply *networkReply() const;
-
 private Q_SLOTS:
     void networkFinished();
     void networkError(QNetworkReply::NetworkError error);
-
-private:
-    QPointer<QNetworkReply> m_reply;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
index 45ea071f..b5fdfee1 100644
--- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
@@ -49,43 +49,41 @@ QT_BEGIN_NAMESPACE
 QGeoRouteReplyNokia::QGeoRouteReplyNokia(const QGeoRouteRequest &request,
                                          const QList<QNetworkReply *> &replies,
                                          QObject *parent)
-:   QGeoRouteReply(request, parent), m_replies(replies), m_parsers(0)
+:   QGeoRouteReply(request, parent), m_parsers(0)
 {
     qRegisterMetaType<QList<QGeoRoute> >();
 
-    foreach (QNetworkReply *reply, m_replies) {
+    bool failure = false;
+    foreach (QNetworkReply *reply, replies) {
+        if (!reply) {
+            failure = true;
+            continue;
+        }
         connect(reply, SIGNAL(finished()), this, SLOT(networkFinished()));
         connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
                 this, SLOT(networkError(QNetworkReply::NetworkError)));
+        connect(this, &QGeoRouteReply::aborted, reply, &QNetworkReply::abort);
+        connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
     }
+    if (failure)
+        setError(UnknownError, QStringLiteral("Null reply"));
+    else
+        connect(this, &QGeoRouteReply::aborted, [this](){ m_parsers = 0; });
 }
 
 QGeoRouteReplyNokia::~QGeoRouteReplyNokia()
 {
-    abort();
-}
-
-void QGeoRouteReplyNokia::abort()
-{
-    if (m_replies.isEmpty() && !m_parsers)
-        return;
-
-    foreach (QNetworkReply *reply, m_replies) {
-        reply->abort();
-        reply->deleteLater();
-    }
-    m_replies.clear();
-    m_parsers = 0;
 }
 
 void QGeoRouteReplyNokia::networkFinished()
 {
     QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
-    if (!reply)
-        return;
+    reply->deleteLater();
 
-    if (reply->error() != QNetworkReply::NoError)
+    if (reply->error() != QNetworkReply::NoError
+        && reply->error() != QNetworkReply::UnknownContentError) {
         return;
+    }
 
     QGeoRouteXmlParser *parser = new QGeoRouteXmlParser(request());
     connect(parser, SIGNAL(results(QList<QGeoRoute>)),
@@ -94,32 +92,17 @@ void QGeoRouteReplyNokia::networkFinished()
 
     ++m_parsers;
     parser->parse(reply->readAll());
-
-    m_replies.removeOne(reply);
-    reply->deleteLater();
 }
 
 void QGeoRouteReplyNokia::networkError(QNetworkReply::NetworkError error)
 {
-    QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
-    if (!reply)
+    if (error == QNetworkReply::UnknownContentError)
         return;
-
-    if (error == QNetworkReply::UnknownContentError) {
-        QGeoRouteXmlParser *parser = new QGeoRouteXmlParser(request());
-        connect(parser, SIGNAL(results(QList<QGeoRoute>)),
-                this, SLOT(appendResults(QList<QGeoRoute>)));
-        connect(parser, SIGNAL(error(QString)), this, SLOT(parserError(QString)));
-
-        ++m_parsers;
-        parser->parse(reply->readAll());
-
-        m_replies.removeOne(reply);
-        reply->deleteLater();
-    } else {
-        setError(QGeoRouteReply::CommunicationError, reply->errorString());
-        abort();
-    }
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+    setError(QGeoRouteReply::CommunicationError, reply->errorString());
+    if (error != QNetworkReply::OperationCanceledError) // Any error not caused by abort()
+        emit aborted(); // aborts all unfinished replies and sets m_parsers to 0
 }
 
 void QGeoRouteReplyNokia::appendResults(const QList<QGeoRoute> &routes)
@@ -130,19 +113,16 @@ void QGeoRouteReplyNokia::appendResults(const QList<QGeoRoute> &routes)
     --m_parsers;
     addRoutes(routes);
 
-    if (!m_parsers && m_replies.isEmpty())
+    if (!m_parsers)
         setFinished(true);
 }
 
 void QGeoRouteReplyNokia::parserError(const QString &errorString)
 {
     Q_UNUSED(errorString)
-
-    --m_parsers;
-
+    emit aborted();
     setError(QGeoRouteReply::ParseError,
              QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, RESPONSE_NOT_RECOGNIZABLE));
-    abort();
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
index 9d32bdb3..d38262a5 100644
--- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h
@@ -51,8 +51,6 @@ public:
     QGeoRouteReplyNokia(const QGeoRouteRequest &request, const QList<QNetworkReply*> &replies, QObject *parent = 0);
     ~QGeoRouteReplyNokia();
 
-    void abort();
-
 private Q_SLOTS:
     void networkFinished();
     void networkError(QNetworkReply::NetworkError error);
@@ -60,7 +58,6 @@ private Q_SLOTS:
     void parserError(const QString &errorString);
 
 private:
-    QList<QNetworkReply *> m_replies;
     int m_parsers;
 };