diff options
Diffstat (limited to 'kcontrol/locale')
-rw-r--r-- | kcontrol/locale/kcmlocale.cpp | 2 | ||||
-rw-r--r-- | kcontrol/locale/localemon.cpp | 4 | ||||
-rw-r--r-- | kcontrol/locale/localenum.cpp | 4 | ||||
-rw-r--r-- | kcontrol/locale/localeother.cpp | 4 | ||||
-rw-r--r-- | kcontrol/locale/localetime.cpp | 4 | ||||
-rw-r--r-- | kcontrol/locale/main.cpp | 2 | ||||
-rw-r--r-- | kcontrol/locale/toplevel.cpp | 10 | ||||
-rw-r--r-- | kcontrol/locale/toplevel.h | 8 |
8 files changed, 19 insertions, 19 deletions
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 40bbf1ab7..c2f50eab7 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -413,7 +413,7 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name, void KLocaleConfig::save() { - KConfigBase *config = TDEGlobal::config(); + TDEConfigBase *config = TDEGlobal::config(); config->setGroup("Locale"); diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index dc4cb2c2e..795524813 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -127,8 +127,8 @@ KLocaleConfigMoney::~KLocaleConfigMoney() void KLocaleConfigMoney::save() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Locale"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index a940a7ef3..4d291f969 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -85,8 +85,8 @@ void KLocaleConfigNumber::save() KLocale *lsave = TDEGlobal::_locale; TDEGlobal::_locale = m_locale; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Locale"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index cf92ea1fb..2231864ef 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -76,8 +76,8 @@ KLocaleConfigOther::~KLocaleConfigOther() void KLocaleConfigOther::save() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Locale"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index df51ae8a4..c41bcba4d 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -249,8 +249,8 @@ void KLocaleConfigTime::save() KLocale *lsave = TDEGlobal::_locale; TDEGlobal::_locale = m_locale; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Locale"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") diff --git a/kcontrol/locale/main.cpp b/kcontrol/locale/main.cpp index 74febe07e..63ca9da4b 100644 --- a/kcontrol/locale/main.cpp +++ b/kcontrol/locale/main.cpp @@ -30,7 +30,7 @@ extern "C" { /* extern "C" { - KCModule *create_locale(TQWidget *parent, const char* name) { + TDECModule *create_locale(TQWidget *parent, const char* name) { KLocale::setMainCatalogue("kcmlocale"); return new KLocaleApplication(parent, "kcmlocale"); } 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, "bieker@kde.org"); 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") diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h index 64cc89c2a..a999d64d0 100644 --- a/kcontrol/locale/toplevel.h +++ b/kcontrol/locale/toplevel.h @@ -31,7 +31,7 @@ class TQTabWidget; class TQGroupBox; -class KConfig; +class TDEConfig; class KLocale; class KLocaleConfig; class KLocaleConfigMoney; @@ -40,7 +40,7 @@ class KLocaleConfigTime; class KLocaleConfigOther; class KLocaleSample; -class KLocaleApplication : public KCModule +class KLocaleApplication : public TDECModule { Q_OBJECT @@ -78,8 +78,8 @@ private: TQGroupBox *m_gbox; KLocaleSample *m_sample; - KConfig * m_globalConfig; - KConfig * m_nullConfig; + TDEConfig * m_globalConfig; + TDEConfig * m_nullConfig; }; typedef KGenericFactory<KLocaleApplication, TQWidget > KLocaleFactory; |