demos/embedded/weatherinfo/weatherinfo.cpp
changeset 30 5dc02b23752f
parent 18 2f34d5167611
--- a/demos/embedded/weatherinfo/weatherinfo.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/demos/embedded/weatherinfo/weatherinfo.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -44,10 +44,6 @@
 #include <QtNetwork>
 #include <QtSvg>
 
-#if defined (Q_OS_SYMBIAN)
-#include "sym_iap_util.h"
-#endif
-
 class WeatherInfo: public QMainWindow
 {
     Q_OBJECT
@@ -67,6 +63,7 @@
     QList<QGraphicsTextItem*> m_rangeItems;
     QTimeLine m_timeLine;
     QHash<QString, QString> m_icons;
+    QNetworkAccessManager m_manager;
 
 public:
     WeatherInfo(QWidget *parent = 0): QMainWindow(parent) {
@@ -98,14 +95,14 @@
         }
         setContextMenuPolicy(Qt::ActionsContextMenu);
 
+        connect(&m_manager, SIGNAL(finished(QNetworkReply*)),
+                this, SLOT(handleNetworkData(QNetworkReply*)));
+
         QTimer::singleShot(0, this, SLOT(delayedInit()));
     }
 
 private slots:
     void delayedInit() {
-#if defined(Q_OS_SYMBIAN)
-        qt_SetDefaultIap();
-#endif
         request("Oslo");
     }
 
@@ -122,7 +119,6 @@
         if (!networkReply->error())
             digest(QString::fromUtf8(networkReply->readAll()));
         networkReply->deleteLater();
-        networkReply->manager()->deleteLater();
     }
 
     void animate(int frame) {
@@ -185,10 +181,7 @@
         url.addEncodedQueryItem("hl", "en");
         url.addEncodedQueryItem("weather", QUrl::toPercentEncoding(location));
 
-        QNetworkAccessManager *manager = new QNetworkAccessManager(this);
-        connect(manager, SIGNAL(finished(QNetworkReply*)),
-                this, SLOT(handleNetworkData(QNetworkReply*)));
-        manager->get(QNetworkRequest(url));
+        m_manager.get(QNetworkRequest(url));
 
         city = QString();
         setWindowTitle("Loading...");