author | zecke <zecke> | 2004-03-13 21:27:29 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 21:27:29 (UTC) |
commit | 184a0cd9935d0a249038cdbe05488c181b273d64 (patch) (unidiff) | |
tree | c8f3508ab1be012083d9e2140221cfeb9a9ab83a /core/launcher/serverapp.cpp | |
parent | a3304e23c7f8576a4584475ef0cf49d0e588671e (diff) | |
download | opie-184a0cd9935d0a249038cdbe05488c181b273d64.zip opie-184a0cd9935d0a249038cdbe05488c181b273d64.tar.gz opie-184a0cd9935d0a249038cdbe05488c181b273d64.tar.bz2 |
Fix namespaces in the launcher.. and found a problem with my script
-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 | |||
@@ -54,8 +54,9 @@ static ServerApplication *serverApp = 0; | |||
54 | static int loggedin=0; | 54 | static int loggedin=0; |
55 | 55 | ||
56 | using namespace Opie; | 56 | using namespace Opie; |
57 | 57 | ||
58 | using namespace Opie::Core; | ||
58 | QCopKeyRegister::QCopKeyRegister() | 59 | QCopKeyRegister::QCopKeyRegister() |
59 | : m_keyCode( 0 ) { | 60 | : m_keyCode( 0 ) { |
60 | } | 61 | } |
61 | 62 | ||
@@ -196,9 +197,9 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe | |||
196 | }else { | 197 | }else { |
197 | 198 | ||
198 | 199 | ||
199 | // First check to see if DeviceButtonManager knows something about this button: | 200 | // First check to see if DeviceButtonManager knows something about this button: |
200 | const Opie::ODeviceButton* button = Opie::ODevice::inst()->buttonForKeycode(keycode); | 201 | const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode); |
201 | if (button && !autoRepeat) { | 202 | if (button && !autoRepeat) { |
202 | if ( held_tid ) { | 203 | if ( held_tid ) { |
203 | killTimer(held_tid); | 204 | killTimer(held_tid); |
204 | held_tid = 0; | 205 | held_tid = 0; |
@@ -330,10 +331,10 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) | |||
330 | connect( kf, SIGNAL(backlight()), this, SIGNAL(backlight()) ); | 331 | connect( kf, SIGNAL(backlight()), this, SIGNAL(backlight()) ); |
331 | connect( kf, SIGNAL(symbol()), this, SIGNAL(symbol())); | 332 | connect( kf, SIGNAL(symbol()), this, SIGNAL(symbol())); |
332 | connect( kf, SIGNAL(numLockStateToggle()), this,SIGNAL(numLockStateToggle())); | 333 | connect( kf, SIGNAL(numLockStateToggle()), this,SIGNAL(numLockStateToggle())); |
333 | connect( kf, SIGNAL(capsLockStateToggle()), this,SIGNAL(capsLockStateToggle())); | 334 | connect( kf, SIGNAL(capsLockStateToggle()), this,SIGNAL(capsLockStateToggle())); |
334 | connect( kf, SIGNAL(activate(const Opie::ODeviceButton*,bool)), | 335 | connect( kf, SIGNAL(activate(const Opie::Core::ODeviceButton*,bool)), |
335 | this,SIGNAL(activate(const Opie::ODeviceButton*,bool))); | 336 | this,SIGNAL(activate(const Opie::Core::ODeviceButton*,bool))); |
336 | 337 | ||
337 | 338 | ||
338 | connect( kf, SIGNAL(backlight()), this, SLOT(toggleLight()) ); | 339 | connect( kf, SIGNAL(backlight()), this, SLOT(toggleLight()) ); |
339 | 340 | ||
@@ -347,9 +348,9 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) | |||
347 | apmTimeout(); | 348 | apmTimeout(); |
348 | grabKeyboard(); | 349 | grabKeyboard(); |
349 | 350 | ||
350 | /* make sure the event filter is installed */ | 351 | /* make sure the event filter is installed */ |
351 | const Opie::ODeviceButton* but = Opie::ODevice::inst()->buttonForKeycode( -1 ); | 352 | const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); |
352 | } | 353 | } |
353 | 354 | ||
354 | 355 | ||
355 | ServerApplication::~ServerApplication() | 356 | ServerApplication::~ServerApplication() |