Fix disconnect() and change signal signature

diff --git a/application/dataprovider.cpp b/application/dataprovider.cpp
index 366e615..e6dfe25 100644 (file)
--- a/application/dataprovider.cpp
+++ b/application/dataprovider.cpp
@@ -72,9 +72,10 @@ void DataProvider::updateStation()
 void DataProvider::onStationScheduleReady()
 {
     disconnect(stationQueryReply, SIGNAL(finished()),
-               this, SLOT(downloadFinished()));
+               this, SLOT(onStationScheduleReady()));
     // TODO implement parsing or data returning...
-    emit stationScheduleReady(stationQueryReply->readAll());
+    emit stationScheduleReady(QString::fromUtf8(stationQueryReply->readAll()),
+                              stationQueryReply->url());
     stationQueryReply->deleteLater();
     stationQueryReply = 0;
 }

diff --git a/application/dataprovider.h b/application/dataprovider.h
index 49b3ea3..12e4f6c 100644 (file)
--- a/application/dataprovider.h
+++ b/application/dataprovider.h
@@ -26,6 +26,7 @@ Boston, MA 02110-1301, USA.
 
 class QNetworkAccessManager;
 class QNetworkReply;
+class QUrl;
 
 class DataProvider : public QObject
 {
@@ -34,7 +35,7 @@ public:
     explicit DataProvider(QObject *parent = 0);
 
 signals:
-    void stationScheduleReady(const QByteArray &result);
+    void stationScheduleReady(const QString &result, const QUrl &url);
 
 public slots:
     void stationSchedule(const QString &station);