Changeset 846 for trunk/demos/embedded/weatherinfo/weatherinfo.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/embedded/weatherinfo/weatherinfo.cpp (modified) (7 diffs)

trunk/demos/embedded/weatherinfo/weatherinfo.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -44 +44 @@
 #include <QtNetwork>
 #include <QtSvg>
-
-#if defined (Q_OS_SYMBIAN)
-#include "sym_iap_util.h"
-#endif
 
 class WeatherInfo: public QMainWindow
@@ -68 +64 @@
     QTimeLine m_timeLine;
     QHash<QString, QString> m_icons;
+    QNetworkAccessManager m_manager;
 
 public:
@@ -99 +96 @@
         setContextMenuPolicy(Qt::ActionsContextMenu);
 
+        connect(&m_manager, SIGNAL(finished(QNetworkReply*)),
+                this, SLOT(handleNetworkData(QNetworkReply*)));
+
         QTimer::singleShot(0, this, SLOT(delayedInit()));
     }
@@ -104 +104 @@
 private slots:
     void delayedInit() {
-#if defined(Q_OS_SYMBIAN)
-        qt_SetDefaultIap();
-#endif
         request("Oslo");
     }
@@ -123 +120 @@
             digest(QString::fromUtf8(networkReply->readAll()));
         networkReply->deleteLater();
-        networkReply->manager()->deleteLater();
     }
 
@@ -186 +182 @@
         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();