diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/locale/toplevel.cpp | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/locale/toplevel.cpp')
| -rw-r--r-- | kcontrol/locale/toplevel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index 5df0f5eb7..01e189fd4 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -47,7 +47,7 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule( KLocaleFactory::instance(), parent, args) + : TDECModule( KLocaleFactory::instance(), parent, args) { TDEAboutData* aboutData = new TDEAboutData("kcmlocale", I18N_NOOP("KCMLocale"), @@ -59,8 +59,8 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, 0, 0, "[email protected]"); setAboutData( aboutData ); - m_nullConfig = new KConfig(TQString::null, false, false); - m_globalConfig = new KConfig(TQString::null, false, true); + m_nullConfig = new TDEConfig(TQString::null, false, false); + m_globalConfig = new TDEConfig(TQString::null, false, true); m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -184,8 +184,8 @@ void KLocaleApplication::save() // restore the old global locale TDEGlobal::_locale = lsave; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Locale"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Locale"); // ##### this doesn't make sense bool langChanged = config->readEntry("Language") |