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 | |||
@@ -26,9 +26,9 @@ | |||
26 | #endif | 26 | #endif |
27 | #ifndef QTOPIA_PROGRAM_MONITOR | 27 | #ifndef QTOPIA_PROGRAM_MONITOR |
28 | #define QTOPIA_PROGRAM_MONITOR | 28 | #define QTOPIA_PROGRAM_MONITOR |
29 | #endif | 29 | #endif |
30 | #include <qtopia/global.h> | 30 | #include <opie2/oglobal.h> |
31 | 31 | ||
32 | #ifndef Q_OS_WIN32 | 32 | #ifndef Q_OS_WIN32 |
33 | #include <sys/stat.h> | 33 | #include <sys/stat.h> |
34 | #include <sys/wait.h> | 34 | #include <sys/wait.h> |
@@ -60,9 +60,8 @@ | |||
60 | #include <qtopia/global.h> | 60 | #include <qtopia/global.h> |
61 | 61 | ||
62 | #include "applauncher.h" | 62 | #include "applauncher.h" |
63 | #include "documentlist.h" | 63 | #include "documentlist.h" |
64 | #include "launcherglobal.h" | ||
65 | 64 | ||
66 | const int AppLauncher::RAISE_TIMEOUT_MS = 5000; | 65 | const int AppLauncher::RAISE_TIMEOUT_MS = 5000; |
67 | 66 | ||
68 | //--------------------------------------------------------------------------- | 67 | //--------------------------------------------------------------------------- |
@@ -403,9 +402,9 @@ void AppLauncher::sigStopped(int sigPid, int sigStatus) | |||
403 | } else { | 402 | } else { |
404 | if ( exitStatus == 255 ) { //could not find app (because global returns -1) | 403 | if ( exitStatus == 255 ) { //could not find app (because global returns -1) |
405 | QMessageBox::information(0, tr("Application not found"), tr("<qt>Could not locate application <b>%1</b></qt>").arg( app->exec() ) ); | 404 | QMessageBox::information(0, tr("Application not found"), tr("<qt>Could not locate application <b>%1</b></qt>").arg( app->exec() ) ); |
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() ) { |
409 | emit terminated(sigPid, appName); | 408 | emit terminated(sigPid, appName); |
410 | qWarning("Re executing obmitted for %s", appName.latin1() ); | 409 | qWarning("Re executing obmitted for %s", appName.latin1() ); |
411 | // execute( appName, QString::null ); | 410 | // execute( appName, QString::null ); |
@@ -445,10 +444,10 @@ bool AppLauncher::isRunning(const QString &app) | |||
445 | } | 444 | } |
446 | 445 | ||
447 | bool AppLauncher::executeBuiltin(const QString &c, const QString &document) | 446 | 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 | ||
452 | // Attempt to execute the app using a builtin class for the app | 451 | // Attempt to execute the app using a builtin class for the app |
453 | if (builtin) { | 452 | if (builtin) { |
454 | for (int i = 0; builtin[i].file; i++) { | 453 | for (int i = 0; builtin[i].file; i++) { |
@@ -496,9 +495,9 @@ bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRais | |||
496 | QCString channel = "QPE/Application/"; | 495 | QCString channel = "QPE/Application/"; |
497 | channel += appName.latin1(); | 496 | channel += appName.latin1(); |
498 | 497 | ||
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) ) { |
502 | #ifndef Q_OS_WIN32 | 501 | #ifndef Q_OS_WIN32 |
503 | flock(f.handle(), LOCK_EX); | 502 | flock(f.handle(), LOCK_EX); |
504 | #endif | 503 | #endif |
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 | |||
@@ -1,16 +1,16 @@ | |||
1 | config LAUNCHER | 1 | config LAUNCHER |
2 | boolean "opie-taskbar (program launcher qpe for Opie)" | 2 | boolean "opie-taskbar (program launcher qpe for Opie)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI |
5 | 5 | ||
6 | if LAUNCHER | 6 | if LAUNCHER |
7 | config PRELOAD | 7 | config PRELOAD |
8 | boolean | 8 | boolean |
9 | default "y" | 9 | default "y" |
10 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LAUNCHER | 10 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LAUNCHER |
11 | 11 | ||
12 | config LAUNCHER_CORE | 12 | config LAUNCHER_CORE |
13 | boolean | 13 | boolean |
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 | |||
@@ -18,14 +18,14 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "documentlist.h" | 20 | #include "documentlist.h" |
21 | #include "serverinterface.h" | 21 | #include "serverinterface.h" |
22 | #include "launcherglobal.h" | 22 | |
23 | #include <opie2/oglobal.h> | ||
23 | 24 | ||
24 | #include <qtopia/config.h> | 25 | #include <qtopia/config.h> |
25 | #include <qtopia/mimetype.h> | 26 | #include <qtopia/mimetype.h> |
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> |
29 | #include <qtopia/qpeapplication.h> | 29 | #include <qtopia/qpeapplication.h> |
30 | #include <qtopia/applnk.h> | 30 | #include <qtopia/applnk.h> |
31 | #include <qtopia/storage.h> | 31 | #include <qtopia/storage.h> |
@@ -89,9 +89,12 @@ public: | |||
89 | bool scanDocs; | 89 | bool scanDocs; |
90 | }; | 90 | }; |
91 | 91 | ||
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 ) |
95 | : QObject( parent, name ) | 98 | : QObject( parent, name ) |
96 | { | 99 | { |
97 | appLnkSet = new AppLnkSet( MimeType::appsFolderName() ); | 100 | appLnkSet = new AppLnkSet( MimeType::appsFolderName() ); |
@@ -268,9 +271,9 @@ void DocumentList::reloadDocLnks() | |||
268 | void DocumentList::linkChanged( QString arg ) | 271 | void DocumentList::linkChanged( QString arg ) |
269 | { | 272 | { |
270 | //qDebug( "linkchanged( %s )", arg.latin1() ); | 273 | //qDebug( "linkchanged( %s )", arg.latin1() ); |
271 | 274 | ||
272 | if ( arg.isNull() || Opie::Global::isAppLnkFileName( arg ) ) { | 275 | if ( arg.isNull() || OGlobal::isAppLnkFileName( arg ) ) { |
273 | reloadAppLnks(); | 276 | reloadAppLnks(); |
274 | } else { | 277 | } else { |
275 | 278 | ||
276 | const QList<DocLnk> &list = d->dls.children(); | 279 | const QList<DocLnk> &list = d->dls.children(); |
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 | |||
@@ -26,15 +26,16 @@ | |||
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 |
@@ -63,16 +64,16 @@ | |||
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 ) { |
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 | |||
@@ -20,13 +20,15 @@ | |||
20 | 20 | ||
21 | #include "qcopbridge.h" | 21 | #include "qcopbridge.h" |
22 | #include "transferserver.h" | 22 | #include "transferserver.h" |
23 | 23 | ||
24 | #include <opie2/oglobal.h> | ||
25 | |||
24 | #ifdef Q_WS_QWS | 26 | #ifdef Q_WS_QWS |
25 | #include <qtopia/qcopenvelope_qws.h> | 27 | #include <qtopia/qcopenvelope_qws.h> |
26 | #endif | 28 | #endif |
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> |
30 | #include <qtopia/config.h> | 32 | #include <qtopia/config.h> |
31 | 33 | ||
32 | #include <qdir.h> | 34 | #include <qdir.h> |
@@ -54,9 +56,8 @@ | |||
54 | #if defined(_OS_LINUX_) | 56 | #if defined(_OS_LINUX_) |
55 | #include <shadow.h> | 57 | #include <shadow.h> |
56 | #endif | 58 | #endif |
57 | 59 | ||
58 | #include "launcherglobal.h" | ||
59 | 60 | ||
60 | //#define INSECURE | 61 | //#define INSECURE |
61 | 62 | ||
62 | const int block_size = 51200; | 63 | const int block_size = 51200; |
@@ -324,9 +325,9 @@ void QCopBridgePI::sendDesktopMessage( const QCString &msg, const QByteArray& da | |||
324 | const char hdr[]="CALLB QPE/Desktop "; | 325 | const char hdr[]="CALLB QPE/Desktop "; |
325 | writeBlock(hdr,sizeof(hdr)-1); | 326 | writeBlock(hdr,sizeof(hdr)-1); |
326 | writeBlock(msg,msg.length()); | 327 | writeBlock(msg,msg.length()); |
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()); |
330 | writeBlock("\r\n",2); | 331 | writeBlock("\r\n",2); |
331 | 332 | ||
332 | } | 333 | } |
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 | |||
@@ -4,9 +4,9 @@ | |||
4 | #include <qpe/config.h> | 4 | #include <qpe/config.h> |
5 | #include <qpe/power.h> | 5 | #include <qpe/power.h> |
6 | #include <qpe/network.h> | 6 | #include <qpe/network.h> |
7 | 7 | ||
8 | #include <opie/odevice.h> | 8 | #include <opie2/odevice.h> |
9 | 9 | ||
10 | 10 | ||
11 | using namespace Opie; | 11 | using namespace Opie; |
12 | 12 | ||
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 | |||
@@ -50,10 +50,10 @@ | |||
50 | #include <qgfx_qws.h> | 50 | #include <qgfx_qws.h> |
51 | #include <qtopia/global.h> | 51 | #include <qtopia/global.h> |
52 | //#include <qtopia/custom.h> | 52 | //#include <qtopia/custom.h> |
53 | 53 | ||
54 | #include <opie/odevicebutton.h> | 54 | #include <opie2/odevicebutton.h> |
55 | #include <opie/odevice.h> | 55 | #include <opie2/odevice.h> |
56 | 56 | ||
57 | #include <unistd.h> | 57 | #include <unistd.h> |
58 | #include <qmainwindow.h> | 58 | #include <qmainwindow.h> |
59 | #include <qmessagebox.h> | 59 | #include <qmessagebox.h> |
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 | |||
@@ -45,9 +45,8 @@ HEADERS += server.h \ | |||
45 | $$(OPIEDIR)/rsync/config_rsync.h \ | 45 | $$(OPIEDIR)/rsync/config_rsync.h \ |
46 | $$(OPIEDIR)/rsync/qrsync.h \ | 46 | $$(OPIEDIR)/rsync/qrsync.h \ |
47 | syncdialog.h \ | 47 | syncdialog.h \ |
48 | serverapp.h \ | 48 | serverapp.h \ |
49 | launcherglobal.h \ | ||
50 | qprocess.h \ | 49 | qprocess.h \ |
51 | screensaver.h | 50 | screensaver.h |
52 | 51 | ||
53 | SOURCES += server.cpp \ | 52 | SOURCES += server.cpp \ |
@@ -100,9 +99,8 @@ SOURCES += server.cpp \ | |||
100 | $$(OPIEDIR)/rsync/whole.c \ | 99 | $$(OPIEDIR)/rsync/whole.c \ |
101 | $$(OPIEDIR)/rsync/qrsync.cpp \ | 100 | $$(OPIEDIR)/rsync/qrsync.cpp \ |
102 | syncdialog.cpp \ | 101 | syncdialog.cpp \ |
103 | serverapp.cpp \ | 102 | serverapp.cpp \ |
104 | launcherglobal.cpp \ | ||
105 | qprocess.cpp \ | 103 | qprocess.cpp \ |
106 | qprocess_unix.cpp \ | 104 | qprocess_unix.cpp \ |
107 | screensaver.cpp | 105 | screensaver.cpp |
108 | 106 | ||
@@ -114,12 +112,13 @@ INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync | |||
114 | DEPENDPATH+= $(OPIEDIR)/rsync | 112 | DEPENDPATH+= $(OPIEDIR)/rsync |
115 | 113 | ||
116 | TARGET = qpe | 114 | 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 | } |
124 | 123 | ||
125 | include ( $(OPIEDIR)/include.pro ) | 124 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -353,9 +353,8 @@ void StartMenu::loadApplets() | |||
353 | 353 | ||
354 | 354 | ||
355 | while ( napplets-- ) { | 355 | while ( napplets-- ) { |
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 ); |
359 | 358 | ||
360 | // menuApplets got an id < -1 | 359 | // menuApplets got an id < -1 |
361 | menuApplets.insert( -( currentItem + 2 ), new MenuApplet( *applet ) ); | 360 | menuApplets.insert( -( currentItem + 2 ), new MenuApplet( *applet ) ); |
@@ -383,8 +382,9 @@ void StartMenu::addApplets(QPopupMenu* pop) { | |||
383 | else | 382 | else |
384 | applet->id = pop->insertItem( applet->iface->icon(), | 383 | applet->id = pop->insertItem( applet->iface->icon(), |
385 | applet->iface->text() ); | 384 | applet->iface->text() ); |
386 | 385 | ||
386 | |||
387 | dict.insert( applet->id, new MenuApplet( *applet ) ); | 387 | dict.insert( applet->id, new MenuApplet( *applet ) ); |
388 | } | 388 | } |
389 | /* need to update the key */ | 389 | /* need to update the key */ |
390 | menuApplets.setAutoDelete( true ); | 390 | menuApplets.setAutoDelete( true ); |
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 | |||
@@ -18,9 +18,9 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | //#define _XOPEN_SOURCE | 20 | //#define _XOPEN_SOURCE |
21 | 21 | ||
22 | #include <qtopia/global.h> | 22 | #include <opie2/oglobal.h> |
23 | #include <qtopia/qpeapplication.h> | 23 | #include <qtopia/qpeapplication.h> |
24 | 24 | ||
25 | #ifndef Q_OS_WIN32 | 25 | #ifndef Q_OS_WIN32 |
26 | #include <pwd.h> | 26 | #include <pwd.h> |
@@ -62,9 +62,8 @@ | |||
62 | #ifdef Q_WS_QWS | 62 | #ifdef Q_WS_QWS |
63 | #include <qtopia/qcopenvelope_qws.h> | 63 | #include <qtopia/qcopenvelope_qws.h> |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #include "launcherglobal.h" | ||
67 | 66 | ||
68 | #include "transferserver.h" | 67 | #include "transferserver.h" |
69 | #include <qtopia/qprocess.h> | 68 | #include <qtopia/qprocess.h> |
70 | 69 | ||
@@ -113,9 +112,9 @@ QString SyncAuthentication::serverId() | |||
113 | cfg.setGroup("Sync"); | 112 | cfg.setGroup("Sync"); |
114 | QString r = cfg.readEntry("serverid"); | 113 | QString r = cfg.readEntry("serverid"); |
115 | 114 | ||
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 ); |
119 | } | 118 | } |
120 | return r; | 119 | return r; |
121 | } | 120 | } |
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 | |||
@@ -22,9 +22,9 @@ | |||
22 | 22 | ||
23 | #include <qtopia/resource.h> | 23 | #include <qtopia/resource.h> |
24 | #include <qtopia/config.h> | 24 | #include <qtopia/config.h> |
25 | 25 | ||
26 | #include <opie/owait.h> | 26 | #include <opie2/owait.h> |
27 | 27 | ||
28 | #include <qwidget.h> | 28 | #include <qwidget.h> |
29 | #include <qpixmap.h> | 29 | #include <qpixmap.h> |
30 | #include <qpainter.h> | 30 | #include <qpainter.h> |