author | zecke <zecke> | 2004-02-21 11:32:55 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-21 11:32:55 (UTC) |
commit | f80b38b2e348b588bf7560161d7551e6bd4939c0 (patch) (unidiff) | |
tree | 34c4359580641cb1447dab8df8731c9733e1d39f /core/launcher/main.cpp | |
parent | b38daa3f05f3a250a8c5114890158863ab02a99f (diff) | |
download | opie-f80b38b2e348b588bf7560161d7551e6bd4939c0.zip opie-f80b38b2e348b588bf7560161d7551e6bd4939c0.tar.gz opie-f80b38b2e348b588bf7560161d7551e6bd4939c0.tar.bz2 |
Move to LibOpie2
remove launcher global and use OGlobal
-rw-r--r-- | core/launcher/main.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 988e432..bf06e75 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -24,19 +24,20 @@ | |||
24 | #include "server.h" | 24 | #include "server.h" |
25 | #include "serverapp.h" | 25 | #include "serverapp.h" |
26 | #include "taskbar.h" | 26 | #include "taskbar.h" |
27 | #include "stabmon.h" | 27 | #include "stabmon.h" |
28 | #include "launcher.h" | 28 | #include "launcher.h" |
29 | #include "firstuse.h" | 29 | #include "firstuse.h" |
30 | #include "launcherglobal.h" | 30 | |
31 | #include <opie2/oglobal.h> | ||
31 | 32 | ||
32 | #include <qtopia/qpeapplication.h> | 33 | #include <qtopia/qpeapplication.h> |
33 | #include <qtopia/network.h> | 34 | #include <qtopia/network.h> |
34 | #include <qtopia/config.h> | 35 | #include <qtopia/config.h> |
35 | //#include <qtopia/custom.h> | 36 | //#include <qtopia/custom.h> |
36 | #include <qtopia/global.h> | 37 | |
37 | 38 | ||
38 | #include <qfile.h> | 39 | #include <qfile.h> |
39 | #include <qdir.h> | 40 | #include <qdir.h> |
40 | #ifdef QWS | 41 | #ifdef QWS |
41 | #include <qwindowsystem_qws.h> | 42 | #include <qwindowsystem_qws.h> |
42 | #include <qtopia/qcopenvelope_qws.h> | 43 | #include <qtopia/qcopenvelope_qws.h> |
@@ -61,20 +62,20 @@ | |||
61 | 62 | ||
62 | #ifdef Q_WS_QWS | 63 | #ifdef Q_WS_QWS |
63 | #include <qkeyboard_qws.h> | 64 | #include <qkeyboard_qws.h> |
64 | #endif | 65 | #endif |
65 | 66 | ||
66 | #include <qmessagebox.h> | 67 | #include <qmessagebox.h> |
67 | #include <opie/odevice.h> | 68 | #include <opie2/odevice.h> |
68 | 69 | ||
69 | using namespace Opie; | 70 | using namespace Opie; |
70 | 71 | ||
71 | 72 | ||
72 | static void cleanup() | 73 | static void cleanup() |
73 | { | 74 | { |
74 | QDir dir( Opie::Global::tempDir(), "qcop-msg-*" ); | 75 | QDir dir( OGlobal::tempDirPath(), "qcop-msg-*" ); |
75 | 76 | ||
76 | QStringList stale = dir.entryList(); | 77 | QStringList stale = dir.entryList(); |
77 | QStringList::Iterator it; | 78 | QStringList::Iterator it; |
78 | for ( it = stale.begin(); it != stale.end(); ++it ) { | 79 | for ( it = stale.begin(); it != stale.end(); ++it ) { |
79 | dir.remove( *it ); | 80 | dir.remove( *it ); |
80 | } | 81 | } |