From: Torste Aikio <zokier@zokier.laptop>
Date: Wed, 7 Jul 2010 06:54:48 +0000 (+0300)
Subject: Removed onlinepollerthread
X-Git-Url: http://vcs.maemo.org/git/?p=irwi;a=commitdiff_plain;h=2fd880d1c64dfb6beb787c3ec4a6613926b9fd83

Removed onlinepollerthread
---

diff --git a/src/onlinepollerthread.cpp b/src/onlinepollerthread.cpp
deleted file mode 100644
index 6e1cdac..0000000
--- a/src/onlinepollerthread.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "onlinepollerthread.h"
-#include <QNetworkConfigurationManager>
-#include <QDBusMessage>
-#include <QDBusConnection>
-
-void OnlinePollerThread::run()
-{
-    running = true;
-    QTM_PREPEND_NAMESPACE(QNetworkConfigurationManager) qncm;
-    if (!qncm.isOnline()) {
-        QDBusMessage m = QDBusMessage::createMethodCall(
-                "com.nokia.icd_ui", "/com/nokia/icd_ui", 
-                "com.nokia.icd_ui", "show_conn_dlg");
-        m << false;
-        QDBusConnection::systemBus().send(m);
-        while(running)
-        {
-            if (!qncm.isOnline()) {
-                msleep(250);
-            } else {
-                emit online();
-                break;
-            }
-        }
-    }
-    exec();
-}
-
-void OnlinePollerThread::stop()
-{
-    running = false;
-}
-
diff --git a/src/onlinepollerthread.h b/src/onlinepollerthread.h
deleted file mode 100644
index 9c4c521..0000000
--- a/src/onlinepollerthread.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef ONLINEPOLLERTHREAD_H
-#define ONLINEPOLLERTHREAD_H
-
-#include <QThread>
-
-class OnlinePollerThread : public QThread
-{
-    Q_OBJECT
-public:
-    //overrides QThread::run()
-    void run();
-
-signals:
-    void online();
-
-public:
-    void stop();
-
-private:
-    bool running;
-};
-
-#endif //ONLINEPOLLERTHREAD_H
diff --git a/src/remotedbmgr.cpp b/src/remotedbmgr.cpp
index b22a592..476a804 100644
--- a/src/remotedbmgr.cpp
+++ b/src/remotedbmgr.cpp
@@ -10,6 +10,8 @@
 #include <QBuffer>
 #include <QByteArray>
 
+#include <QDebug>
+
 RemoteDBMgr::RemoteDBMgr()
 {
     connect(&netAM, SIGNAL(finished(QNetworkReply *)), 
@@ -51,6 +53,8 @@ void RemoteDBMgr::dbDownloadFinished(QNetworkReply *reply)
         if (!db.isEmpty()) {
             emit dbReady(&db);
         }
+    } else {
+        qDebug() << reply->error();
     }
 }
 
diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp
index dbc8115..2ffc121 100644
--- a/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@ -2,7 +2,6 @@
 
 #include "remote.h"
 #include "remotelistwidgetitem.h"
-#include "onlinepollerthread.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
@@ -18,7 +17,6 @@
 SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
     : QDialog(parent)
 {
-    onlinePollerThread = NULL;
     this->setWindowTitle(tr("Select remote"));
     this->setMinimumHeight(320);
 
@@ -55,12 +53,6 @@ SelectRemoteDlg::SelectRemoteDlg(QWidget *parent)
 SelectRemoteDlg::~SelectRemoteDlg()
 {
     delete layout;
-    if (onlinePollerThread != NULL) {
-        onlinePollerThread->stop();
-        onlinePollerThread->wait();
-        delete onlinePollerThread;
-        onlinePollerThread = NULL;
-    }
 }
 
 void SelectRemoteDlg::setDB(RemoteDB *db)
@@ -116,30 +108,10 @@ void SelectRemoteDlg::downloadRemote()
     }
 }
 
-void SelectRemoteDlg::getDB()
-{
-    if (onlinePollerThread != NULL) {
-        onlinePollerThread->stop();
-        onlinePollerThread->wait();
-        delete onlinePollerThread;
-        onlinePollerThread = NULL;
-    }
-    remoteDBMgr.getDBAsync();
-}
-
 void SelectRemoteDlg::refreshDB()
 {
     setBusy(true);
-    if (onlinePollerThread != NULL) {
-        onlinePollerThread->stop();
-        onlinePollerThread->wait();
-        delete onlinePollerThread;
-        onlinePollerThread = NULL;
-    }
-    onlinePollerThread = new OnlinePollerThread();
-    connect(onlinePollerThread, SIGNAL(online()),
-            this, SLOT(getDB()));
-    onlinePollerThread->run();
+    remoteDBMgr.getDBAsync();
 }
 
 void SelectRemoteDlg::showEvent(QShowEvent *event)
diff --git a/src/selectremotedlg.h b/src/selectremotedlg.h
index c4821f2..cf76d17 100644
--- a/src/selectremotedlg.h
+++ b/src/selectremotedlg.h
@@ -30,7 +30,6 @@ public:
 
 public slots:
     void refreshDB();
-    void getDB();
 
 private slots:
     void alphabetItemChanged(QListWidgetItem *current,
@@ -55,7 +54,6 @@ private:
     QListWidget *modelList;
     QPushButton *downloadBtn;
     RemoteDB *remoteDB;
-    OnlinePollerThread *onlinePollerThread;
 
     void setBusy(bool busy = true);
 };
diff --git a/src/src.pro b/src/src.pro
index b0592ad..4399b6c 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -15,7 +15,6 @@ SOURCES += advsettingsdlg.cpp
 SOURCES += settingstable.cpp
 SOURCES += aboutdlg.cpp
 SOURCES += remotelistwidgetitem.cpp
-SOURCES += onlinepollerthread.cpp
 
 HEADERS += rating.h
 HEADERS += settingsdlg.h
@@ -28,7 +27,6 @@ HEADERS += advsettingsdlg.h
 HEADERS += settingstable.h
 HEADERS += aboutdlg.h
 HEADERS += remotelistwidgetitem.h
-HEADERS += onlinepollerthread.h
 
 include(qmaemo5homescreenadaptor/qmaemo5homescreenadaptor.pri)
 
@@ -37,7 +35,6 @@ MOC_DIR = moc
 
 QT += network
 QT += xml
-QT += dbus
 
 CONFIG += mobility
 MOBILITY += bearer