From 218bc4583c545db50f3475930d61b1c76aca3fbd Mon Sep 17 00:00:00 2001 From: zecke Date: Fri, 18 Oct 2002 01:46:28 +0000 Subject: Remove some more #ifdefs --- (limited to 'core/launcher') 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 &)) ); -- cgit v0.9.0.2