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 | 27 | ||||
-rw-r--r-- | core/launcher/wait.cpp | 2 |
11 files changed, 45 insertions, 43 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 | |||
@@ -28,5 +28,5 @@ | |||
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 |
@@ -62,5 +62,4 @@ | |||
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; |
@@ -405,5 +404,5 @@ void AppLauncher::sigStopped(int sigPid, int sigStatus) | |||
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); |
@@ -447,6 +446,6 @@ bool AppLauncher::isRunning(const QString &app) | |||
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 |
@@ -498,5 +497,5 @@ bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRais | |||
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 |
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 | |||
@@ -2,5 +2,5 @@ | |||
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 |
@@ -8,9 +8,9 @@ if LAUNCHER | |||
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 | |||
@@ -20,10 +20,10 @@ | |||
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> |
@@ -91,5 +91,8 @@ public: | |||
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 ) |
@@ -270,5 +273,5 @@ void DocumentList::linkChanged( QString arg ) | |||
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 { |
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 | |||
@@ -28,5 +28,6 @@ | |||
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> |
@@ -34,5 +35,5 @@ | |||
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> |
@@ -65,5 +66,5 @@ | |||
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; |
@@ -72,5 +73,5 @@ using namespace Opie; | |||
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(); |
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 | |||
@@ -22,9 +22,11 @@ | |||
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> |
@@ -56,5 +58,4 @@ | |||
56 | #endif | 58 | #endif |
57 | 59 | ||
58 | #include "launcherglobal.h" | ||
59 | 60 | ||
60 | //#define INSECURE | 61 | //#define INSECURE |
@@ -326,5 +327,5 @@ void QCopBridgePI::sendDesktopMessage( const QCString &msg, const QByteArray& da | |||
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); |
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 | |||
@@ -6,5 +6,5 @@ | |||
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 | ||
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 | |||
@@ -52,6 +52,6 @@ | |||
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> |
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 | |||
@@ -47,5 +47,4 @@ HEADERS += server.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 |
@@ -102,5 +101,4 @@ SOURCES += server.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 \ |
@@ -116,9 +114,10 @@ DEPENDPATH += $(OPIEDIR)/rsync | |||
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 | ||
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 | |||
@@ -355,5 +355,4 @@ void StartMenu::loadApplets() | |||
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 | ||
@@ -385,4 +384,5 @@ void StartMenu::addApplets(QPopupMenu* pop) { | |||
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 | } |
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 | |||
@@ -20,5 +20,5 @@ | |||
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 | ||
@@ -33,5 +33,5 @@ | |||
33 | #include <shadow.h> | 33 | #include <shadow.h> |
34 | #include <crypt.h> | 34 | #include <crypt.h> |
35 | #endif /* Q_OS_MACX */ | 35 | #endif /* Q_OS_MACX */ |
36 | 36 | ||
37 | #else | 37 | #else |
@@ -64,5 +64,4 @@ | |||
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #include "launcherglobal.h" | ||
67 | 66 | ||
68 | #include "transferserver.h" | 67 | #include "transferserver.h" |
@@ -115,5 +114,5 @@ QString SyncAuthentication::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 | } |
@@ -194,16 +193,16 @@ bool SyncAuthentication::checkPassword( const QString& password ) | |||
194 | static int denials=0; | 193 | static int denials=0; |
195 | int now = time(0); | 194 | int now = time(0); |
196 | 195 | ||
197 | Config cfg("Security"); | 196 | Config cfg("Security"); |
198 | cfg.setGroup("Sync"); | 197 | cfg.setGroup("Sync"); |
199 | QString syncapp = cfg.readEntry("syncapp","Qtopia"); | 198 | QString syncapp = cfg.readEntry("syncapp","Qtopia"); |
200 | 199 | ||
201 | //No password needed if the user really wants it | 200 | //No password needed if the user really wants it |
202 | if (syncapp == "IntelliSync") { | 201 | if (syncapp == "IntelliSync") { |
203 | return TRUE; | 202 | return TRUE; |
204 | } | 203 | } |
205 | 204 | ||
206 | // Detect old Qtopia Desktop (no password) | 205 | // Detect old Qtopia Desktop (no password) |
207 | if ( password.isEmpty() ) { | 206 | if ( password.isEmpty() ) { |
208 | if ( denials < 3 || now > lastdenial+600 ) { | 207 | if ( denials < 3 || now > lastdenial+600 ) { |
209 | QMessageBox unauth( | 208 | QMessageBox unauth( |
@@ -220,8 +219,8 @@ bool SyncAuthentication::checkPassword( const QString& password ) | |||
220 | denials++; | 219 | denials++; |
221 | lastdenial=now; | 220 | lastdenial=now; |
222 | } | 221 | } |
223 | return FALSE; | 222 | return FALSE; |
224 | 223 | ||
225 | } | 224 | } |
226 | 225 | ||
227 | // Second, check sync password... | 226 | // Second, check sync password... |
@@ -230,5 +229,5 @@ bool SyncAuthentication::checkPassword( const QString& password ) | |||
230 | if ( lock ) return FALSE; | 229 | if ( lock ) return FALSE; |
231 | 230 | ||
232 | ++lock; | 231 | ++lock; |
233 | 232 | ||
234 | /* | 233 | /* |
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 | |||
@@ -24,5 +24,5 @@ | |||
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> |