author | sandman <sandman> | 2002-07-27 23:33:26 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-07-27 23:33:26 (UTC) |
commit | 4baf36396739502c5471950e29f18954cca4517b (patch) (unidiff) | |
tree | 46b25659b442666b4b5153fa8210d86e6708b47b /core/launcher/main.cpp | |
parent | 9cc89b6a54ee267953b0422c4607097d075ecab9 (diff) | |
download | opie-4baf36396739502c5471950e29f18954cca4517b.zip opie-4baf36396739502c5471950e29f18954cca4517b.tar.gz opie-4baf36396739502c5471950e29f18954cca4517b.tar.bz2 |
Update for OPIE to use opie-login
-rw-r--r-- | core/launcher/main.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index b3c331b..a19da14 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -36,28 +36,24 @@ | |||
36 | #include <qpe/qcopenvelope_qws.h> | 36 | #include <qpe/qcopenvelope_qws.h> |
37 | #include <qpe/alarmserver.h> | 37 | #include <qpe/alarmserver.h> |
38 | 38 | ||
39 | #include <stdlib.h> | 39 | #include <stdlib.h> |
40 | #include <stdio.h> | 40 | #include <stdio.h> |
41 | #include <signal.h> | 41 | #include <signal.h> |
42 | #include <unistd.h> | 42 | #include <unistd.h> |
43 | 43 | ||
44 | #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) | 44 | #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) |
45 | #include "../calibrate/calibrate.h" | 45 | #include "../calibrate/calibrate.h" |
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | #ifdef QT_QWS_LOGIN | ||
49 | #include "../login/qdmdialogimpl.h" | ||
50 | #endif | ||
51 | |||
52 | #ifdef QT_QWS_CASSIOPEIA | 48 | #ifdef QT_QWS_CASSIOPEIA |
53 | static void ignoreMessage( QtMsgType, const char * ) | 49 | static void ignoreMessage( QtMsgType, const char * ) |
54 | { | 50 | { |
55 | } | 51 | } |
56 | #include <sys/mount.h> | 52 | #include <sys/mount.h> |
57 | #include <sys/types.h> | 53 | #include <sys/types.h> |
58 | #include <sys/stat.h> | 54 | #include <sys/stat.h> |
59 | #include <sys/time.h> | 55 | #include <sys/time.h> |
60 | #include <fcntl.h> | 56 | #include <fcntl.h> |
61 | #include <qdatetime.h> | 57 | #include <qdatetime.h> |
62 | 58 | ||
63 | void initCassiopeia() | 59 | void initCassiopeia() |
@@ -294,32 +290,24 @@ int initApplication( int argc, char ** argv ) | |||
294 | #endif | 290 | #endif |
295 | 291 | ||
296 | //Don't flicker at startup: | 292 | //Don't flicker at startup: |
297 | QWSServer::setDesktopBackground( QImage() ); | 293 | QWSServer::setDesktopBackground( QImage() ); |
298 | DesktopApplication a( argc, argv, QApplication::GuiServer ); | 294 | DesktopApplication a( argc, argv, QApplication::GuiServer ); |
299 | 295 | ||
300 | (void) new ModelKeyFilter ( ); | 296 | (void) new ModelKeyFilter ( ); |
301 | 297 | ||
302 | initBacklight(); | 298 | initBacklight(); |
303 | 299 | ||
304 | AlarmServer::initialize(); | 300 | AlarmServer::initialize(); |
305 | 301 | ||
306 | #if defined(QT_QWS_LOGIN) | ||
307 | for( int i=0; i<a.argc(); i++ ) | ||
308 | if( strcmp( a.argv()[i], "-login" ) == 0 ) { | ||
309 | QDMDialogImpl::login( ); | ||
310 | return 0; | ||
311 | } | ||
312 | #endif | ||
313 | |||
314 | Desktop *d = new Desktop(); | 302 | Desktop *d = new Desktop(); |
315 | 303 | ||
316 | QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); | 304 | QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); |
317 | QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); | 305 | QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); |
318 | QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) ); | 306 | QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) ); |
319 | QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) ); | 307 | QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) ); |
320 | QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); | 308 | QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); |
321 | QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); | 309 | QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); |
322 | QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); | 310 | QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); |
323 | QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); | 311 | QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); |
324 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); | 312 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); |
325 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); | 313 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); |