| author | zecke <zecke> | 2002-10-18 01:46:28 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-10-18 01:46:28 (UTC) |
| commit | 218bc4583c545db50f3475930d61b1c76aca3fbd (patch) (side-by-side diff) | |
| 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 @@ -375,7 +375,6 @@ DesktopApplication::~DesktopApplication() void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray &data ) { -#ifdef Q_WS_QWS QDataStream stream( data, IO_ReadOnly ); if ( msg == "keyRegister(int key, QString channel, QString message)" ) { int k; @@ -387,13 +386,11 @@ void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray & qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m ); keyRegisterList.append( QCopKeyRegister( k, c, m ) ); } -#endif } void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data ) { -#ifdef Q_WS_QWS QDataStream stream ( data, IO_ReadOnly ); if ( msg == "setScreenSaverInterval(int)" ) { @@ -424,7 +421,6 @@ void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & else if ( msg == "suspend()" ) { emit power(); } -#endif } enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown; 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 @@ -624,7 +624,7 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl ) connect( tabs, SIGNAL(rightPressed(AppLnk*)), this, SLOT(properties(AppLnk*))); -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) QCopChannel* sysChannel = new QCopChannel( "QPE/System", this ); connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)), this, SLOT(systemMessage( const QCString &, const QByteArray &)) ); |