summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiodevice.cpp1
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp6
-rw-r--r--core/multimedia/opieplayer/mediaplayer.cpp7
-rw-r--r--core/multimedia/opieplayer/mediaplayerstate.cpp2
-rw-r--r--core/multimedia/opieplayer/modplug/load_j2b.cpp1
-rw-r--r--core/multimedia/opieplayer/om3u.cpp15
-rw-r--r--core/multimedia/opieplayer/playlistselection.cpp8
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp25
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp4
-rw-r--r--core/opie-login/loginwindowimpl.cpp4
-rw-r--r--core/opie-login/main.cpp4
-rw-r--r--core/opie-login/opie-login.pro2
12 files changed, 2 insertions, 77 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index d296d27..355062b 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -24,7 +24,6 @@
24#include <stdio.h> 24#include <stdio.h>
25#include <qpe/qpeapplication.h> 25#include <qpe/qpeapplication.h>
26#include <qpe/config.h> 26#include <qpe/config.h>
27#include <qpe/custom.h>
28#include <qmessagebox.h> 27#include <qmessagebox.h>
29 28
30#include "audiodevice.h" 29#include "audiodevice.h"
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index fbc5072..8bcc567 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -21,12 +21,6 @@
21#include <qpe/resource.h> 21#include <qpe/resource.h>
22#include <qpe/config.h> 22#include <qpe/config.h>
23 23
24#include <qwidget.h>
25#include <qpixmap.h>
26#include <qbutton.h>
27#include <qpainter.h>
28#include <qframe.h>
29#include <qlayout.h>
30#include <qdir.h> 24#include <qdir.h>
31#include "audiowidget.h" 25#include "audiowidget.h"
32#include "mediaplayerstate.h" 26#include "mediaplayerstate.h"
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp
index 753b2e3..b77708c 100644
--- a/core/multimedia/opieplayer/mediaplayer.cpp
+++ b/core/multimedia/opieplayer/mediaplayer.cpp
@@ -18,15 +18,8 @@
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include <qpe/qpeapplication.h>
22#include <qpe/qlibrary.h>
23#include <qpe/resource.h>
24#include <qpe/config.h>
25 21
26#include <qmainwindow.h>
27#include <qmessagebox.h> 22#include <qmessagebox.h>
28#include <qwidgetstack.h>
29#include <qfile.h>
30 23
31#include "mediaplayer.h" 24#include "mediaplayer.h"
32#include "playlistwidget.h" 25#include "playlistwidget.h"
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp
index 6823076..5bfb87e 100644
--- a/core/multimedia/opieplayer/mediaplayerstate.cpp
+++ b/core/multimedia/opieplayer/mediaplayerstate.cpp
@@ -20,8 +20,6 @@
20#include <qpe/qpeapplication.h> 20#include <qpe/qpeapplication.h>
21#include <qpe/qlibrary.h> 21#include <qpe/qlibrary.h>
22#include <qpe/config.h> 22#include <qpe/config.h>
23#include <qvaluelist.h>
24#include <qobject.h>
25#include <qdir.h> 23#include <qdir.h>
26#include <qpe/mediaplayerplugininterface.h> 24#include <qpe/mediaplayerplugininterface.h>
27#include "mediaplayerstate.h" 25#include "mediaplayerstate.h"
diff --git a/core/multimedia/opieplayer/modplug/load_j2b.cpp b/core/multimedia/opieplayer/modplug/load_j2b.cpp
index 4f0b85c..8b4cccd 100644
--- a/core/multimedia/opieplayer/modplug/load_j2b.cpp
+++ b/core/multimedia/opieplayer/modplug/load_j2b.cpp
@@ -13,5 +13,4 @@
13// J2B module loader 13// J2B module loader
14// 14//
15/////////////////////////////////////////////////// 15///////////////////////////////////////////////////
16#include "stdafx.h"
17 16
diff --git a/core/multimedia/opieplayer/om3u.cpp b/core/multimedia/opieplayer/om3u.cpp
index 778eb22..ae89518 100644
--- a/core/multimedia/opieplayer/om3u.cpp
+++ b/core/multimedia/opieplayer/om3u.cpp
@@ -29,22 +29,9 @@
29 29
30*/ 30*/
31 31
32#include "playlistwidget.h"
33#include "om3u.h" 32#include "om3u.h"
34 33
35#include <qpe/applnk.h> 34
36#include <qpe/qpeapplication.h>
37#include <qpe/storage.h>
38#include <qpe/mimetype.h>
39#include <qpe/global.h>
40#include <qpe/resource.h>
41
42#include <qdir.h>
43#include <qregexp.h>
44#include <qstring.h>
45#include <qtextstream.h>
46#include <qstringlist.h>
47#include <qcstring.h>
48 35
49static inline QString fullBaseName ( const QFileInfo &fi ) 36static inline QString fullBaseName ( const QFileInfo &fi )
50{ 37{
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 94567f2..ad831cf 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -17,16 +17,8 @@
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include <qpe/applnk.h>
21#include <qpe/resource.h>
22#include <qpe/config.h>
23 20
24#include <qpainter.h>
25#include <qimage.h>
26#include <qheader.h> 21#include <qheader.h>
27#include <qlistview.h>
28#include <qlist.h>
29#include <qpixmap.h>
30 22
31#include "playlistselection.h" 23#include "playlistselection.h"
32 24
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index db99866..a359843 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -19,39 +19,14 @@
19**********************************************************************/ 19**********************************************************************/
20// code added by L. J. Potter Sat 03-02-2002 06:17:54 20// code added by L. J. Potter Sat 03-02-2002 06:17:54
21#define QTOPIA_INTERNAL_FSLP 21#define QTOPIA_INTERNAL_FSLP
22#include <qpe/qcopenvelope_qws.h>
23 22
24#include <qmenubar.h>
25#include <qtoolbar.h> 23#include <qtoolbar.h>
26#include <qpe/qpemenubar.h> 24#include <qpe/qpemenubar.h>
27#include <qpe/fileselector.h>
28#include <qpe/qpeapplication.h>
29#include <qpe/lnkproperties.h> 25#include <qpe/lnkproperties.h>
30#include <qpe/storage.h>
31 26
32#include <qpe/applnk.h>
33#include <qpe/config.h>
34#include <qpe/global.h>
35#include <qpe/resource.h>
36#include <qaction.h> 27#include <qaction.h>
37#include <qcursor.h>
38#include <qimage.h>
39#include <qfile.h>
40#include <qdir.h>
41#include <qlayout.h> 28#include <qlayout.h>
42#include <qlabel.h>
43#include <qlist.h>
44#include <qlistbox.h>
45#include <qmainwindow.h>
46#include <qmessagebox.h> 29#include <qmessagebox.h>
47#include <qtoolbutton.h>
48#include <qtabwidget.h>
49#include <qlistview.h>
50#include <qpoint.h>
51#include <qlineedit.h>
52#include <qpushbutton.h>
53#include <qregexp.h>
54#include <qtextstream.h>
55 30
56//#include <qtimer.h> 31//#include <qtimer.h>
57 32
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 5273ad3..d002c42 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -23,11 +23,7 @@
23#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
24 24
25#include <qdir.h> 25#include <qdir.h>
26#include <qwidget.h>
27#include <qpainter.h>
28#include <qpixmap.h>
29#include <qslider.h> 26#include <qslider.h>
30#include <qdrawutil.h>
31#include "videowidget.h" 27#include "videowidget.h"
32#include "mediaplayerstate.h" 28#include "mediaplayerstate.h"
33 29
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index 330fac5..3037ba3 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -25,18 +25,14 @@
25 25
26*/ 26*/
27#include <qpe/version.h> 27#include <qpe/version.h>
28#include <qapplication.h>
29#include <qpushbutton.h> 28#include <qpushbutton.h>
30#include <qlayout.h> 29#include <qlayout.h>
31#include <qframe.h>
32#include <qlineedit.h> 30#include <qlineedit.h>
33#include <qtimer.h> 31#include <qtimer.h>
34#include <qcombobox.h> 32#include <qcombobox.h>
35#include <qpixmap.h>
36#include <qlabel.h> 33#include <qlabel.h>
37#include <qpopupmenu.h> 34#include <qpopupmenu.h>
38#include <qmessagebox.h> 35#include <qmessagebox.h>
39#include <qimage.h>
40#if QT_VERSION < 300 36#if QT_VERSION < 300
41#include <qgfx_qws.h> 37#include <qgfx_qws.h>
42#endif 38#endif
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 7d2ed63..bf98735 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -40,8 +40,6 @@
40#include <getopt.h> 40#include <getopt.h>
41#include <string.h> 41#include <string.h>
42 42
43#include <qpe/qpeapplication.h>
44#include <qpe/qcopenvelope_qws.h>
45#include <qpe/qpestyle.h> 43#include <qpe/qpestyle.h>
46#include <qpe/power.h> 44#include <qpe/power.h>
47#include <qpe/config.h> 45#include <qpe/config.h>
@@ -49,12 +47,10 @@
49#include <opie/odevice.h> 47#include <opie/odevice.h>
50 48
51#include <qwindowsystem_qws.h> 49#include <qwindowsystem_qws.h>
52#include <qwsmouse_qws.h>
53#include <qmessagebox.h> 50#include <qmessagebox.h>
54#include <qlabel.h> 51#include <qlabel.h>
55#include <qtimer.h> 52#include <qtimer.h>
56#include <qfile.h> 53#include <qfile.h>
57#include <qtextstream.h>
58 54
59#include "loginapplication.h" 55#include "loginapplication.h"
60#include "loginwindowimpl.h" 56#include "loginwindowimpl.h"
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index f9dbe2b..0fdd8e1 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -1,5 +1,5 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on debug usepam 2CONFIG = qt warn_on debug
3 3
4HEADERS = loginwindowimpl.h \ 4HEADERS = loginwindowimpl.h \
5 loginapplication.h \ 5 loginapplication.h \