author | schurig <schurig> | 2004-09-10 08:04:41 (UTC) |
---|---|---|
committer | schurig <schurig> | 2004-09-10 08:04:41 (UTC) |
commit | 1ce7786a16ee7b9679391090eeedc4cbcaab81ca (patch) (side-by-side diff) | |
tree | 93e562be7ff03ade88d3cc9838c8420a02a5ff8d | |
parent | 0209835eb255beb66cf021c02e659ed8ab02dcd1 (diff) | |
download | opie-1ce7786a16ee7b9679391090eeedc4cbcaab81ca.zip opie-1ce7786a16ee7b9679391090eeedc4cbcaab81ca.tar.gz opie-1ce7786a16ee7b9679391090eeedc4cbcaab81ca.tar.bz2 |
whitespace changes
-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 @@ -59,24 +59,30 @@ static int loggedin=0; QCopKeyRegister::QCopKeyRegister() - : m_keyCode( 0 ) { + : m_keyCode( 0 ) +{ } 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; } -QCString QCopKeyRegister::channel()const { +QCString QCopKeyRegister::channel() const +{ return m_channel; } -QCString QCopKeyRegister::message()const { +QCString QCopKeyRegister::message() const +{ return m_message; } -bool QCopKeyRegister::send() { +bool QCopKeyRegister::send() +{ if (m_channel.isNull() ) return false; @@ -158,13 +164,16 @@ void KeyFilter::timerEvent(QTimerEvent* e) } -void KeyFilter::registerKey( const QCopKeyRegister& key ) { +void KeyFilter::registerKey( const QCopKeyRegister& key ) +{ m_keys.insert( key.keyCode(), key ); } -void KeyFilter::unregisterKey( const QCopKeyRegister& key ) { +void KeyFilter::unregisterKey( const QCopKeyRegister& key ) +{ m_keys.remove( key.keyCode() ); } -bool KeyFilter::keyRegistered( int key ) { +bool KeyFilter::keyRegistered( int key ) +{ /* * Check if we've a key registered @@ -174,5 +183,4 @@ bool KeyFilter::keyRegistered( int key ) { else return true; - } @@ -196,6 +204,5 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe if (keycode != 0 &&press && !autoRepeat && keyRegistered(keycode) ) return true; - }else { - + } else { // First check to see if DeviceButtonManager knows something about this button: @@ -267,5 +274,6 @@ bool ServerApplication::allowRestart = TRUE; bool ServerApplication::ms_is_starting = TRUE; -void ServerApplication::switchLCD( bool on ) { +void ServerApplication::switchLCD( bool on ) +{ if ( !qApp ) return; @@ -279,5 +287,5 @@ void ServerApplication::switchLCD( bool on ) { dapp-> m_screensaver-> setDisplayState ( true ); dapp-> m_screensaver-> setBacklight ( -3 ); - }else + } else dapp-> m_screensaver-> setDisplayState ( false ); @@ -360,5 +368,4 @@ ServerApplication::~ServerApplication() ungrabKeyboard(); - delete pa; delete m_ps; @@ -366,5 +373,6 @@ ServerApplication::~ServerApplication() } -void ServerApplication::apmTimeout() { +void ServerApplication::apmTimeout() +{ serverApp-> checkMemory( ); // in case no events are generated *m_ps_last = *m_ps; @@ -409,5 +417,6 @@ void ServerApplication::apmTimeout() { void ServerApplication::systemMessage( const QCString& msg, - const QByteArray& data ) { + const QByteArray& data ) +{ QDataStream stream ( data, IO_ReadOnly ); @@ -522,18 +531,18 @@ namespace { void execAutoStart(const QDateTime& suspendTime ) { 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 ); + } } } @@ -554,5 +563,4 @@ void ServerApplication::togglePower() #ifdef QWS - if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { // Should use a big black window instead. @@ -617,16 +625,17 @@ 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 ); if ( kf->checkButtonAction( false, @@ -651,6 +660,7 @@ void ServerApplication::showSafeMode() "Plugins are not loaded in Safe Mode. " "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" ); } #endif @@ -666,5 +676,5 @@ void ServerApplication::clearSafeMode() QString mode = cfg.readEntry( "Mode", "Normal" ); if ( mode == "MaybeSafe" ) { - cfg.writeEntry( "Mode", "Normal" ); + cfg.writeEntry( "Mode", "Normal" ); } #endif @@ -675,5 +685,5 @@ void ServerApplication::shutdown() { if ( type() != GuiServer ) - return; + return; ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)), @@ -730,7 +740,7 @@ void ServerApplication::restart() /* same as above */ emit aboutToQuit(); - prepareForTermination(TRUE); - doRestart = TRUE; - quit(); + prepareForTermination(TRUE); + doRestart = TRUE; + quit(); #else prepareForTermination( true ); |