-rw-r--r-- | core/launcher/serverapp.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index e4e16f2..cf543ce 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp | |||
@@ -18,45 +18,45 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "serverapp.h" | 21 | #include "serverapp.h" |
22 | #include "screensaver.h" | ||
22 | 23 | ||
24 | /* OPIE */ | ||
25 | #include <opie2/odebug.h> | ||
23 | #include <opie2/odevice.h> | 26 | #include <opie2/odevice.h> |
24 | |||
25 | #include <qtopia/password.h> | 27 | #include <qtopia/password.h> |
26 | #include <qtopia/config.h> | 28 | #include <qtopia/config.h> |
27 | #include <qtopia/power.h> | 29 | #include <qtopia/power.h> |
28 | 30 | ||
29 | #ifdef Q_WS_QWS | 31 | #ifdef Q_WS_QWS |
30 | #include <qtopia/qcopenvelope_qws.h> | 32 | #include <qtopia/qcopenvelope_qws.h> |
31 | #endif | 33 | #endif |
32 | #include <qtopia/global.h> | 34 | #include <qtopia/global.h> |
33 | //#include <qtopia/custom.h> | 35 | using namespace Opie::Core; |
34 | 36 | ||
37 | /* QT */ | ||
35 | #ifdef Q_WS_QWS | 38 | #ifdef Q_WS_QWS |
36 | #include <qgfx_qws.h> | 39 | #include <qgfx_qws.h> |
37 | #endif | 40 | #endif |
38 | #ifdef Q_OS_WIN32 | ||
39 | #include <io.h> | ||
40 | #include <process.h> | ||
41 | #else | ||
42 | #include <unistd.h> | ||
43 | #endif | ||
44 | #include <qmessagebox.h> | 41 | #include <qmessagebox.h> |
45 | #include <qtimer.h> | 42 | #include <qtimer.h> |
46 | #include <qpainter.h> | 43 | #include <qpainter.h> |
47 | #include <qfile.h> | 44 | #include <qfile.h> |
48 | #include <qpixmapcache.h> | 45 | #include <qpixmapcache.h> |
49 | 46 | ||
47 | /* STD */ | ||
48 | #ifdef Q_OS_WIN32 | ||
49 | #include <io.h> | ||
50 | #include <process.h> | ||
51 | #else | ||
52 | #include <unistd.h> | ||
53 | #endif | ||
50 | #include <stdlib.h> | 54 | #include <stdlib.h> |
51 | #include "screensaver.h" | ||
52 | 55 | ||
53 | static ServerApplication *serverApp = 0; | 56 | static ServerApplication *serverApp = 0; |
54 | static int loggedin=0; | 57 | static int loggedin=0; |
55 | 58 | ||
56 | using namespace Opie; | ||
57 | |||
58 | using namespace Opie::Core; | ||
59 | QCopKeyRegister::QCopKeyRegister() | 59 | QCopKeyRegister::QCopKeyRegister() |
60 | : m_keyCode( 0 ) { | 60 | : m_keyCode( 0 ) { |
61 | } | 61 | } |
62 | 62 | ||
@@ -855,9 +855,9 @@ bool ServerApplication::isStarting() | |||
855 | 855 | ||
856 | int ServerApplication::exec() | 856 | int ServerApplication::exec() |
857 | { | 857 | { |
858 | ms_is_starting = true; | 858 | ms_is_starting = true; |
859 | qDebug("Serverapp - exec"); | 859 | odebug << "Serverapp - exec" << oendl; |
860 | return QPEApplication::exec(); | 860 | return QPEApplication::exec(); |
861 | } | 861 | } |
862 | 862 | ||
863 | #include "serverapp.moc" | 863 | #include "serverapp.moc" |