author | zecke <zecke> | 2002-10-18 01:46:28 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-18 01:46:28 (UTC) |
commit | 218bc4583c545db50f3475930d61b1c76aca3fbd (patch) (unidiff) | |
tree | 5ddd0dbca5a42d3f00914968150147c85b4da837 | |
parent | 0457c48c165abef8afa2ac73c8f66d20e289681a (diff) | |
download | opie-218bc4583c545db50f3475930d61b1c76aca3fbd.zip opie-218bc4583c545db50f3475930d61b1c76aca3fbd.tar.gz opie-218bc4583c545db50f3475930d61b1c76aca3fbd.tar.bz2 |
Remove some more #ifdefs
-rw-r--r-- | core/launcher/desktop.cpp | 4 | ||||
-rw-r--r-- | core/launcher/launcher.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 1fd3f6a..3546e28 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -374,9 +374,8 @@ DesktopApplication::~DesktopApplication() | |||
374 | } | 374 | } |
375 | 375 | ||
376 | void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray &data ) | 376 | void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray &data ) |
377 | { | 377 | { |
378 | #ifdef Q_WS_QWS | ||
379 | QDataStream stream( data, IO_ReadOnly ); | 378 | QDataStream stream( data, IO_ReadOnly ); |
380 | if ( msg == "keyRegister(int key, QString channel, QString message)" ) { | 379 | if ( msg == "keyRegister(int key, QString channel, QString message)" ) { |
381 | int k; | 380 | int k; |
382 | QString c, m; | 381 | QString c, m; |
@@ -386,15 +385,13 @@ void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray & | |||
386 | 385 | ||
387 | qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m ); | 386 | qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m ); |
388 | keyRegisterList.append( QCopKeyRegister( k, c, m ) ); | 387 | keyRegisterList.append( QCopKeyRegister( k, c, m ) ); |
389 | } | 388 | } |
390 | #endif | ||
391 | } | 389 | } |
392 | 390 | ||
393 | 391 | ||
394 | void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data ) | 392 | void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data ) |
395 | { | 393 | { |
396 | #ifdef Q_WS_QWS | ||
397 | QDataStream stream ( data, IO_ReadOnly ); | 394 | QDataStream stream ( data, IO_ReadOnly ); |
398 | 395 | ||
399 | if ( msg == "setScreenSaverInterval(int)" ) { | 396 | if ( msg == "setScreenSaverInterval(int)" ) { |
400 | int time; | 397 | int time; |
@@ -423,9 +420,8 @@ void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & | |||
423 | } | 420 | } |
424 | else if ( msg == "suspend()" ) { | 421 | else if ( msg == "suspend()" ) { |
425 | emit power(); | 422 | emit power(); |
426 | } | 423 | } |
427 | #endif | ||
428 | } | 424 | } |
429 | 425 | ||
430 | enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown; | 426 | enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown; |
431 | 427 | ||
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index a5955a4..5a9ee1b 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -623,9 +623,9 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl ) | |||
623 | this, SLOT(select(const AppLnk*))); | 623 | this, SLOT(select(const AppLnk*))); |
624 | connect( tabs, SIGNAL(rightPressed(AppLnk*)), | 624 | connect( tabs, SIGNAL(rightPressed(AppLnk*)), |
625 | this, SLOT(properties(AppLnk*))); | 625 | this, SLOT(properties(AppLnk*))); |
626 | 626 | ||
627 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 627 | #if !defined(QT_NO_COP) |
628 | QCopChannel* sysChannel = new QCopChannel( "QPE/System", this ); | 628 | QCopChannel* sysChannel = new QCopChannel( "QPE/System", this ); |
629 | connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)), | 629 | connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)), |
630 | this, SLOT(systemMessage( const QCString &, const QByteArray &)) ); | 630 | this, SLOT(systemMessage( const QCString &, const QByteArray &)) ); |
631 | QCopChannel *channel = new QCopChannel( "QPE/Launcher", this ); | 631 | QCopChannel *channel = new QCopChannel( "QPE/Launcher", this ); |