25 files changed, 1 insertions, 67 deletions

diff --git a/libopie2/opiecore/odebug.cpp b/libopie2/opiecore/odebug.cpp
index 4505ce7..a40ef53 100644
--- a/libopie2/opiecore/odebug.cpp
+++ b/libopie2/opiecore/odebug.cpp
@@ -47,20 +47,9 @@
 
 /* QT */
 
-#include <qbrush.h>
-#include <qdatetime.h>
 #include <qfile.h>
-#include <qhostaddress.h>
 #include <qmessagebox.h>
-#include <qintdict.h>
-#include <qpoint.h>
-#include <qrect.h>
-#include <qregion.h>
-#include <qsize.h>
 #include <qsocketdevice.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtextstream.h>
 
 /* UNIX */
 
diff --git a/libopie2/opiecore/oglobal.cpp b/libopie2/opiecore/oglobal.cpp
index 879e80f..1aa206e 100644
--- a/libopie2/opiecore/oglobal.cpp
+++ b/libopie2/opiecore/oglobal.cpp
@@ -29,7 +29,6 @@
 
 #include <opie2/oglobal.h>
 
-#include <qfile.h>
 #include <qtextstream.h>
 #include <qdir.h>
 #include <qpe/mimetype.h>
diff --git a/libopie2/opiecore/oglobalsettings.cpp b/libopie2/opiecore/oglobalsettings.cpp
index 66adbd0..192e55b 100644
--- a/libopie2/opiecore/oglobalsettings.cpp
+++ b/libopie2/opiecore/oglobalsettings.cpp
@@ -38,10 +38,7 @@
 
 /* QT */
 
-#include <qobject.h>
 #include <qdir.h>
-#include <qpixmap.h>
-#include <qfontinfo.h>
 
 /* UNIX */
 
diff --git a/libopie2/opiecore/oprocctrl.cpp b/libopie2/opiecore/oprocctrl.cpp
index b3d57c8..0403526 100644
--- a/libopie2/opiecore/oprocctrl.cpp
+++ b/libopie2/opiecore/oprocctrl.cpp
@@ -39,7 +39,6 @@
 #include <assert.h>
 
 #include <qsocketnotifier.h>
-#include "oprocess.h"
 #include "oprocctrl.h"
 
 OProcessController *OProcessController::theOProcessController = 0;
diff --git a/libopie2/opiecore/oprocess.cpp b/libopie2/opiecore/oprocess.cpp
index 83677aa..0a361a1 100644
--- a/libopie2/opiecore/oprocess.cpp
+++ b/libopie2/opiecore/oprocess.cpp
@@ -37,9 +37,7 @@ _;:,     .>    :=|.         This program is free software; you can
 
 #include <qapplication.h>
 #include <qdir.h>
-#include <qfile.h>
 #include <qmap.h>
-#include <qregexp.h>
 #include <qsocketnotifier.h>
 #include <qtextstream.h>
 
diff --git a/libopie2/opiedb/osqlbackendmanager.cpp b/libopie2/opiedb/osqlbackendmanager.cpp
index 0f261b9..95ed77b 100644
--- a/libopie2/opiedb/osqlbackendmanager.cpp
+++ b/libopie2/opiedb/osqlbackendmanager.cpp
@@ -1,5 +1,4 @@
 #include <qdir.h>
-#include <qfile.h>
 #include <qmap.h>
 
 #include "osqlbackendmanager.h"
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index b857534..6141504 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -28,7 +28,6 @@
 
 */
 
-#include "osqlresult.h"
 #include "osqlquery.h"
 #include "osqlitedriver.h"
 
diff --git a/libopie2/opiedb/osqlmanager.cpp b/libopie2/opiedb/osqlmanager.cpp
index b0fea04..766ebe1 100644
--- a/libopie2/opiedb/osqlmanager.cpp
+++ b/libopie2/opiedb/osqlmanager.cpp
@@ -1,8 +1,6 @@
 
 #include <stdlib.h>
 
-#include "osqlbackend.h"
-#include "osqldriver.h"
 #include "osqlmanager.h"
 #include "osqlbackendmanager.h"
 #include "osqlitedriver.h"
