diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kxkb/kxkb.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kxkb/kxkb.cpp')
| -rw-r--r-- | kxkb/kxkb.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 5c2bf2cb0..7e9b11fa9 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -73,7 +73,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled) } // keep in sync with kcmlayout.cpp - keys = new KGlobalAccel(TQT_TQOBJECT(this)); + keys = new TDEGlobalAccel(TQT_TQOBJECT(this)); #include "kxkbbindings.cpp" keys->updateConnections(); @@ -180,7 +180,7 @@ bool KXKBApp::settingsRead() initTray(); - KGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals + TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals keys->readSettings(); keys->updateConnections(); @@ -268,9 +268,9 @@ void KXKBApp::menuActivated(int id) } else if (id == KxkbLabelController::CONFIG_MENU_ID) { - KProcess p; + TDEProcess p; p << "kcmshell" << "keyboard_layout"; - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); } else if (id == KxkbLabelController::HELP_MENU_ID) { @@ -324,7 +324,7 @@ void KXKBApp::slotSettingsChanged(int category) if ( category != TDEApplication::SETTINGS_SHORTCUTS) return; - KGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals + TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals keys->readSettings(); keys->updateConnections(); } @@ -347,7 +347,7 @@ This is done by loading each one of them and then dumping the compiled map from the X server into our local buffer.*/ // void KXKBApp::initPrecompiledLayouts() // { -// TQStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" ); +// TQStringList dirs = TDEGlobal::dirs()->findDirs ( "tmp", "" ); // TQString tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0]; // // TQValueList<LayoutUnit>::ConstIterator end = kxkbConfig.m_layouts.end(); |