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 | 46 |
1 files changed, 28 insertions, 18 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 @@ -57,28 +57,34 @@ using namespace Opie::Core; static ServerApplication *serverApp = 0; 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; QCopEnvelope( m_channel, m_message ); @@ -156,25 +162,27 @@ void KeyFilter::timerEvent(QTimerEvent* e) held_tid = 0; } } -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 */ if ( !m_keys[key].send()) return false; else return true; - } bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepeat) { @@ -196,9 +204,8 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe if (keycode != 0 &&press && !autoRepeat && keyRegistered(keycode) ) return true; }else { - // First check to see if DeviceButtonManager knows something about this button: const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode); if (button && !autoRepeat) { if ( held_tid ) { @@ -265,9 +272,10 @@ QPE_MEMALERTER_IMPL bool ServerApplication::doRestart = FALSE; bool ServerApplication::allowRestart = TRUE; bool ServerApplication::ms_is_starting = TRUE; -void ServerApplication::switchLCD( bool on ) { +void ServerApplication::switchLCD( bool on ) +{ if ( !qApp ) return; ServerApplication *dapp = ServerApplication::me() ; @@ -358,15 +366,15 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) ServerApplication::~ServerApplication() { ungrabKeyboard(); - delete pa; delete m_ps; delete m_ps_last; } -void ServerApplication::apmTimeout() { +void ServerApplication::apmTimeout() +{ serverApp-> checkMemory( ); // in case no events are generated *m_ps_last = *m_ps; *m_ps = PowerStatusManager::readStatus(); @@ -407,9 +415,10 @@ void ServerApplication::apmTimeout() { } } void ServerApplication::systemMessage( const QCString& msg, - const QByteArray& data ) { + const QByteArray& data ) +{ QDataStream stream ( data, IO_ReadOnly ); if ( msg == "setScreenSaverInterval(int)" ) { int time; @@ -552,9 +561,8 @@ void ServerApplication::togglePower() loggedin = 0; m_suspendTime = QDateTime::currentDateTime(); #ifdef QWS - if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { // Should use a big black window instead. // But this would not show up fast enough QGfx *g = qt_screen-> screenGfx ( ); @@ -626,9 +634,10 @@ bool ServerApplication::qwsEventFilter( QWSEvent *e ) } 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, ke-> simpleData.keycode, ke-> simpleData.is_press, @@ -649,9 +658,10 @@ void ServerApplication::showSafeMode() if ( QMessageBox::warning(0, tr("Safe Mode"), tr("<P>A system startup error occurred, " "and the system is now in Safe Mode. " "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 ) { + "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) + { Global::execute( "pluginmanager" ); } #endif } |