-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 @@ -58,26 +58,32 @@ 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; @@ -157,15 +163,18 @@ 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 */ @@ -173,7 +182,6 @@ bool KeyFilter::keyRegistered( int key ) { return false; else return true; - } bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepeat) @@ -197,7 +205,6 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe return true; }else { - // First check to see if DeviceButtonManager knows something about this button: const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode); if (button && !autoRepeat) { @@ -266,7 +273,8 @@ 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; @@ -359,13 +367,13 @@ 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(); @@ -408,7 +416,8 @@ void ServerApplication::apmTimeout() { } void ServerApplication::systemMessage( const QCString& msg, - const QByteArray& data ) { + const QByteArray& data ) +{ QDataStream stream ( data, IO_ReadOnly ); if ( msg == "setScreenSaverInterval(int)" ) { @@ -553,7 +562,6 @@ void ServerApplication::togglePower() 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 @@ -627,7 +635,8 @@ bool ServerApplication::qwsEventFilter( QWSEvent *e ) 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, @@ -650,7 +659,8 @@ void ServerApplication::showSafeMode() "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 |