Unnecessary includes removed.

diff --git a/Makefile b/Makefile
index b7355fa..79a8684 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: jenirok
 #############################################################################
 # Makefile for building: jenirok

-# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu Jun 10 20:04:24 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu Jun 10 20:41:54 2010

 # Project:  jenirok.pro
 # Template: subdirs
 # Command: /usr/bin/qmake -unix -o Makefile jenirok.pro
 # Project:  jenirok.pro
 # Template: subdirs
 # Command: /usr/bin/qmake -unix -o Makefile jenirok.pro

diff --git a/src/common/cache.cpp b/src/common/cache.cpp
index 3f5bd4e..56e37d0 100644 (file)
--- a/src/common/cache.cpp
+++ b/src/common/cache.cpp
@@ -19,7 +19,7 @@
 #include <QtSql/QSqlQuery>
 #include <QtSql/QSqlError>
 #include <QtCore/QVariant>
 #include <QtSql/QSqlQuery>
 #include <QtSql/QSqlError>
 #include <QtCore/QVariant>

-#include <QDebug>
+#include <QtCore/QDebug>

 #include "cache.h"
 #include "db.h"
 #include "settings.h"
 #include "cache.h"
 #include "db.h"
 #include "settings.h"

diff --git a/src/common/connectionmanager.cpp b/src/common/connectionmanager.cpp
index caf6709..d6bddff 100644 (file)
--- a/src/common/connectionmanager.cpp
+++ b/src/common/connectionmanager.cpp
@@ -16,11 +16,11 @@
  *
  */
 
  *
  */
 

-#include <QDebug>
-#include <QApplication>
+#include <QtCore/QDebug>

 #include <QtCore/QTimerEvent>
 #include <QtCore/QVariant>
 #include <QtCore/QStringList>
 #include <QtCore/QTimerEvent>
 #include <QtCore/QVariant>
 #include <QtCore/QStringList>

+#include <QtGui/QApplication>

 #include <QtDBus/QDBusArgument>
 #include <QtDBus/QDBusConnection>
 #include <icd/dbus_api.h>
 #include <QtDBus/QDBusArgument>
 #include <QtDBus/QDBusConnection>
 #include <icd/dbus_api.h>

diff --git a/src/common/contactmanager.cpp b/src/common/contactmanager.cpp
index c2e886f..e674a4b 100644 (file)
--- a/src/common/contactmanager.cpp
+++ b/src/common/contactmanager.cpp
@@ -16,7 +16,7 @@
  *
  */
 
  *
  */
 

-#include <QDebug>
+#include <QtCore/QDebug>

 #include "contactmanager.h"
 
 namespace
 #include "contactmanager.h"
 
 namespace

diff --git a/src/common/db.cpp b/src/common/db.cpp
index d7b7dfa..83aa85f 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -17,10 +17,10 @@
  */
 
 #include <QtCore/QDir>
  */
 
 #include <QtCore/QDir>

+#include <QtCore/QDebug>

 #include <QtSql/QSqlQuery>
 #include <QtSql/QSqlError>
 #include "db.h"
 #include <QtSql/QSqlQuery>
 #include <QtSql/QSqlError>
 #include "db.h"

