Modified MapFetcher to use NetworkAccessManager class.

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index b4e15c8..f5e51f7 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -128,7 +128,7 @@ void SituareEngine::connectedToNetwork()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_facebookAuthenticator->start();
+//    m_facebookAuthenticator->start();
     //TODO: Start map image fetching
 }
 

diff --git a/src/engine/networkaccessmanager.cpp b/src/engine/networkaccessmanager.cpp
index 5d8463e..2f67958 100644 (file)
--- a/src/engine/networkaccessmanager.cpp
+++ b/src/engine/networkaccessmanager.cpp
@@ -39,9 +39,11 @@ QNetworkReply *NetworkAccessManager::getti(const QNetworkRequest &request)
     if (!m_networkHandler->isConnected()) {
         m_requestQueue.append(request);
         m_networkHandler->connect();
+        return createRequest(QNetworkAccessManager::GetOperation, request);
+    }
+    else {
+        return get(request);
     }
-
-    return createRequest(QNetworkAccessManager::GetOperation, request);
 }
 
 void NetworkAccessManager::connected()

diff --git a/src/map/mapengine.cpp b/src/map/mapengine.cpp
index 00ed232..47521c2 100644 (file)
--- a/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@ -55,7 +55,7 @@ MapEngine::MapEngine(QObject *parent)
 
     m_mapScene = new MapScene(this);
 
-    m_mapFetcher = new MapFetcher(new QNetworkAccessManager(this), this);
+    m_mapFetcher = new MapFetcher(new NetworkAccessManager(this), this);
     connect(this, SIGNAL(fetchImage(int, int, int)),
             m_mapFetcher, SLOT(enqueueFetchMapImage(int, int, int)));
     connect(m_mapFetcher, SIGNAL(mapImageReceived(int, int, int, QPixmap)),

diff --git a/src/map/mapfetcher.cpp b/src/map/mapfetcher.cpp
index 9a01db8..7b0acfe 100644 (file)
--- a/src/map/mapfetcher.cpp
+++ b/src/map/mapfetcher.cpp
@@ -31,11 +31,12 @@
 
 #include "mapfetcher.h"
 #include "mapcommon.h"
+#include "engine/networkaccessmanager.h"
 
 const int MAX_PARALLEL_DOWNLOADS = 2; ///< Max simultaneous parallel downloads
 const int NOT_FOUND = -1; ///< Return value if matching request is not found from the list
 
-MapFetcher::MapFetcher(QNetworkAccessManager *manager, QObject *parent)
+MapFetcher::MapFetcher(NetworkAccessManager *manager, QObject *parent)
     : QObject(parent)
     , m_pendingRequestsSize(0)
     , m_fetchMapImagesTimerRunning(false)
@@ -292,7 +293,7 @@ void MapFetcher::startNextDownload()
 
         QNetworkRequest request(url);
         request.setRawHeader("User-Agent", "Situare");
-        QNetworkReply *reply = m_manager->get(request);
+        QNetworkReply *reply = m_manager->getti(request);
 
         m_currentDownloads.append(reply);
     }

diff --git a/src/map/mapfetcher.h b/src/map/mapfetcher.h
index 9edbfb5..12a5809 100644 (file)
--- a/src/map/mapfetcher.h
+++ b/src/map/mapfetcher.h
@@ -27,6 +27,7 @@
 #include <QNetworkAccessManager>
 
 #include "maptilerequest.h"
+#include "engine/networkaccessmanager.h"
 
 class QNetworkReply;
 class QUrl;
@@ -48,7 +49,7 @@ public:
     * @param manager Network access manager
     * @param parent parent object
     */
-    MapFetcher(QNetworkAccessManager *manager, QObject *parent = 0);
+    MapFetcher(NetworkAccessManager *manager, QObject *parent = 0);
 
 /*******************************************************************************
  * CLASS SPECIFIC MEMBER FUNCTIONS AND SLOTS
@@ -191,7 +192,7 @@ private:
     QList<QNetworkReply*> m_currentDownloads; ///< List of current downloads
     int m_pendingRequestsSize; ///< Max number of pending requests
     bool m_fetchMapImagesTimerRunning; ///< is the singleshot timer already running
-    QNetworkAccessManager *m_manager; ///< Network access manager
+    NetworkAccessManager *m_manager; ///< Network access manager
     QList<MapTileRequest> m_pendingRequests; ///< List of map image fetching requests
 };