Couple of unnecessary includes removed.

[jenirok] / src / daemon / calllistener.h

diff --git a/src/daemon/calllistener.h b/src/daemon/calllistener.h
index 6395048..2ec5b7f 100644 (file)
--- a/src/daemon/calllistener.h
+++ b/src/daemon/calllistener.h
@@ -25,7 +25,7 @@
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusObjectPath>
 #include "informationbox.h"
-#include "eniro.h"
+#include "source.h"
 
 class CallListener: public QObject
 {
@@ -42,13 +42,13 @@ public:
     static const int CONNECT_RETRIES = 3;
     static const int CONNECTION_LOOKUP_RETRIES = 15;
     static const int WAIT_BETWEEN_RETRIES = 1000;
-    static const int ERROR_BANNER_TIMEOUT = 4000;
+    static const int ERROR_BANNER_TIMEOUT = 4500;
 
 protected:
     virtual void timerEvent(QTimerEvent* event);
 
 private slots:
-    void requestFinished(QVector <Eniro::Result> const& results, Eniro::SearchDetails const& details, bool error);
+    void requestFinished(QVector <Source::Result> const& results, Source::SearchDetails const& details, bool error);
     void incomingCall(QDBusObjectPath path, QString numbe);
     void callTerminate();
     void showTimedMessage();
@@ -56,17 +56,21 @@ private slots:
 private:
     Q_DISABLE_COPY(CallListener);
 
-    void search(Eniro::SearchDetails const& details);
+    void search(Source::SearchDetails const& details);
     void showResult(QString const& text);
     void showDelayedResult(QString const& text, int delay);
     void searchInit();
     void searchClose();
     bool handleConnection();
-    void showError(QString const& msg);
+    void showError(QString const& msg, int delay = 0);
     void sleep(int ms);
+    void findGprsId();
+    bool is3g();
     QString createResult(QString const& name, QString const& street, QString const& city);
     QString timedMessage_;
-    Eniro* eniro_;
+    Source* source_;
+    Source::SourceId sourceId_;
+    QMap<QString, QString> sourceConfig_;
     bool closeConnection_;
     bool initialized_;
     InformationBox* box_;
@@ -74,8 +78,8 @@ private:
     static QDBusConnection systemBus_;
     int retries_;
     QString currentSearch_;
-    Eniro::Site site_;
     int timer_;
+    QString gprsId_;
 };
 
 #endif // CALLLISTENER_H