-#include <QDebug>

 
 namespace
 {
 
 namespace
 {

diff --git a/src/common/eniro.h b/src/common/eniro.h
index 733508a..f29a1bc 100644 (file)
--- a/src/common/eniro.h
+++ b/src/common/eniro.h
@@ -135,11 +135,9 @@ private:
     bool findNumber_;
     typedef QMap <int, SearchData*> searchMap;
     typedef QMap <int, NumberData*> numberMap;
     bool findNumber_;
     typedef QMap <int, SearchData*> searchMap;
     typedef QMap <int, NumberData*> numberMap;

-

     searchMap pendingSearches_;
     numberMap pendingNumberRequests_;
     QSet <int> pendingLoginRequests_;
     searchMap pendingSearches_;
     numberMap pendingNumberRequests_;
     QSet <int> pendingLoginRequests_;

-

     static QRegExp numberCleaner_;
     static QRegExp tagStripper_;
 
     static QRegExp numberCleaner_;
     static QRegExp tagStripper_;
 

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 46ea56e..c0296cd 100644 (file)
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -18,7 +18,7 @@
 
 #include <QtSql/QSqlQuery>
 #include <QtCore/QVariant>
 
 #include <QtSql/QSqlQuery>
 #include <QtCore/QVariant>

-#include <QDebug>
+#include <QtCore/QDebug>

 #include <gconf/gconf-client.h>
 #include "settings.h"
 #include "db.h"
 #include <gconf/gconf-client.h>
 #include "settings.h"
 #include "db.h"

diff --git a/src/daemon/calllistener.cpp b/src/daemon/calllistener.cpp
index 821c073..6c25bfc 100644 (file)
--- a/src/daemon/calllistener.cpp
+++ b/src/daemon/calllistener.cpp
@@ -40,7 +40,7 @@ QDBusConnection CallListener::systemBus_ = QDBusConnection::systemBus();
 
 CallListener::CallListener(): eniro_(0),
 closeConnection_(false), initialized_(false), box_(0), label_(0),
 
 CallListener::CallListener(): eniro_(0),
 closeConnection_(false), initialized_(false), box_(0), label_(0),

-retries_(-1), site_(Eniro::FI), timer_(0), autoconnect_(false)
+retries_(-1), site_(Eniro::FI), timer_(0)

 {
 }
 
 {
 }
 

diff --git a/src/daemon/calllistener.h b/src/daemon/calllistener.h
index a07743e..6395048 100644 (file)
--- a/src/daemon/calllistener.h
+++ b/src/daemon/calllistener.h
@@ -75,9 +75,7 @@ private:
     int retries_;
     QString currentSearch_;
     Eniro::Site site_;
     int retries_;
     QString currentSearch_;
     Eniro::Site site_;

-    QString connectionName_;

     int timer_;
     int timer_;

-    bool autoconnect_;

 };
 
 #endif // CALLLISTENER_H
 };
 
 #endif // CALLLISTENER_H

diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index 307bb4d..cc9b642 100644 (file)
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -21,7 +21,6 @@
 #include <QtCore/QLocale>
 #include <QtCore/QString>
 #include <QtGui/QApplication>
 #include <QtCore/QLocale>
 #include <QtCore/QString>
 #include <QtGui/QApplication>

-#include <QDebug>

 #include "calllistener.h"
 #include "settings.h"
 
 #include "calllistener.h"
 #include "settings.h"
 

diff --git a/src/gui/connectionselector.cpp b/src/gui/connectionselector.cpp
index 740e2a8..8a148af 100644 (file)
--- a/src/gui/connectionselector.cpp
+++ b/src/gui/connectionselector.cpp
@@ -18,7 +18,7 @@
 
 #include <QtCore/QList>
 #include <QtCore/QVariant>
 
 #include <QtCore/QList>
 #include <QtCore/QVariant>

-#include <QDebug>
+#include <QtCore/QDebug>

 #include "connectionselector.h"
 #include "connectionmanager.h"
 
 #include "connectionselector.h"
 #include "connectionmanager.h"
 

diff --git a/src/gui/daemon.cpp b/src/gui/daemon.cpp
index 0b0d635..e0e001a 100644 (file)
--- a/src/gui/daemon.cpp
+++ b/src/gui/daemon.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <QtCore/QProcess>
  */
 
 #include <QtCore/QProcess>

-#include <QDebug>

 #include "daemon.h"
 
 namespace
 #include "daemon.h"
 
 namespace

diff --git a/src/gui/detailwindow.cpp b/src/gui/detailwindow.cpp
index 24bb2ec..d34d282 100644 (file)
--- a/src/gui/detailwindow.cpp
+++ b/src/gui/detailwindow.cpp
@@ -16,16 +16,16 @@
  *
  */
 
  *
  */
 

+#include <QtCore/QDebug>

 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusMessage>
 #include <QtGui/QMessageBox>
 #include <QtGui/QLabel>
 #include <QtGui/QClipboard>
 #include <QtGui/QDialogButtonBox>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusMessage>
 #include <QtGui/QMessageBox>
 #include <QtGui/QLabel>
 #include <QtGui/QClipboard>
 #include <QtGui/QDialogButtonBox>

+#include <QtGui/QApplication>

 #include <QMaemo5ValueButton>
 #include <QMaemo5InformationBox>
 #include <QMaemo5ValueButton>
 #include <QMaemo5InformationBox>