diff --git a/libopie2/opiedb/osqlresult.cpp b/libopie2/opiedb/osqlresult.cpp
index 490fb45..42da356 100644
--- a/libopie2/opiedb/osqlresult.cpp
+++ b/libopie2/opiedb/osqlresult.cpp
@@ -1,5 +1,4 @@
 
-#include "osqlquery.h"
 #include "osqlresult.h"
 
 OSQLResultItem::OSQLResultItem( const TableString& string,
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp
index ca63389..51e088c 100644
--- a/libopie2/opiemm/osoundsystem.cpp
+++ b/libopie2/opiemm/osoundsystem.cpp
@@ -40,7 +40,6 @@
 #include <sys/soundcard.h>
 #include <sys/stat.h>
 
-#include <qstringlist.h>
 
 /*======================================================================================
  * OSoundSystem
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index 2da549c..b93b752 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -40,7 +40,6 @@
 
 /* QT */
 #include <qapplication.h>
-#include <qstring.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 0adba68..5d92b8f 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -33,13 +33,11 @@
 #include <opie2/ocontactaccessbackend_xml.h>
 
 #include <qasciidict.h>
-#include <qdatetime.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qarray.h>
 #include <qmap.h>
-#include <qdatetime.h>
 
 #include <qpe/global.h>
 
diff --git a/libopie2/opiepim/core/opimcontact.cpp b/libopie2/opiepim/core/opimcontact.cpp
index a5df597..4a774e8 100644
--- a/libopie2/opiepim/core/opimcontact.cpp
+++ b/libopie2/opiepim/core/opimcontact.cpp
@@ -39,11 +39,7 @@
 #include <qpe/config.h>
 
 /* QT */
-#include <qobject.h>
-#include <qregexp.h>
 #include <qstylesheet.h>
-#include <qfileinfo.h>
-#include <qmap.h>
 
 /* STD */
 #include <stdio.h>
diff --git a/libopie2/opiepim/core/opimcontactfields.cpp b/libopie2/opiepim/core/opimcontactfields.cpp
index 4b0ba3b..120beb6 100644
--- a/libopie2/opiepim/core/opimcontactfields.cpp
+++ b/libopie2/opiepim/core/opimcontactfields.cpp
@@ -31,12 +31,10 @@
 
 /* OPIE */
 #include <opie2/opimcontact.h>
-#include <qpe/recordfields.h> // We should use our own enum in the future ..
 #include <qpe/config.h>
 
 /* QT */
 #include <qobject.h>
-#include <qstringlist.h>
 
 
 namespace Opie
diff --git a/libopie2/opiepim/core/opimevent.cpp b/libopie2/opiepim/core/opimevent.cpp
index 3ddbf85..77730e9 100644
--- a/libopie2/opiepim/core/opimevent.cpp
+++ b/libopie2/opiepim/core/opimevent.cpp
@@ -34,12 +34,9 @@
 #include <opie2/opimresolver.h>
 #include <opie2/opimnotifymanager.h>
 #include <qpe/categories.h>
-#include <qpe/palmtopuidgen.h>
 #include <qpe/stringutil.h>
 
 /* QT */
-#include <qshared.h>
-#include <qarray.h>
 
 namespace Opie
 {
diff --git a/libopie2/opiepim/core/opimnotify.cpp b/libopie2/opiepim/core/opimnotify.cpp
index 43858f0..417b0b9 100644
--- a/libopie2/opiepim/core/opimnotify.cpp
+++ b/libopie2/opiepim/core/opimnotify.cpp
@@ -30,7 +30,6 @@
 #include "opimnotify.h"
 
 /* QT */
-#include <qshared.h>
 
 namespace Opie
 {
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp
index c603f44..67eed41 100644
--- a/libopie2/opiepim/core/opimrecord.cpp
+++ b/libopie2/opiepim/core/opimrecord.cpp
@@ -34,7 +34,6 @@
 #include <qpe/categoryselect.h>
 
 /* QT */
-#include <qarray.h>
 
 namespace Opie
 {
diff --git a/libopie2/opiepim/core/opimtodo.cpp b/libopie2/opiepim/core/opimtodo.cpp
index 34df807..f246bfd 100644
--- a/libopie2/opiepim/core/opimtodo.cpp
+++ b/libopie2/opiepim/core/opimtodo.cpp
@@ -36,11 +36,10 @@
 #include <opie2/opimnotifymanager.h>
 #include <opie2/opimresolver.h>
 #include <qpe/palmtopuidgen.h>
-#include <qpe/stringutil.h>
 #include <qpe/palmtoprecord.h>
-#include <qpe/stringutil.h>
 #include <qpe/categories.h>
 #include <qpe/categoryselect.h>
+#include <qpe/stringutil.h>
 
 /* QT */
 #include <qobject.h>
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp
index 49628c9..49ddeb6 100644
--- a/libopie2/opieui/ofontselector.cpp
+++ b/libopie2/opieui/ofontselector.cpp
@@ -36,7 +36,6 @@
 #include <qlistbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
-#include <qfont.h>
 #include <qmultilineedit.h>
 
 using namespace Opie;
diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp
index 38f3fe2..84617f8 100644
--- a/libopie2/opieui/olistview.cpp
+++ b/libopie2/opieui/olistview.cpp
@@ -29,9 +29,6 @@
 
 /* QT */
 
-#include <qcolor.h>
-#include <qheader.h>
-#include <qpainter.h>
 #include <qpixmap.h>
 
 /* OPIE */
diff --git a/libopie2/opieui/opopupmenu.cpp b/libopie2/opieui/opopupmenu.cpp
index ac73188..d5cc575 100644
--- a/libopie2/opieui/opopupmenu.cpp
+++ b/libopie2/opieui/opopupmenu.cpp
@@ -19,15 +19,8 @@
 
 /* QT */
 
-#include <qapplication.h>
-#include <qcursor.h>
-#include <qpainter.h>
 #include <qdrawutil.h>
 #include <qtimer.h>
-#include <qfont.h>
-#include <qfontmetrics.h>
-#include <qregexp.h>
-#include <qstyle.h>
 
 /* OPIE */
 
diff --git a/libopie2/opieui/oselector.cpp b/libopie2/opieui/oselector.cpp
index ec5af6b..23b3ce3 100644
--- a/libopie2/opieui/oselector.cpp
+++ b/libopie2/opieui/oselector.cpp
@@ -20,7 +20,6 @@
 /* QT */
 
 #include <qimage.h>
-#include <qpainter.h>
 #include <qdrawutil.h>
 
 /* OPIE */
diff --git a/libopie2/opieui/oseparator.cpp b/libopie2/opieui/oseparator.cpp
index 98d42c7..b93c225 100644
--- a/libopie2/opieui/oseparator.cpp
+++ b/libopie2/opieui/oseparator.cpp
@@ -36,7 +36,6 @@
 
 /* QT */
 
-#include <qstyle.h>
 
 OSeparator::OSeparator(QWidget* parent, const char* name, WFlags f)
    : QFrame(parent, name, f)
diff --git a/libopie2/opieui/otimepicker.cpp b/libopie2/opieui/otimepicker.cpp
index 9f9f2c2..d4712a4 100644
--- a/libopie2/opieui/otimepicker.cpp
+++ b/libopie2/opieui/otimepicker.cpp
@@ -28,11 +28,8 @@
 */
 
 /* QT */
-#include <qbuttongroup.h>
 #include <qlayout.h>
 #include <qlineedit.h>
-#include <qstring.h>
-#include <qtoolbutton.h>
 
 /* OPIE */
 #include <opie2/otimepicker.h>
diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp
index 65fe3d8..8839456 100644
--- a/libopie2/opieui/oversatileview.cpp
+++ b/libopie2/opieui/oversatileview.cpp
@@ -38,18 +38,7 @@
 /* QT */
 
 #include <qaction.h>
-#include <qbrush.h>
-#include <qfont.h>
-#include <qiconset.h>
-#include <qiconview.h>
-#include <qlistview.h>
-#include <qpalette.h>
-#include <qpoint.h>
 #include <qpopupmenu.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qstring.h>
-#include <qwidgetstack.h>
 
 /* XPM */
 static const char * view_icon_xpm[] = {