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 | |
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/applauncher.cpp | 11 | ||||
-rw-r--r-- | core/launcher/config.in | 6 | ||||
-rw-r--r-- | core/launcher/documentlist.cpp | 11 | ||||
-rw-r--r-- | core/launcher/main.cpp | 9 | ||||
-rw-r--r-- | core/launcher/qcopbridge.cpp | 7 | ||||
-rw-r--r-- | core/launcher/screensaver.cpp | 2 | ||||
-rw-r--r-- | core/launcher/server.cpp | 4 | ||||
-rw-r--r-- | core/launcher/server.pro | 7 | ||||
-rw-r--r-- | core/launcher/startmenu.cpp | 2 | ||||
-rw-r--r-- | core/launcher/transferserver.cpp | 5 | ||||
-rw-r--r-- | core/launcher/wait.cpp | 2 |
11 files changed, 34 insertions, 32 deletions
diff --git a/core/launcher/applauncher.cpp b/core/launcher/applauncher.cpp index 0db99dd..f161e98 100644 --- a/core/launcher/applauncher.cpp +++ b/core/launcher/applauncher.cpp | |||
@@ -29,3 +29,3 @@ | |||
29 | #endif | 29 | #endif |
30 | #include <qtopia/global.h> | 30 | #include <opie2/oglobal.h> |
31 | 31 | ||
@@ -63,3 +63,2 @@ | |||
63 | #include "documentlist.h" | 63 | #include "documentlist.h" |
64 | #include "launcherglobal.h" | ||
65 | 64 | ||
@@ -406,3 +405,3 @@ void AppLauncher::sigStopped(int sigPid, int sigStatus) | |||
406 | } else { | 405 | } else { |
407 | QFileInfo fi(Opie::Global::tempDir() + "qcop-msg-" + appName); | 406 | QFileInfo fi(OGlobal::tempDirPath() + "qcop-msg-" + appName); |
408 | if ( fi.exists() && fi.size() ) { | 407 | if ( fi.exists() && fi.size() ) { |
@@ -448,4 +447,4 @@ bool AppLauncher::executeBuiltin(const QString &c, const QString &document) | |||
448 | { | 447 | { |
449 | Global::Command* builtin = Opie::Global::builtinCommands(); | 448 | Global::Command* builtin = OGlobal::builtinCommands(); |
450 | QGuardedPtr<QWidget> *running = Opie::Global::builtinRunning(); | 449 | QGuardedPtr<QWidget> *running = OGlobal::builtinRunning(); |
451 | 450 | ||
@@ -499,3 +498,3 @@ bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRais | |||
499 | // Need to lock it to avoid race conditions with QPEApplication::processQCopFile | 498 | // Need to lock it to avoid race conditions with QPEApplication::processQCopFile |
500 | QFile f(Opie::Global::tempDir() + "qcop-msg-" + appName); | 499 | QFile f(OGlobal::tempDirPath() + "qcop-msg-" + appName); |
501 | if ( !noRaise && f.open(IO_WriteOnly | IO_Append) ) { | 500 | if ( !noRaise && f.open(IO_WriteOnly | IO_Append) ) { |
diff --git a/core/launcher/config.in b/core/launcher/config.in index 2d9c1c2..db39210 100644 --- a/core/launcher/config.in +++ b/core/launcher/config.in | |||
@@ -3,3 +3,3 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI |
5 | 5 | ||
@@ -9,3 +9,3 @@ if LAUNCHER | |||
9 | default "y" | 9 | default "y" |
10 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LAUNCHER | 10 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LAUNCHER |
11 | 11 | ||
@@ -14,3 +14,3 @@ if LAUNCHER | |||
14 | default "y" | 14 | default "y" |
15 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LAUNCHER && PRELOAD | 15 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LAUNCHER && PRELOAD |
16 | endif | 16 | endif |
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp index ece6931..440bf1e 100644 --- a/core/launcher/documentlist.cpp +++ b/core/launcher/documentlist.cpp | |||
@@ -21,3 +21,4 @@ | |||
21 | #include "serverinterface.h" | 21 | #include "serverinterface.h" |
22 | #include "launcherglobal.h" | 22 | |
23 | #include <opie2/oglobal.h> | ||
23 | 24 | ||
@@ -26,3 +27,2 @@ | |||
26 | #include <qtopia/resource.h> | 27 | #include <qtopia/resource.h> |
27 | #include <qtopia/global.h> | ||
28 | #include <qtopia/private/categories.h> | 28 | #include <qtopia/private/categories.h> |
@@ -92,3 +92,6 @@ public: | |||
92 | 92 | ||
93 | DocumentList::DocumentList( ServerInterface *serverGui, bool scanDocs, | 93 | /* |
94 | * scandocs will be read from Config | ||
95 | */ | ||
96 | DocumentList::DocumentList( ServerInterface *serverGui, bool /*scanDocs*/, | ||
94 | QObject *parent, const char *name ) | 97 | QObject *parent, const char *name ) |
@@ -271,3 +274,3 @@ void DocumentList::linkChanged( QString arg ) | |||
271 | 274 | ||
272 | if ( arg.isNull() || Opie::Global::isAppLnkFileName( arg ) ) { | 275 | if ( arg.isNull() || OGlobal::isAppLnkFileName( arg ) ) { |
273 | reloadAppLnks(); | 276 | reloadAppLnks(); |
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 | |||
@@ -29,3 +29,4 @@ | |||
29 | #include "firstuse.h" | 29 | #include "firstuse.h" |
30 | #include "launcherglobal.h" | 30 | |
31 | #include <opie2/oglobal.h> | ||
31 | 32 | ||
@@ -35,3 +36,3 @@ | |||
35 | //#include <qtopia/custom.h> | 36 | //#include <qtopia/custom.h> |
36 | #include <qtopia/global.h> | 37 | |
37 | 38 | ||
@@ -66,3 +67,3 @@ | |||
66 | #include <qmessagebox.h> | 67 | #include <qmessagebox.h> |
67 | #include <opie/odevice.h> | 68 | #include <opie2/odevice.h> |
68 | 69 | ||
@@ -73,3 +74,3 @@ static void cleanup() | |||
73 | { | 74 | { |
74 | QDir dir( Opie::Global::tempDir(), "qcop-msg-*" ); | 75 | QDir dir( OGlobal::tempDirPath(), "qcop-msg-*" ); |
75 | 76 | ||
diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp index 9cb56ce..b45f0cc 100644 --- a/core/launcher/qcopbridge.cpp +++ b/core/launcher/qcopbridge.cpp | |||
@@ -23,2 +23,4 @@ | |||
23 | 23 | ||
24 | #include <opie2/oglobal.h> | ||
25 | |||
24 | #ifdef Q_WS_QWS | 26 | #ifdef Q_WS_QWS |
@@ -27,3 +29,3 @@ | |||
27 | #include <qtopia/qpeapplication.h> | 29 | #include <qtopia/qpeapplication.h> |
28 | #include <qtopia/global.h> | 30 | |
29 | #include <qtopia/version.h> | 31 | #include <qtopia/version.h> |
@@ -57,3 +59,2 @@ | |||
57 | 59 | ||
58 | #include "launcherglobal.h" | ||
59 | 60 | ||
@@ -327,3 +328,3 @@ void QCopBridgePI::sendDesktopMessage( const QCString &msg, const QByteArray& da | |||
327 | writeBlock(" ",1); | 328 | writeBlock(" ",1); |
328 | QByteArray b64 = Opie::Global::encodeBase64(data); | 329 | QByteArray b64 = OGlobal::encodeBase64(data); |
329 | writeBlock(b64.data(),b64.size()); | 330 | writeBlock(b64.data(),b64.size()); |
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp index 48770e8..1146dcd 100644 --- a/core/launcher/screensaver.cpp +++ b/core/launcher/screensaver.cpp | |||
@@ -7,3 +7,3 @@ | |||
7 | 7 | ||
8 | #include <opie/odevice.h> | 8 | #include <opie2/odevice.h> |
9 | 9 | ||
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp index b9580c7..32fcdd0 100644 --- a/core/launcher/server.cpp +++ b/core/launcher/server.cpp | |||
@@ -53,4 +53,4 @@ | |||
53 | 53 | ||
54 | #include <opie/odevicebutton.h> | 54 | #include <opie2/odevicebutton.h> |
55 | #include <opie/odevice.h> | 55 | #include <opie2/odevice.h> |
56 | 56 | ||
diff --git a/core/launcher/server.pro b/core/launcher/server.pro index 0513536..f82c741 100644 --- a/core/launcher/server.pro +++ b/core/launcher/server.pro | |||
@@ -48,3 +48,2 @@ HEADERS += server.h \ | |||
48 | serverapp.h \ | 48 | serverapp.h \ |
49 | launcherglobal.h \ | ||
50 | qprocess.h \ | 49 | qprocess.h \ |
@@ -103,3 +102,2 @@ SOURCES += server.cpp \ | |||
103 | serverapp.cpp \ | 102 | serverapp.cpp \ |
104 | launcherglobal.cpp \ | ||
105 | qprocess.cpp \ | 103 | qprocess.cpp \ |
@@ -117,7 +115,8 @@ TARGET = qpe | |||
117 | 115 | ||
116 | #needs OWait and ODevice | ||
118 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 117 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
119 | contains( CONFTEST, y ){ | 118 | contains( CONFTEST, y ){ |
120 | LIBS += -lqpe -lopie | 119 | LIBS += -lqpe -lopiecore2 -lopieui2 |
121 | }else{ | 120 | }else{ |
122 | LIBS+= -lcrypt -lqpe -lopie | 121 | LIBS+= -lcrypt -lqpe -lopiecore2 -lopieui2 |
123 | } | 122 | } |
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp index b84eed8..c199063 100644 --- a/core/launcher/startmenu.cpp +++ b/core/launcher/startmenu.cpp | |||
@@ -356,3 +356,2 @@ void StartMenu::loadApplets() | |||
356 | MenuApplet *applet = xapplets[napplets]; | 356 | MenuApplet *applet = xapplets[napplets]; |
357 | |||
358 | applet->popup = applet->iface->popup( this ); | 357 | applet->popup = applet->iface->popup( this ); |
@@ -386,2 +385,3 @@ void StartMenu::addApplets(QPopupMenu* pop) { | |||
386 | 385 | ||
386 | |||
387 | dict.insert( applet->id, new MenuApplet( *applet ) ); | 387 | dict.insert( applet->id, new MenuApplet( *applet ) ); |
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index 9519d11..9cb9d7a 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp | |||
@@ -21,3 +21,3 @@ | |||
21 | 21 | ||
22 | #include <qtopia/global.h> | 22 | #include <opie2/oglobal.h> |
23 | #include <qtopia/qpeapplication.h> | 23 | #include <qtopia/qpeapplication.h> |
@@ -65,3 +65,2 @@ | |||
65 | 65 | ||
66 | #include "launcherglobal.h" | ||
67 | 66 | ||
@@ -116,3 +115,3 @@ QString SyncAuthentication::serverId() | |||
116 | if ( r.isEmpty() ) { | 115 | if ( r.isEmpty() ) { |
117 | r = Opie::Global::uuid(); | 116 | r = OGlobal::generateUuid(); |
118 | cfg.writeEntry("serverid", r ); | 117 | cfg.writeEntry("serverid", r ); |
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp index ab53a07..34ffd1a 100644 --- a/core/launcher/wait.cpp +++ b/core/launcher/wait.cpp | |||
@@ -25,3 +25,3 @@ | |||
25 | 25 | ||
26 | #include <opie/owait.h> | 26 | #include <opie2/owait.h> |
27 | 27 | ||