diff options
Diffstat (limited to 'kcontrol/locale/kcmlocale.cpp')
-rw-r--r-- | kcontrol/locale/kcmlocale.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 3d1736676..22d815866 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -33,11 +33,11 @@ #include <kdebug.h> #include <kdialog.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kiconloader.h> #include <klanguagebutton.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include "kcmlocale.h" #include "kcmlocale.moc" @@ -55,34 +55,34 @@ TDELocaleConfig::TDELocaleConfig(TDELocale *locale, m_labCountry = new TQLabel(this, I18N_NOOP("Country or region:")); m_comboCountry = new KLanguageButton( this ); m_labCountry->setBuddy(m_comboCountry); - connect( m_comboCountry, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(changedCountry(const TQString &)) ); + connect( m_comboCountry, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(changedCountry(const TQString &)) ); m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); m_labLang->setAlignment( AlignTop ); m_languages = new TQListBox(this); - connect(m_languages, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotCheckButtons())); + connect(m_languages, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotCheckButtons())); TQWidget * vb = new TQWidget(this); TQVBoxLayout * boxlay = new TQVBoxLayout(vb, 0, KDialog::spacingHint()); m_addLanguage = new KLanguageButton(TQString::null, vb, I18N_NOOP("Add Language")); boxlay->add(m_addLanguage); - connect(m_addLanguage, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(slotAddLanguage(const TQString &))); + connect(m_addLanguage, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(slotAddLanguage(const TQString &))); m_removeLanguage = new TQPushButton(vb, I18N_NOOP("Remove Language")); m_upButton = new TQPushButton(vb, I18N_NOOP("Move Up")); m_downButton = new TQPushButton(vb, I18N_NOOP("Move Down")); boxlay->add(m_removeLanguage); boxlay->add(m_upButton); boxlay->add(m_downButton); - connect(m_removeLanguage, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRemoveLanguage())); - connect(m_upButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotLanguageUp())); - connect(m_downButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotLanguageDown())); + connect(m_removeLanguage, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRemoveLanguage())); + connect(m_upButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotLanguageUp())); + connect(m_downButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotLanguageDown())); boxlay->insertStretch(-1); // #### HPB: This should be implemented for KDE 3 @@ -113,9 +113,9 @@ TDELocaleConfig::TDELocaleConfig(TDELocale *locale, languageSelectorLayout->addStretch(); lay->addMultiCellLayout(languageSelectorLayout, 3, 3, 0, 2); - connect( installLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallLanguage()) ); - connect( uninstallLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallLanguage()) ); - connect( selectLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectLanguage()) ); + connect( installLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallLanguage()) ); + connect( uninstallLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallLanguage()) ); + connect( selectLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectLanguage()) ); #endif } @@ -126,8 +126,8 @@ void TDELocaleConfig::slotInstallLanguage() *proc << "tdesu"; *proc << "qt-language-selector --mode install"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); + TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } @@ -138,8 +138,8 @@ void TDELocaleConfig::slotUninstallLanguage() *proc << "tdesu"; *proc << "qt-language-selector --mode uninstall"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); + TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } @@ -150,8 +150,8 @@ void TDELocaleConfig::slotSelectLanguage() *proc << "tdesu"; *proc << "qt-language-selector --mode select"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); + TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } @@ -299,7 +299,7 @@ void TDELocaleConfig::loadLanguageList() menu_index = -2; // first entries should _not_ be sorted continue; } - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup("KCM Locale"); TQString name = entry.readEntry("Name", m_locale->translate("without name")); @@ -346,7 +346,7 @@ void TDELocaleConfig::loadCountryList() if (index != -1) tag.truncate(index); - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup("KCM Locale"); TQString name = entry.readEntry("Name", m_locale->translate("without name")); @@ -367,7 +367,7 @@ void TDELocaleConfig::loadCountryList() for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup("KCM Locale"); TQString name = entry.readEntry("Name", m_locale->translate("without name")); @@ -403,7 +403,7 @@ void TDELocaleConfig::readLocale(const TQString &path, TQString &name, .arg(sub) .arg(path); - KSimpleConfig entry(locate("locale", filepath)); + TDESimpleConfig entry(locate("locale", filepath)); entry.setGroup("KCM Locale"); name = entry.readEntry("Name"); @@ -505,7 +505,7 @@ TQStringList TDELocaleConfig::languageList() const TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())); - KSimpleConfig entry(fileName); + TDESimpleConfig entry(fileName); entry.setGroup("KCM Locale"); return entry.readListEntry("Languages"); |