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/locale/toplevel.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 'kcontrol/locale/toplevel.cpp')
| -rw-r--r-- | kcontrol/locale/toplevel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index f561ecaf6..5df0f5eb7 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -172,8 +172,8 @@ void KLocaleApplication::load( bool useDefaults ) void KLocaleApplication::save() { // temperary use of our locale as the global locale - KLocale *lsave = KGlobal::_locale; - KGlobal::_locale = m_locale; + KLocale *lsave = TDEGlobal::_locale; + TDEGlobal::_locale = m_locale; KMessageBox::information(this, m_locale->translate ("Changed language settings apply only to " "newly started applications.\nTo change the " @@ -182,9 +182,9 @@ void KLocaleApplication::save() m_locale->translate("Applying Language Settings"), TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); // restore the old global locale - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "Locale"); // ##### this doesn't make sense |