summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/batteryapplet/battery.cpp1
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp2
-rw-r--r--core/applets/cardmon/cardmon.cpp2
-rw-r--r--core/applets/homeapplet/home.cpp2
-rw-r--r--core/applets/irdaapplet/irda.cpp5
-rw-r--r--core/applets/logoutapplet/logout.cpp2
-rw-r--r--core/applets/multikeyapplet/multikey.cpp6
-rw-r--r--core/launcher/applauncher.cpp4
-rw-r--r--core/launcher/firstuse.cpp8
-rw-r--r--core/launcher/inputmethods.cpp6
-rw-r--r--core/launcher/irserver.cpp1
-rw-r--r--core/launcher/launcher.cpp2
-rw-r--r--core/launcher/launcherglobal.cpp4
-rw-r--r--core/launcher/launchertab.cpp3
-rw-r--r--core/launcher/launcherview.cpp14
-rw-r--r--core/launcher/main.cpp5
-rw-r--r--core/launcher/packageslave.cpp2
-rw-r--r--core/launcher/qcopbridge.cpp8
-rw-r--r--core/launcher/runningappbar.cpp7
-rw-r--r--core/launcher/screensaver.cpp1
-rw-r--r--core/launcher/server.cpp3
-rw-r--r--core/launcher/shutdownimpl.cpp1
-rw-r--r--core/launcher/stabmon.cpp1
-rw-r--r--core/launcher/startmenu.cpp4
-rw-r--r--core/launcher/syncdialog.cpp1
-rw-r--r--core/launcher/systray.cpp2
-rw-r--r--core/launcher/transferserver.cpp10
-rw-r--r--core/launcher/wait.cpp4
28 files changed, 1 insertions, 110 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index fed9b34..b2cef55 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -25,7 +25,6 @@
25#include <qpe/applnk.h> 25#include <qpe/applnk.h>
26#include <qpe/config.h> 26#include <qpe/config.h>
27#include <qpe/power.h> 27#include <qpe/power.h>
28#include <qpe/qpeapplication.h>
29 28
30/* QT */ 29/* QT */
31#include <qpainter.h> 30#include <qpainter.h>
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index b9ca7b5..ea11495 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -6,13 +6,11 @@
6#include <qpe/power.h> 6#include <qpe/power.h>
7 7
8/* QT */ 8/* QT */
9#include <qpainter.h>
10#include <qpushbutton.h> 9#include <qpushbutton.h>
11#include <qdrawutil.h> 10#include <qdrawutil.h>
12#include <qfile.h> 11#include <qfile.h>
13#include <qlayout.h> 12#include <qlayout.h>
14#include <qtextstream.h> 13#include <qtextstream.h>
15#include <qapplication.h>
16#include <qmessagebox.h> 14#include <qmessagebox.h>
17 15
18using namespace Opie; 16using namespace Opie;
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 8ffaada..7625545 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -25,10 +25,8 @@
25#include <qpe/resource.h> 25#include <qpe/resource.h>
26 26
27/* QT */ 27/* QT */
28#include <qapplication.h>
29#include <qcopchannel_qws.h> 28#include <qcopchannel_qws.h>
30#include <qpainter.h> 29#include <qpainter.h>
31#include <qmessagebox.h>
32#include <qfile.h> 30#include <qfile.h>
33#include <qtextstream.h> 31#include <qtextstream.h>
34#include <qsound.h> 32#include <qsound.h>
diff --git a/core/applets/homeapplet/home.cpp b/core/applets/homeapplet/home.cpp
index 455575f..8a930be 100644
--- a/core/applets/homeapplet/home.cpp
+++ b/core/applets/homeapplet/home.cpp
@@ -2,8 +2,6 @@
2#include <qpe/qcopenvelope_qws.h> 2#include <qpe/qcopenvelope_qws.h>
3 3
4#include <qapplication.h> 4#include <qapplication.h>
5#include <qiconset.h>
6#include <qpopupmenu.h>
7 5
8#include "home.h" 6#include "home.h"
9 7
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index f850424..a47f33d 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -14,19 +14,14 @@
14** 14**
15**********************************************************************/ 15**********************************************************************/
16 16
17#include <qcopchannel_qws.h>
18 17
19#include <qpe/qpeapplication.h>
20#include <qpe/resource.h> 18#include <qpe/resource.h>
21#include <qpe/ir.h>
22#include <qpe/qcopenvelope_qws.h> 19#include <qpe/qcopenvelope_qws.h>
23#include <qpe/sound.h>
24 20
25#include <qpainter.h> 21#include <qpainter.h>
26#include <qfile.h> 22#include <qfile.h>
27#include <qtimer.h> 23#include <qtimer.h>
28#include <qtextstream.h> 24#include <qtextstream.h>
29#include <qpopupmenu.h>
30 25
31#include <unistd.h> 26#include <unistd.h>
32#include <net/if.h> 27#include <net/if.h>
diff --git a/core/applets/logoutapplet/logout.cpp b/core/applets/logoutapplet/logout.cpp
index 92222c9..0ac0067 100644
--- a/core/applets/logoutapplet/logout.cpp
+++ b/core/applets/logoutapplet/logout.cpp
@@ -2,8 +2,6 @@
2#include <qpe/qcopenvelope_qws.h> 2#include <qpe/qcopenvelope_qws.h>
3 3
4#include <qapplication.h> 4#include <qapplication.h>
5#include <qiconset.h>
6#include <qpopupmenu.h>
7#include <qmessagebox.h> 5#include <qmessagebox.h>
8 6
9#include <unistd.h> 7#include <unistd.h>
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp
index b36ee12..b17498d 100644
--- a/core/applets/multikeyapplet/multikey.cpp
+++ b/core/applets/multikeyapplet/multikey.cpp
@@ -16,16 +16,10 @@
16 16
17/* OPIE */ 17/* OPIE */
18#include <opie2/otaskbarapplet.h> 18#include <opie2/otaskbarapplet.h>
19#include <qpe/global.h>
20#include <qpe/config.h>
21#include <qpe/qcopenvelope_qws.h> 19#include <qpe/qcopenvelope_qws.h>
22#include <qpe/qpeapplication.h>
23 20
24/* QT */ 21/* QT */
25#include <qlabel.h>
26#include <qdir.h> 22#include <qdir.h>
27#include <qfileinfo.h>
28#include <qcopchannel_qws.h>
29 23
30Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") 24Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN")
31{ 25{
diff --git a/core/launcher/applauncher.cpp b/core/launcher/applauncher.cpp
index c3584ad..7d3c032 100644
--- a/core/launcher/applauncher.cpp
+++ b/core/launcher/applauncher.cpp
@@ -50,14 +50,10 @@
50#include <qtimer.h> 50#include <qtimer.h>
51#include <qwindowsystem_qws.h> 51#include <qwindowsystem_qws.h>
52#include <qmessagebox.h> 52#include <qmessagebox.h>
53#include <qfile.h>
54#include <qfileinfo.h> 53#include <qfileinfo.h>
55 54
56#include <qtopia/qcopenvelope_qws.h> 55#include <qtopia/qcopenvelope_qws.h>
57#include <qtopia/applnk.h>
58#include <qtopia/qpeapplication.h> 56#include <qtopia/qpeapplication.h>
59#include <qtopia/config.h>
60#include <qtopia/global.h>
61 57
62#include "applauncher.h" 58#include "applauncher.h"
63#include "documentlist.h" 59#include "documentlist.h"
diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp
index e07920f..50ae6c2 100644
--- a/core/launcher/firstuse.cpp
+++ b/core/launcher/firstuse.cpp
@@ -36,20 +36,13 @@
36 36
37#include <qtopia/resource.h> 37#include <qtopia/resource.h>
38#include <qtopia/qcopenvelope_qws.h> 38#include <qtopia/qcopenvelope_qws.h>
39#include <qtopia/qpeapplication.h>
40#include <qtopia/config.h> 39#include <qtopia/config.h>
41#include <qtopia/applnk.h>
42#include <qtopia/mimetype.h>
43#include <qtopia/fontmanager.h> 40#include <qtopia/fontmanager.h>
44 41
45#include <qapplication.h>
46#include <qfile.h> 42#include <qfile.h>
47#include <qpainter.h> 43#include <qpainter.h>
48#include <qcstring.h>
49#include <qsimplerichtext.h> 44#include <qsimplerichtext.h>
50#include <qcolor.h>
51#include <qpushbutton.h> 45#include <qpushbutton.h>
52#include <qhbox.h>
53#include <qlabel.h> 46#include <qlabel.h>
54#include <qtimer.h> 47#include <qtimer.h>
55 48
@@ -58,7 +51,6 @@
58#include <qgfx_qws.h> 51#include <qgfx_qws.h>
59#endif 52#endif
60 53
61#include <qwindowsystem_qws.h>
62 54
63#include <stdlib.h> 55#include <stdlib.h>
64#include <sys/types.h> 56#include <sys/types.h>
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index 5d8faf7..683f1e2 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -23,19 +23,13 @@
23 23
24#include <qtopia/config.h> 24#include <qtopia/config.h>
25#include <qtopia/qpeapplication.h> 25#include <qtopia/qpeapplication.h>
26#include <qtopia/inputmethodinterface.h>
27#include <qtopia/global.h>
28 26
29#include <qpopupmenu.h> 27#include <qpopupmenu.h>
30#include <qpushbutton.h>
31#include <qtoolbutton.h> 28#include <qtoolbutton.h>
32#include <qwidgetstack.h> 29#include <qwidgetstack.h>
33#include <qwidget.h>
34#include <qlayout.h> 30#include <qlayout.h>
35#include <qtimer.h>
36#include <qdir.h> 31#include <qdir.h>
37#include <stdlib.h> 32#include <stdlib.h>
38#include <qtranslator.h>
39#include <qtl.h> 33#include <qtl.h>
40 34
41#ifdef Q_WS_QWS 35#ifdef Q_WS_QWS
diff --git a/core/launcher/irserver.cpp b/core/launcher/irserver.cpp
index 63f8d05..a0e9c16 100644
--- a/core/launcher/irserver.cpp
+++ b/core/launcher/irserver.cpp
@@ -24,7 +24,6 @@
24#include <qtopia/qlibrary.h> 24#include <qtopia/qlibrary.h>
25#include <qtopia/qpeapplication.h> 25#include <qtopia/qpeapplication.h>
26 26
27#include <qtranslator.h>
28 27
29#include "obexinterface.h" 28#include "obexinterface.h"
30 29
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 984a57d..54efb0b 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -25,7 +25,6 @@
25#include <qtopia/resource.h> 25#include <qtopia/resource.h>
26#include <qtopia/applnk.h> 26#include <qtopia/applnk.h>
27#include <qtopia/config.h> 27#include <qtopia/config.h>
28#include <qtopia/global.h>
29#include <qtopia/qpeapplication.h> 28#include <qtopia/qpeapplication.h>
30#include <qtopia/mimetype.h> 29#include <qtopia/mimetype.h>
31#include <qtopia/private/categories.h> 30#include <qtopia/private/categories.h>
@@ -43,7 +42,6 @@
43#include <qpushbutton.h> 42#include <qpushbutton.h>
44#include <qtabbar.h> 43#include <qtabbar.h>
45#include <qwidgetstack.h> 44#include <qwidgetstack.h>
46#include <qlayout.h>
47#include <qregexp.h> 45#include <qregexp.h>
48#include <qmessagebox.h> 46#include <qmessagebox.h>
49#include <qframe.h> 47#include <qframe.h>
diff --git a/core/launcher/launcherglobal.cpp b/core/launcher/launcherglobal.cpp
index 84caa93..9abcae9 100644
--- a/core/launcher/launcherglobal.cpp
+++ b/core/launcher/launcherglobal.cpp
@@ -3,10 +3,6 @@
3 * 3 *
4 * TT 2002-2002,2003 4 * TT 2002-2002,2003
5 */ 5 */
6#include <qstring.h>
7#include <qcstring.h>
8#include <qwidget.h>
9#include <qguardedptr.h>
10#include <qfile.h> 6#include <qfile.h>
11#include <qtextstream.h> 7#include <qtextstream.h>
12 8
diff --git a/core/launcher/launchertab.cpp b/core/launcher/launchertab.cpp
index 10cfd5f..710f259 100644
--- a/core/launcher/launchertab.cpp
+++ b/core/launcher/launchertab.cpp
@@ -19,9 +19,6 @@
19**********************************************************************/ 19**********************************************************************/
20#include "launchertab.h" 20#include "launchertab.h"
21#include <qapplication.h> 21#include <qapplication.h>
22#include <qstyle.h>
23#include <qpainter.h>
24#include <qbitmap.h>
25 22
26 23
27LauncherTabBar::LauncherTabBar( QWidget *parent, const char *name ) 24LauncherTabBar::LauncherTabBar( QWidget *parent, const char *name )
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 62c678d..513b1bd 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -21,29 +21,15 @@
21#include "launcherview.h" 21#include "launcherview.h"
22 22
23#include <qtopia/qpeapplication.h> 23#include <qtopia/qpeapplication.h>
24#include <qtopia/applnk.h>
25#include <qtopia/qpedebug.h>
26#include <qtopia/private/categories.h> 24#include <qtopia/private/categories.h>
27#include <qtopia/categoryselect.h> 25#include <qtopia/categoryselect.h>
28#include <qtopia/menubutton.h>
29#include <qtopia/mimetype.h> 26#include <qtopia/mimetype.h>
30#include <qtopia/resource.h> 27#include <qtopia/resource.h>
31#include <qtopia/qpetoolbar.h>
32//#include <qtopia/private/palmtoprecord.h> 28//#include <qtopia/private/palmtoprecord.h>
33 29
34#include <qtimer.h> 30#include <qtimer.h>
35#include <qtextstream.h>
36#include <qdict.h>
37#include <qfile.h>
38#include <qfileinfo.h> 31#include <qfileinfo.h>
39#include <qhbox.h>
40#include <qiconview.h> 32#include <qiconview.h>
41#include <qwidgetstack.h>
42#include <qpainter.h>
43#include <qregexp.h>
44#include <qtoolbutton.h>
45#include <qimage.h>
46#include <qlabel.h>
47#include <qobjectlist.h> 33#include <qobjectlist.h>
48 34
49 35
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 9e53bb0..c136bd9 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -23,20 +23,15 @@
23#endif 23#endif
24#include "server.h" 24#include "server.h"
25#include "serverapp.h" 25#include "serverapp.h"
26#include "taskbar.h"
27#include "stabmon.h" 26#include "stabmon.h"
28#include "launcher.h"
29#include "firstuse.h" 27#include "firstuse.h"
30 28
31#include <opie2/oglobal.h> 29#include <opie2/oglobal.h>
32 30
33#include <qtopia/qpeapplication.h>
34#include <qtopia/network.h> 31#include <qtopia/network.h>
35#include <qtopia/config.h>
36//#include <qtopia/custom.h> 32//#include <qtopia/custom.h>
37 33
38 34
39#include <qfile.h>
40#include <qdir.h> 35#include <qdir.h>
41#ifdef QWS 36#ifdef QWS
42#include <qwindowsystem_qws.h> 37#include <qwindowsystem_qws.h>
diff --git a/core/launcher/packageslave.cpp b/core/launcher/packageslave.cpp
index bf34368..321b5dd 100644
--- a/core/launcher/packageslave.cpp
+++ b/core/launcher/packageslave.cpp
@@ -25,13 +25,11 @@
25#include <qtopia/qcopenvelope_qws.h> 25#include <qtopia/qcopenvelope_qws.h>
26#endif 26#endif
27 27
28#include <qdatastream.h>
29#ifdef Q_WS_QWS 28#ifdef Q_WS_QWS
30#include <qcopchannel_qws.h> 29#include <qcopchannel_qws.h>
31#endif 30#endif
32 31
33#include <qtextstream.h> 32#include <qtextstream.h>
34#include <qdir.h>
35 33
36#include <stdlib.h> 34#include <stdlib.h>
37#include <sys/stat.h> // mkdir() 35#include <sys/stat.h> // mkdir()
diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp
index 9bca360..24f471d 100644
--- a/core/launcher/qcopbridge.cpp
+++ b/core/launcher/qcopbridge.cpp
@@ -29,16 +29,8 @@
29#include <qtopia/qpeapplication.h> 29#include <qtopia/qpeapplication.h>
30 30
31#include <qtopia/version.h> 31#include <qtopia/version.h>
32#include <qtopia/config.h>
33 32
34#include <qdir.h>
35#include <qfile.h>
36#include <qtextstream.h> 33#include <qtextstream.h>
37#include <qdatastream.h>
38#include <qcstring.h>
39#include <qstringlist.h>
40#include <qfileinfo.h>
41#include <qregexp.h>
42#include <qtimer.h> 34#include <qtimer.h>
43#ifdef Q_WS_QWS 35#ifdef Q_WS_QWS
44#include <qcopchannel_qws.h> 36#include <qcopchannel_qws.h>
diff --git a/core/launcher/runningappbar.cpp b/core/launcher/runningappbar.cpp
index 1fda5a4..11d10dc 100644
--- a/core/launcher/runningappbar.cpp
+++ b/core/launcher/runningappbar.cpp
@@ -20,19 +20,12 @@
20 20
21#define QTOPIA_INTERNAL_PRELOADACCESS 21#define QTOPIA_INTERNAL_PRELOADACCESS
22 22
23#include <qtopia/global.h>
24 23
25#include <stdlib.h> 24#include <stdlib.h>
26 25
27#include <qtimer.h>
28#include <qpopupmenu.h>
29#include <qpainter.h> 26#include <qpainter.h>
30#include <qmessagebox.h>
31 27
32#include <qtopia/qpeapplication.h>
33#include <qtopia/applnk.h>
34#include <qtopia/qcopenvelope_qws.h> 28#include <qtopia/qcopenvelope_qws.h>
35#include <qtopia/mimetype.h>
36 29
37#include "runningappbar.h" 30#include "runningappbar.h"
38#include "serverinterface.h" 31#include "serverinterface.h"
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index 1146dcd..e544c61 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -2,7 +2,6 @@
2#include "screensaver.h" 2#include "screensaver.h"
3 3
4#include <qpe/config.h> 4#include <qpe/config.h>
5#include <qpe/power.h>
6#include <qpe/network.h> 5#include <qpe/network.h>
7 6
8#include <opie2/odevice.h> 7#include <opie2/odevice.h>
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 32fcdd0..068d716 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -20,8 +20,8 @@
20 20
21#include "server.h" 21#include "server.h"
22#include "serverapp.h" 22#include "serverapp.h"
23#include "launcher.h"
24#include "startmenu.h" 23#include "startmenu.h"
24#include "launcher.h"
25#include "transferserver.h" 25#include "transferserver.h"
26#include "qcopbridge.h" 26#include "qcopbridge.h"
27#include "irserver.h" 27#include "irserver.h"
@@ -29,7 +29,6 @@
29#include "calibrate.h" 29#include "calibrate.h"
30#include "qrsync.h" 30#include "qrsync.h"
31#include "syncdialog.h" 31#include "syncdialog.h"
32#include "launcher.h"
33#include "shutdownimpl.h" 32#include "shutdownimpl.h"
34#include "applauncher.h" 33#include "applauncher.h"
35#if 0 34#if 0
diff --git a/core/launcher/shutdownimpl.cpp b/core/launcher/shutdownimpl.cpp
index 899d9ac..f43a2a3 100644
--- a/core/launcher/shutdownimpl.cpp
+++ b/core/launcher/shutdownimpl.cpp
@@ -29,7 +29,6 @@
29#include <qbuttongroup.h> 29#include <qbuttongroup.h>
30#include <qlabel.h> 30#include <qlabel.h>
31#include <qlayout.h> 31#include <qlayout.h>
32#include <qpalette.h>
33 32
34 33
35static void changeButtonColor ( QPushButton *btn, const QColor &col ) 34static void changeButtonColor ( QPushButton *btn, const QColor &col )
diff --git a/core/launcher/stabmon.cpp b/core/launcher/stabmon.cpp
index 4e5f290..f2d694b 100644
--- a/core/launcher/stabmon.cpp
+++ b/core/launcher/stabmon.cpp
@@ -26,7 +26,6 @@
26#endif 26#endif
27 27
28#include <qfile.h> 28#include <qfile.h>
29#include <qcstring.h>
30 29
31#include <sys/stat.h> 30#include <sys/stat.h>
32#if defined(Q_OS_LINUX) || defined(_OS_LINUX_) 31#if defined(Q_OS_LINUX) || defined(_OS_LINUX_)
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index c199063..f3a7651 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -29,14 +29,10 @@
29 29
30#include <qtopia/qpeapplication.h> 30#include <qtopia/qpeapplication.h>
31#include <qtopia/config.h> 31#include <qtopia/config.h>
32#include <qtopia/applnk.h>
33#include <qtopia/global.h>
34#include <qtopia/resource.h> 32#include <qtopia/resource.h>
35#include <qtopia/mimetype.h> 33#include <qtopia/mimetype.h>
36#include <qtopia/qlibrary.h> 34#include <qtopia/qlibrary.h>
37 35
38#include <qdict.h>
39#include <qdir.h>
40//#include <qpainter.h> 36//#include <qpainter.h>
41 37
42//#include <stdlib.h> 38//#include <stdlib.h>
diff --git a/core/launcher/syncdialog.cpp b/core/launcher/syncdialog.cpp
index 6f6c781..4a2b8ff 100644
--- a/core/launcher/syncdialog.cpp
+++ b/core/launcher/syncdialog.cpp
@@ -22,7 +22,6 @@
22 22
23#include <qtopia/resource.h> 23#include <qtopia/resource.h>
24 24
25#include <qimage.h>
26#include <qpainter.h> 25#include <qpainter.h>
27#include <qapplication.h> 26#include <qapplication.h>
28#include <qpushbutton.h> 27#include <qpushbutton.h>
diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp
index 691f6b8..6cc1446 100644
--- a/core/launcher/systray.cpp
+++ b/core/launcher/systray.cpp
@@ -24,8 +24,6 @@
24 24
25#include <qlayout.h> 25#include <qlayout.h>
26#include <qdir.h> 26#include <qdir.h>
27#include <qmessagebox.h>
28#include <qtranslator.h>
29 27
30#include "systray.h" 28#include "systray.h"
31 29
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index 8367a62..b998e95 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -20,7 +20,6 @@
20//#define _XOPEN_SOURCE 20//#define _XOPEN_SOURCE
21 21
22#include <opie2/oglobal.h> 22#include <opie2/oglobal.h>
23#include <qtopia/qpeapplication.h>
24 23
25#ifndef Q_OS_WIN32 24#ifndef Q_OS_WIN32
26#include <pwd.h> 25#include <pwd.h>
@@ -44,20 +43,11 @@
44#include <shadow.h> 43#include <shadow.h>
45#endif 44#endif
46 45
47#include <qdir.h>
48#include <qfile.h>
49#include <qtextstream.h> 46#include <qtextstream.h>
50#include <qdatastream.h>
51#include <qmessagebox.h> 47#include <qmessagebox.h>
52#include <qstringlist.h>
53#include <qfileinfo.h>
54#include <qregexp.h>
55//#include <qtopia/qcopchannel_qws.h> 48//#include <qtopia/qcopchannel_qws.h>
56#include <qtopia/process.h> 49#include <qtopia/process.h>
57#include <qtopia/global.h>
58#include <qtopia/config.h>
59#include <qtopia/private/contact.h> 50#include <qtopia/private/contact.h>
60#include <qtopia/quuid.h>
61#include <qtopia/version.h> 51#include <qtopia/version.h>
62#ifdef Q_WS_QWS 52#ifdef Q_WS_QWS
63#include <qtopia/qcopenvelope_qws.h> 53#include <qtopia/qcopenvelope_qws.h>
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp
index 34ffd1a..4148e57 100644
--- a/core/launcher/wait.cpp
+++ b/core/launcher/wait.cpp
@@ -20,14 +20,10 @@
20 20
21#include "wait.h" 21#include "wait.h"
22 22
23#include <qtopia/resource.h>
24#include <qtopia/config.h> 23#include <qtopia/config.h>
25 24
26#include <opie2/owait.h> 25#include <opie2/owait.h>
27 26
28#include <qwidget.h>
29#include <qpixmap.h>
30#include <qpainter.h>
31 27
32 28
33Wait *lastWaitObject = NULL; 29Wait *lastWaitObject = NULL;