| -rw-r--r-- | core/launcher/serverapp.cpp | 106 |
1 files changed, 58 insertions, 48 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index f1bce40..a2302d8 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp @@ -60,3 +60,4 @@ static int loggedin=0; QCopKeyRegister::QCopKeyRegister() - : m_keyCode( 0 ) { + : m_keyCode( 0 ) +{ } @@ -64,6 +65,8 @@ QCopKeyRegister::QCopKeyRegister() QCopKeyRegister::QCopKeyRegister( int k, const QCString& c, const QCString& m ) - :m_keyCode( k ), m_channel( c ), m_message( m ) { + :m_keyCode( k ), m_channel( c ), m_message( m ) +{ } -int QCopKeyRegister::keyCode()const { +int QCopKeyRegister::keyCode() const +{ return m_keyCode; @@ -71,3 +74,4 @@ int QCopKeyRegister::keyCode()const { -QCString QCopKeyRegister::channel()const { +QCString QCopKeyRegister::channel() const +{ return m_channel; @@ -75,3 +79,4 @@ QCString QCopKeyRegister::channel()const { -QCString QCopKeyRegister::message()const { +QCString QCopKeyRegister::message() const +{ return m_message; @@ -79,3 +84,4 @@ QCString QCopKeyRegister::message()const { -bool QCopKeyRegister::send() { +bool QCopKeyRegister::send() +{ if (m_channel.isNull() ) @@ -159,3 +165,4 @@ void KeyFilter::timerEvent(QTimerEvent* e) -void KeyFilter::registerKey( const QCopKeyRegister& key ) { +void KeyFilter::registerKey( const QCopKeyRegister& key ) +{ m_keys.insert( key.keyCode(), key ); @@ -163,3 +170,4 @@ void KeyFilter::registerKey( const QCopKeyRegister& key ) { -void KeyFilter::unregisterKey( const QCopKeyRegister& key ) { +void KeyFilter::unregisterKey( const QCopKeyRegister& key ) +{ m_keys.remove( key.keyCode() ); @@ -167,3 +175,4 @@ void KeyFilter::unregisterKey( const QCopKeyRegister& key ) { -bool KeyFilter::keyRegistered( int key ) { +bool KeyFilter::keyRegistered( int key ) +{ /* @@ -175,3 +184,2 @@ bool KeyFilter::keyRegistered( int key ) { return true; - } @@ -197,4 +205,3 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe return true; - }else { - + } else { @@ -268,3 +275,4 @@ bool ServerApplication::ms_is_starting = TRUE; -void ServerApplication::switchLCD( bool on ) { +void ServerApplication::switchLCD( bool on ) +{ if ( !qApp ) @@ -280,3 +288,3 @@ void ServerApplication::switchLCD( bool on ) { dapp-> m_screensaver-> setBacklight ( -3 ); - }else + } else dapp-> m_screensaver-> setDisplayState ( false ); @@ -361,3 +369,2 @@ ServerApplication::~ServerApplication() - delete pa; @@ -367,3 +374,4 @@ ServerApplication::~ServerApplication() -void ServerApplication::apmTimeout() { +void ServerApplication::apmTimeout() +{ serverApp-> checkMemory( ); // in case no events are generated @@ -410,3 +418,4 @@ void ServerApplication::apmTimeout() { void ServerApplication::systemMessage( const QCString& msg, - const QByteArray& data ) { + const QByteArray& data ) +{ QDataStream stream ( data, IO_ReadOnly ); @@ -523,16 +532,16 @@ namespace { QString appName; - int delay; - QDateTime now = QDateTime::currentDateTime(); + int delay; + QDateTime now = QDateTime::currentDateTime(); Config cfg( "autostart" ); - cfg.setGroup( "AutoStart" ); - appName = cfg.readEntry( "Apps", "" ); - delay = cfg.readNumEntry( "Delay", 0 ); - - // If the time between suspend and resume was longer then the - // value saved as delay, start the app - if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) { - QCopEnvelope e( "QPE/System", "execute(QString)" ); - e << QString( appName ); - } + cfg.setGroup( "AutoStart" ); + appName = cfg.readEntry( "Apps", "" ); + delay = cfg.readNumEntry( "Delay", 0 ); + + // If the time between suspend and resume was longer then the + // value saved as delay, start the app + if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) { + QCopEnvelope e( "QPE/System", "execute(QString)" ); + e << QString( appName ); + } } @@ -555,3 +564,2 @@ void ServerApplication::togglePower() #ifdef QWS - if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { @@ -618,14 +626,15 @@ bool ServerApplication::qwsEventFilter( QWSEvent *e ) if ( e->type == QWSEvent::Mouse ) { - QWSMouseEvent *me = (QWSMouseEvent *)e; - static bool up = TRUE; - if ( me->simpleData.state&LeftButton ) { - if ( up ) { - up = FALSE; - screenClick(TRUE); + QWSMouseEvent *me = (QWSMouseEvent *)e; + static bool up = TRUE; + if ( me->simpleData.state&LeftButton ) { + if ( up ) { + up = FALSE; + screenClick(TRUE); + } + } else if ( !up ) { + up = TRUE; + screenClick(FALSE); } - } else if ( !up ) { - up = TRUE; - screenClick(FALSE); - } - }else if ( e->type == QWSEvent::Key ) { + } else + if ( e->type == QWSEvent::Key ) { QWSKeyEvent * ke = static_cast<QWSKeyEvent*>( e ); @@ -652,4 +661,5 @@ void ServerApplication::showSafeMode() "You can use the Plugin Manager to " - "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) { - Global::execute( "pluginmanager" ); + "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) + { + Global::execute( "pluginmanager" ); } @@ -667,3 +677,3 @@ void ServerApplication::clearSafeMode() if ( mode == "MaybeSafe" ) { - cfg.writeEntry( "Mode", "Normal" ); + cfg.writeEntry( "Mode", "Normal" ); } @@ -676,3 +686,3 @@ void ServerApplication::shutdown() if ( type() != GuiServer ) - return; + return; ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); @@ -731,5 +741,5 @@ void ServerApplication::restart() emit aboutToQuit(); - prepareForTermination(TRUE); - doRestart = TRUE; - quit(); + prepareForTermination(TRUE); + doRestart = TRUE; + quit(); #else |