REfactored DataProvider method names

diff --git a/application/app.cpp b/application/app.cpp
index 8c950c4..77302e4 100644 (file)
--- a/application/app.cpp
+++ b/application/app.cpp
@@ -54,11 +54,11 @@ App::App(QObject *parent) :
 {
     stationListModel->load("stations:stations.qpl");
 
-    connect(dataProvider, SIGNAL(queryStationCompleted(QByteArray)),
+    connect(dataProvider, SIGNAL(stationScheduleReady(QByteArray)),
             SLOT(downloadFinished(QByteArray)));
 
-    connect(stationListView, SIGNAL(stationSelected(const QString &)),
-            SLOT(queryStation(const QString &)));
+    connect(stationListView, SIGNAL(stationSelected(QString)),
+            SLOT(queryStation(QString)));
 
     connect(stationListView, SIGNAL(aboutTriggered()),
             SLOT(showAboutDialog()));
@@ -105,7 +105,7 @@ void App::downloadFinished(const QByteArray &data)
 
 void App::queryStation(const QString &station)
 {
-    dataProvider->queryStation(station);
+    dataProvider->stationSchedule(station);
 #ifdef Q_WS_MAEMO_5
     stationListView->setAttribute(Qt::WA_Maemo5ShowProgressIndicator, true);
 #endif

diff --git a/application/dataprovider.cpp b/application/dataprovider.cpp
index f0fe577..366e615 100644 (file)
--- a/application/dataprovider.cpp
+++ b/application/dataprovider.cpp
@@ -26,17 +26,22 @@ Boston, MA 02110-1301, USA.
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
+#include <QWebElement>
+#include <QWebFrame>
+#include <QWebPage>
 
 // Constants
 static const int RECENT_STATIONS_MAX_COUNT = 10;
 
+// Class methods
+
 DataProvider::DataProvider(QObject *parent) :
     QObject(parent),
     accessManager(new QNetworkAccessManager(this))
 {
 }
 
-void DataProvider::queryStation(const QString &station)
+void DataProvider::stationSchedule(const QString &station)
 {
     QNetworkRequest request;
     Settings *settings = Settings::instance();
@@ -45,7 +50,7 @@ void DataProvider::queryStation(const QString &station)
     const QByteArray query(queryString.toLocal8Bit());
     stationQueryReply = accessManager->post(request, query);
     connect(stationQueryReply, SIGNAL(finished()),
-            SLOT(onQueryStationReply()));
+            SLOT(onStationScheduleReady()));
     settings->recentStations().push_front(station);
     settings->recentStations().removeDuplicates();
     if (settings->recentStations().count() > RECENT_STATIONS_MAX_COUNT) {
@@ -60,16 +65,16 @@ void DataProvider::updateStation()
 
     qDebug() << "updating station data";
     if (!settings->recentStations().isEmpty()) {
-        queryStation(settings->recentStations().front());
+        stationSchedule(settings->recentStations().front());
     }
 }
 
-void DataProvider::onQueryStationReply()
+void DataProvider::onStationScheduleReady()
 {
     disconnect(stationQueryReply, SIGNAL(finished()),
                this, SLOT(downloadFinished()));
     // TODO implement parsing or data returning...
-    emit queryStationCompleted(stationQueryReply->readAll());
+    emit stationScheduleReady(stationQueryReply->readAll());
     stationQueryReply->deleteLater();
     stationQueryReply = 0;
 }

diff --git a/application/dataprovider.h b/application/dataprovider.h
index 38990a6..49b3ea3 100644 (file)
--- a/application/dataprovider.h
+++ b/application/dataprovider.h
@@ -34,14 +34,14 @@ public:
     explicit DataProvider(QObject *parent = 0);
 
 signals:
-    void queryStationCompleted(const QByteArray &result);
+    void stationScheduleReady(const QByteArray &result);
 
 public slots:
-    void queryStation(const QString &station);
+    void stationSchedule(const QString &station);
     void updateStation();
 
 private slots:
-    void onQueryStationReply(void);
+    void onStationScheduleReady(void);
 
 private:
     QNetworkAccessManager *accessManager;