Merge branch 'master' into network_handler

[situare] / src / situareservice / situareservice.cpp

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index 0959bf2..1b8928d 100644 (file)
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -29,6 +29,7 @@
 #include "situarecommon.h"
 #include "parser.h"
 #include "ui/avatarimage.h"
+#include "engine/networkaccessmanager.h"
 
 SituareService::SituareService(QObject *parent)
         : QObject(parent),
@@ -36,10 +37,10 @@ SituareService::SituareService(QObject *parent)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_networkManager = new QNetworkAccessManager;
+    m_networkManager = new NetworkAccessManager(this);
     connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), SLOT(requestFinished(QNetworkReply*)));
 
-    m_imageFetcher = new ImageFetcher(new QNetworkAccessManager(this), this);
+    m_imageFetcher = new ImageFetcher(new NetworkAccessManager(this), this);
     connect(this, SIGNAL(fetchImage(QUrl)), m_imageFetcher, SLOT(fetchImage(QUrl)));
     connect(m_imageFetcher, SIGNAL(imageReceived(QUrl,QPixmap)), this,
             SLOT(imageReceived(QUrl, QPixmap)));