diff options
Diffstat (limited to 'kxkb')
| -rw-r--r-- | kxkb/kcmlayout.cpp | 8 | ||||
| -rw-r--r-- | kxkb/kcmmisc.cpp | 8 | ||||
| -rw-r--r-- | kxkb/kxkb.cpp | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index fac058a6f..8329f85aa 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -445,8 +445,8 @@ void LayoutConfig::save() keys->writeSettings(0, true); // Get current layout from Kxkb - if (!kapp->dcopClient()->isAttached()) - kapp->dcopClient()->attach(); + if (!tdeApp->dcopClient()->isAttached()) + tdeApp->dcopClient()->attach(); DCOPRef kxkbref("kxkb", "kxkb"); DCOPReply reply = kxkbref.call( "getCurrentLayout" ); @@ -459,7 +459,7 @@ void LayoutConfig::save() } // Cause Kxkb to reread configuration - kapp->tdeinitExecWait("kxkb"); + tdeApp->tdeinitExecWait("kxkb"); // If previous call was valid, try to change layout if ( reply.isValid() ) { @@ -1247,7 +1247,7 @@ extern "C" m_kxkbConfig.load(KxkbConfig::LOAD_INIT_OPTIONS); if( m_kxkbConfig.m_useKxkb == true ) { - kapp->startServiceByDesktopName("kxkb"); + tdeApp->startServiceByDesktopName("kxkb"); } else { if (!XKBExtension::setXkbOptions(m_kxkbConfig.getKXkbOptions())) { diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp index c8be694be..fce6349be 100644 --- a/kxkb/kcmmisc.cpp +++ b/kxkb/kcmmisc.cpp @@ -129,7 +129,7 @@ void KeyboardConfig::load() XKeyboardState kbd; - XGetKeyboardControl(kapp->getDisplay(), &kbd); + XGetKeyboardControl(tdeApp->getDisplay(), &kbd); config.setGroup("Keyboard"); bool key = config.readBoolEntry("KeyboardRepeating", true); @@ -156,7 +156,7 @@ void KeyboardConfig::save() kbd.key_click_percent = clickVolume; kbd.auto_repeat_mode = keyboardRepeat; - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBKeyClickPercent | KBAutoRepeatMode, &kbd); if( keyboardRepeat ) { @@ -538,12 +538,12 @@ void KeyboardConfig::init_keyboard() XKeyboardState kbd; XKeyboardControl kbdc; - XGetKeyboardControl(kapp->getDisplay(), &kbd); + XGetKeyboardControl(tdeApp->getDisplay(), &kbd); bool key = config->readBoolEntry("KeyboardRepeating", true); kbdc.key_click_percent = config->readNumEntry("ClickVolume", kbd.key_click_percent); kbdc.auto_repeat_mode = (key ? AutoRepeatModeOn : AutoRepeatModeOff); - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBKeyClickPercent | KBAutoRepeatMode, &kbdc); diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index fd8db27d5..2dc9733e6 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -114,7 +114,7 @@ bool KXKBApp::settingsRead() } if ( kxkbConfig.m_useKxkb == false ) { - kapp->quit(); + tdeApp->quit(); return false; } @@ -153,7 +153,7 @@ bool KXKBApp::settingsRead() kdDebug() << "default layout is " << m_currentLayout.toPair() << endl; if( kxkbConfig.m_layouts.count() == 1 && !kxkbConfig.m_showSingle) { - kapp->quit(); + tdeApp->quit(); return false; } @@ -172,7 +172,7 @@ void KXKBApp::initTray() { KSystemTray* sysTray = new KxkbSystemTray(); TDEPopupMenu* popupMenu = sysTray->contextMenu(); - // popupMenu->insertTitle( kapp->miniIcon(), kapp->caption() ); + // popupMenu->insertTitle( tdeApp->miniIcon(), tdeApp->caption() ); m_tray = new KxkbLabelController(sysTray, popupMenu); connect(popupMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuActivated(int))); @@ -270,7 +270,7 @@ void KXKBApp::menuActivated(int id) } else if (id == KxkbLabelController::HELP_MENU_ID) { - TDEApplication::kApplication()->invokeHelp(0, "kxkb"); + tdeApp->invokeHelp(0, "kxkb"); } // else // { @@ -301,7 +301,7 @@ void KXKBApp::maybeShowLayoutNotification() { QCStringList modules; TQCString replyType; TQByteArray replyData; - if (kapp->dcopClient()->call("kded", "kded", "loadedModules()", + if (tdeApp->dcopClient()->call("kded", "kded", "loadedModules()", TQByteArray(), replyType, replyData)) { if (replyType == "QCStringList") { @@ -317,7 +317,7 @@ void KXKBApp::maybeShowLayoutNotification() { if (useKMilo) { DCOPRef kmilo("kded", "kmilod"); - if (kmilo.send("displayText(TQString,TQPixmap)", layoutName, kapp->miniIcon())) + if (kmilo.send("displayText(TQString,TQPixmap)", layoutName, tdeApp->miniIcon())) notificationSent = true; } |