-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 | |||
@@ -59,24 +59,30 @@ static int loggedin=0; | |||
59 | 59 | ||
60 | QCopKeyRegister::QCopKeyRegister() | 60 | QCopKeyRegister::QCopKeyRegister() |
61 | : m_keyCode( 0 ) { | 61 | : m_keyCode( 0 ) |
62 | { | ||
62 | } | 63 | } |
63 | 64 | ||
64 | QCopKeyRegister::QCopKeyRegister( int k, const QCString& c, const QCString& m ) | 65 | QCopKeyRegister::QCopKeyRegister( int k, const QCString& c, const QCString& m ) |
65 | :m_keyCode( k ), m_channel( c ), m_message( m ) { | 66 | :m_keyCode( k ), m_channel( c ), m_message( m ) |
67 | { | ||
66 | } | 68 | } |
67 | 69 | ||
68 | int QCopKeyRegister::keyCode()const { | 70 | int QCopKeyRegister::keyCode() const |
71 | { | ||
69 | return m_keyCode; | 72 | return m_keyCode; |
70 | } | 73 | } |
71 | 74 | ||
72 | QCString QCopKeyRegister::channel()const { | 75 | QCString QCopKeyRegister::channel() const |
76 | { | ||
73 | return m_channel; | 77 | return m_channel; |
74 | } | 78 | } |
75 | 79 | ||
76 | QCString QCopKeyRegister::message()const { | 80 | QCString QCopKeyRegister::message() const |
81 | { | ||
77 | return m_message; | 82 | return m_message; |
78 | } | 83 | } |
79 | 84 | ||
80 | bool QCopKeyRegister::send() { | 85 | bool QCopKeyRegister::send() |
86 | { | ||
81 | if (m_channel.isNull() ) | 87 | if (m_channel.isNull() ) |
82 | return false; | 88 | return false; |
@@ -158,13 +164,16 @@ void KeyFilter::timerEvent(QTimerEvent* e) | |||
158 | } | 164 | } |
159 | 165 | ||
160 | void KeyFilter::registerKey( const QCopKeyRegister& key ) { | 166 | void KeyFilter::registerKey( const QCopKeyRegister& key ) |
167 | { | ||
161 | m_keys.insert( key.keyCode(), key ); | 168 | m_keys.insert( key.keyCode(), key ); |
162 | } | 169 | } |
163 | 170 | ||
164 | void KeyFilter::unregisterKey( const QCopKeyRegister& key ) { | 171 | void KeyFilter::unregisterKey( const QCopKeyRegister& key ) |
172 | { | ||
165 | m_keys.remove( key.keyCode() ); | 173 | m_keys.remove( key.keyCode() ); |
166 | } | 174 | } |
167 | 175 | ||
168 | bool KeyFilter::keyRegistered( int key ) { | 176 | bool KeyFilter::keyRegistered( int key ) |
177 | { | ||
169 | /* | 178 | /* |
170 | * Check if we've a key registered | 179 | * Check if we've a key registered |
@@ -174,5 +183,4 @@ bool KeyFilter::keyRegistered( int key ) { | |||
174 | else | 183 | else |
175 | return true; | 184 | return true; |
176 | |||
177 | } | 185 | } |
178 | 186 | ||
@@ -198,5 +206,4 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe | |||
198 | }else { | 206 | }else { |
199 | 207 | ||
200 | |||
201 | // First check to see if DeviceButtonManager knows something about this button: | 208 | // First check to see if DeviceButtonManager knows something about this button: |
202 | const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode); | 209 | const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode); |
@@ -267,5 +274,6 @@ bool ServerApplication::allowRestart = TRUE; | |||
267 | bool ServerApplication::ms_is_starting = TRUE; | 274 | bool ServerApplication::ms_is_starting = TRUE; |
268 | 275 | ||
269 | void ServerApplication::switchLCD( bool on ) { | 276 | void ServerApplication::switchLCD( bool on ) |
277 | { | ||
270 | if ( !qApp ) | 278 | if ( !qApp ) |
271 | return; | 279 | return; |
@@ -360,5 +368,4 @@ ServerApplication::~ServerApplication() | |||
360 | ungrabKeyboard(); | 368 | ungrabKeyboard(); |
361 | 369 | ||
362 | |||
363 | delete pa; | 370 | delete pa; |
364 | delete m_ps; | 371 | delete m_ps; |
@@ -366,5 +373,6 @@ ServerApplication::~ServerApplication() | |||
366 | } | 373 | } |
367 | 374 | ||
368 | void ServerApplication::apmTimeout() { | 375 | void ServerApplication::apmTimeout() |
376 | { | ||
369 | serverApp-> checkMemory( ); // in case no events are generated | 377 | serverApp-> checkMemory( ); // in case no events are generated |
370 | *m_ps_last = *m_ps; | 378 | *m_ps_last = *m_ps; |
@@ -409,5 +417,6 @@ void ServerApplication::apmTimeout() { | |||
409 | 417 | ||
410 | void ServerApplication::systemMessage( const QCString& msg, | 418 | void ServerApplication::systemMessage( const QCString& msg, |
411 | const QByteArray& data ) { | 419 | const QByteArray& data ) |
420 | { | ||
412 | QDataStream stream ( data, IO_ReadOnly ); | 421 | QDataStream stream ( data, IO_ReadOnly ); |
413 | 422 | ||
@@ -554,5 +563,4 @@ void ServerApplication::togglePower() | |||
554 | 563 | ||
555 | #ifdef QWS | 564 | #ifdef QWS |
556 | |||
557 | if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { | 565 | if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { |
558 | // Should use a big black window instead. | 566 | // Should use a big black window instead. |
@@ -628,5 +636,6 @@ bool ServerApplication::qwsEventFilter( QWSEvent *e ) | |||
628 | screenClick(FALSE); | 636 | screenClick(FALSE); |
629 | } | 637 | } |
630 | }else if ( e->type == QWSEvent::Key ) { | 638 | } else |
639 | if ( e->type == QWSEvent::Key ) { | ||
631 | QWSKeyEvent * ke = static_cast<QWSKeyEvent*>( e ); | 640 | QWSKeyEvent * ke = static_cast<QWSKeyEvent*>( e ); |
632 | if ( kf->checkButtonAction( false, | 641 | if ( kf->checkButtonAction( false, |
@@ -651,5 +660,6 @@ void ServerApplication::showSafeMode() | |||
651 | "Plugins are not loaded in Safe Mode. " | 660 | "Plugins are not loaded in Safe Mode. " |
652 | "You can use the Plugin Manager to " | 661 | "You can use the Plugin Manager to " |
653 | "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) { | 662 | "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) |
663 | { | ||
654 | Global::execute( "pluginmanager" ); | 664 | Global::execute( "pluginmanager" ); |
655 | } | 665 | } |