diff options
Diffstat (limited to 'kpersonalizer/kcountrypage.cpp')
| -rw-r--r-- | kpersonalizer/kcountrypage.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index cec71bae8..6a9961de3 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -20,13 +20,13 @@ #include <tqmap.h> #include <tdeapplication.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klanguagebutton.h> #include "kfindlanguage.h" @@ -37,8 +37,8 @@ KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDl px_introSidebar->setPixmap(UserIcon("step1.png")); - connect(cb_country, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLangForCountry(const TQString &))); - connect(cb_language, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLanguageChanged())); + connect(cb_country, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLangForCountry(const TQString &))); + connect(cb_language, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLanguageChanged())); // naturally, the language is not changed on startup b_savedLanguageChanged = false; @@ -85,7 +85,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { TQMap<TQString,TQString> regionnames; for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) { - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); @@ -112,7 +112,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { countrylist.sort(); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); TQString submenu = '-' + entry.readEntry("Region"); @@ -163,25 +163,25 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan TQByteArray data, da; TQDataStream stream( data, IO_WriteOnly ); stream << comboLang->current(); - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); // tdesycoca needs to be rebuilt TDEProcess proc; proc << TQString::fromLatin1("tdebuildsycoca"); proc.start(TDEProcess::DontCare); kdDebug() << "TDELocaleConfig::save : sending signal to kdesktop" << endl; // inform kicker and kdeskop about the new language - kapp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null); + tdeApp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null); // call, not send, so that we know it's done before coming back // (we both access kdeglobals...) - kapp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData ); + tdeApp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData ); } // KPersonalizer::next() probably waits for a return-value return true; } void KCountryPage::setLangForCountry(const TQString &country) { - KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true); + TDESimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true); ent.setGroup(TQString::fromLatin1("KCM Locale")); langs = ent.readListEntry(TQString::fromLatin1("Languages")); |