| -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 @@ -372,31 +372,28 @@ DesktopApplication::~DesktopApplication() delete ps; delete pa; } 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; QString c, m; stream >> k; stream >> c; stream >> m; 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)" ) { int time; stream >> time; m_screensaver-> setInterval( time ); @@ -421,13 +418,12 @@ void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & stream >> state; m_screensaver-> setDisplayState ( state != 0 ); } else if ( msg == "suspend()" ) { emit power(); } -#endif } enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown; #ifdef Q_WS_QWS bool DesktopApplication::qwsEventFilter( QWSEvent *e ) 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 @@ -621,13 +621,13 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl ) this, SLOT(viewSelected(const QString&)) ); connect( tabs, SIGNAL(clicked(const AppLnk*)), this, SLOT(select(const AppLnk*))); 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 &)) ); QCopChannel *channel = new QCopChannel( "QPE/Launcher", this ); connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(launcherMessage(const QCString&, const QByteArray&)) ); |