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/localenum.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/localenum.cpp')
| -rw-r--r-- | kcontrol/locale/localenum.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index f6149d6d1..a940a7ef3 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -82,10 +82,10 @@ KLocaleConfigNumber::~KLocaleConfigNumber() void KLocaleConfigNumber::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; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", @@ -122,7 +122,7 @@ void KLocaleConfigNumber::save() config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true); // restore the old global locale - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; } void KLocaleConfigNumber::slotLocaleChanged() |