From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kcontrol/locale/localenum.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kcontrol/locale/localenum.cpp') 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() -- cgit v1.2.1