| -rw-r--r-- | core/launcher/serverapp.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index d38dd97..e4e16f2 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp @@ -52,12 +52,13 @@ static ServerApplication *serverApp = 0; static int loggedin=0; using namespace Opie; +using namespace Opie::Core; QCopKeyRegister::QCopKeyRegister() : m_keyCode( 0 ) { } QCopKeyRegister::QCopKeyRegister( int k, const QCString& c, const QCString& m ) :m_keyCode( k ), m_channel( c ), m_message( m ) { @@ -194,13 +195,13 @@ 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 Opie::ODeviceButton* button = Opie::ODevice::inst()->buttonForKeycode(keycode); + const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode); if (button && !autoRepeat) { if ( held_tid ) { killTimer(held_tid); held_tid = 0; } if ( button->heldAction().isNull() ) { @@ -328,14 +329,14 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) connect( kf, SIGNAL(launch()), this, SIGNAL(launch()) ); connect( kf, SIGNAL(power()), this, SIGNAL(power()) ); connect( kf, SIGNAL(backlight()), this, SIGNAL(backlight()) ); connect( kf, SIGNAL(symbol()), this, SIGNAL(symbol())); connect( kf, SIGNAL(numLockStateToggle()), this,SIGNAL(numLockStateToggle())); connect( kf, SIGNAL(capsLockStateToggle()), this,SIGNAL(capsLockStateToggle())); - connect( kf, SIGNAL(activate(const Opie::ODeviceButton*,bool)), - this,SIGNAL(activate(const Opie::ODeviceButton*,bool))); + connect( kf, SIGNAL(activate(const Opie::Core::ODeviceButton*,bool)), + this,SIGNAL(activate(const Opie::Core::ODeviceButton*,bool))); connect( kf, SIGNAL(backlight()), this, SLOT(toggleLight()) ); connect( this, SIGNAL(power() ), SLOT(togglePower() ) ); @@ -345,13 +346,13 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) serverApp = this; apmTimeout(); grabKeyboard(); /* make sure the event filter is installed */ - const Opie::ODeviceButton* but = Opie::ODevice::inst()->buttonForKeycode( -1 ); + const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); } ServerApplication::~ServerApplication() { ungrabKeyboard(); |