-#include <QApplication>
-#include <QDebug>

 #include "detailwindow.h"
 #include "contactmanager.h"
 
 #include "detailwindow.h"
 #include "contactmanager.h"
 

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index fdb1245..0bce49a 100644 (file)
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -18,8 +18,8 @@
 
 #include <QtCore/QTranslator>
 #include <QtCore/QLocale>
 
 #include <QtCore/QTranslator>
 #include <QtCore/QLocale>

-#include <QtGui/QApplication>

 #include <QtCore/QObject>
 #include <QtCore/QObject>

+#include <QtGui/QApplication>

 #include "mainwindow.h"
 #include "searchdialog.h"
 #include "resultwindow.h"
 #include "mainwindow.h"
 #include "searchdialog.h"
 #include "resultwindow.h"

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index f16e852..7c0221a 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -24,8 +24,8 @@
 #include <QtGui/QMessageBox>
 #include <QtGui/QDialogButtonBox>
 #include <QtGui/QTextEdit>
 #include <QtGui/QMessageBox>
 #include <QtGui/QDialogButtonBox>
 #include <QtGui/QTextEdit>

+#include <QtCore/QDebug>

 #include <QMaemo5InformationBox>
 #include <QMaemo5InformationBox>

-#include <QDebug>

 #include "mainwindow.h"
 #include "settingsdialog.h"
 #include "searchdialog.h"
 #include "mainwindow.h"
 #include "settingsdialog.h"
 #include "searchdialog.h"

diff --git a/src/gui/resultwindow.cpp b/src/gui/resultwindow.cpp
index b0336de..1a3d954 100644 (file)
--- a/src/gui/resultwindow.cpp
+++ b/src/gui/resultwindow.cpp
@@ -16,7 +16,7 @@
  *
  */
 
  *
  */
 

-#include <QDebug>
+#include <QtCore/QDebug>

 #include <QtCore/QVariant>
 #include <QtCore/QString>
 #include <QtGui/QLabel>
 #include <QtCore/QVariant>
 #include <QtCore/QString>
 #include <QtGui/QLabel>

diff --git a/src/gui/searchdialog.cpp b/src/gui/searchdialog.cpp
index 702075c..1097b80 100644 (file)
--- a/src/gui/searchdialog.cpp
+++ b/src/gui/searchdialog.cpp
@@ -16,12 +16,12 @@
  *
  */
 
  *
  */
 

+#include <QtCore/QDebug>

 #include <QtGui/QHBoxLayout>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QDialogButtonBox>
 #include <QMaemo5ValueButton>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QDialogButtonBox>
 #include <QMaemo5ValueButton>

-#include <QDebug>

 #include "searchdialog.h"
 
 SearchDialog::SearchDialog(QWidget* parent): QDialog(parent),
 #include "searchdialog.h"
 
 SearchDialog::SearchDialog(QWidget* parent): QDialog(parent),

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 11f0649..bb2d351 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -16,6 +16,7 @@
  *
  */
 
  *
  */
 

+#include <QtCore/QDebug>

 #include <QtGui/QLabel>
 #include <QtGui/QPushButton>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QPushButton>
 #include <QtGui/QVBoxLayout>

@@ -25,7 +26,6 @@
 #include <QtGui/QTabWidget>
 #include <QMaemo5ValueButton>
 #include <QMaemo5InformationBox>
 #include <QtGui/QTabWidget>
 #include <QMaemo5ValueButton>
 #include <QMaemo5InformationBox>

-#include <QDebug>

 #include "settingsdialog.h"
 #include "settings.h"
 #include "db.h"
 #include "settingsdialog.h"
 #include "settings.h"
 #include "db.h"

@@ -188,7 +188,6 @@ void SettingsDialog::setVisible(bool visible)
     if(visible)
     {
         currentSite_ = siteSelector_->value().toString();
     if(visible)
     {
         currentSite_ = siteSelector_->value().toString();

-        currentConnection_ = connectionSelector_->value().toString();

     }
 
 }
     }
 
 }

diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h
index d150d4a..d45aae7 100644 (file)
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -51,7 +51,6 @@ private:
     ButtonSelector* autostartSelector_;
     ConnectionSelector* connectionSelector_;
     QString currentSite_;
     ButtonSelector* autostartSelector_;
     ConnectionSelector* connectionSelector_;
     QString currentSite_;

-    QString currentConnection_;

 };
 
 #endif
 };
 
 #endif