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 /kcontrol/access | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/access')
| -rw-r--r-- | kcontrol/access/kaccess.cpp | 10 | ||||
| -rw-r--r-- | kcontrol/access/kcmaccess.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index d119ed683..01b5090de 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -115,14 +115,14 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled) int KAccessApp::newInstance() { - KGlobal::config()->reparseConfiguration(); + TDEGlobal::config()->reparseConfiguration(); readSettings(); return 0; } void KAccessApp::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); // bell --------------------------------------------------------------- @@ -790,7 +790,7 @@ void KAccessApp::applyChanges() { unsigned int enabled = requestedFeatures & ~features; unsigned int disabled = features & ~requestedFeatures; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Keyboard"); if (enabled & XkbSlowKeysMask) @@ -823,7 +823,7 @@ void KAccessApp::yesClicked() { dialog->deleteLater(); dialog = 0; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Keyboard"); switch (showModeCombobox->currentItem()) { case 0: @@ -854,7 +854,7 @@ void KAccessApp::noClicked() { dialog = 0; requestedFeatures = features; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Keyboard"); switch (showModeCombobox->currentItem()) { case 0: diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 1e28238a6..64cb290e9 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -578,7 +578,7 @@ void KAccessConfig::changeFlashScreenColor() void KAccessConfig::selectSound() { - TQStringList list = KGlobal::dirs()->findDirs("sound", ""); + TQStringList list = TDEGlobal::dirs()->findDirs("sound", ""); TQString start; if (list.count()>0) start = list[0]; |