summaryrefslogtreecommitdiffstats
path: root/kcontrol/locale
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/locale')
-rw-r--r--kcontrol/locale/kcmlocale.cpp52
-rw-r--r--kcontrol/locale/kcmlocale.h2
-rw-r--r--kcontrol/locale/localemon.cpp2
-rw-r--r--kcontrol/locale/localenum.cpp8
-rw-r--r--kcontrol/locale/localeother.cpp2
-rw-r--r--kcontrol/locale/localetime.cpp8
-rw-r--r--kcontrol/locale/toplevel.cpp8
7 files changed, 41 insertions, 41 deletions
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index f74fa71bc..40bbf1ab7 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -88,7 +88,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale,
// #### HPB: This should be implemented for KDE 3
// new TQLabel(this, I18N_NOOP("Encoding:"));
//TQComboBox * cb = new TQComboBox( this );
- //cb->insertStringList( KGlobal::charsets()->descriptiveEncodingNames() );
+ //cb->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() );
lay->addMultiCellWidget(m_labCountry, 0, 0, 0, 1);
lay->addWidget(m_comboCountry, 0, 2);
@@ -122,41 +122,41 @@ KLocaleConfig::KLocaleConfig(KLocale *locale,
void KLocaleConfig::slotInstallLanguage()
{
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
*proc << "qt-language-selector --mode install";
- TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
+ TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
setEnabled(false);
proc->start();
}
void KLocaleConfig::slotUninstallLanguage()
{
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
*proc << "qt-language-selector --mode uninstall";
- TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
+ TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
setEnabled(false);
proc->start();
}
void KLocaleConfig::slotSelectLanguage()
{
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
*proc << "tdesu";
*proc << "qt-language-selector --mode select";
- TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(slotLanguageSelectorExited(KProcess *)));
+ TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *)));
setEnabled(false);
proc->start();
}
-void KLocaleConfig::slotLanguageSelectorExited(KProcess *)
+void KLocaleConfig::slotLanguageSelectorExited(TDEProcess *)
{
//reload here
loadLanguageList();
@@ -256,8 +256,8 @@ void KLocaleConfig::slotLanguageDown()
void KLocaleConfig::loadLanguageList()
{
// 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;
// clear the list
m_addLanguage->clear();
@@ -277,7 +277,7 @@ void KLocaleConfig::loadLanguageList()
}
// add all languages to the list
- TQStringList alllang = KGlobal::dirs()->findAllResources("locale",
+ TQStringList alllang = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"),
false, true);
TQStringList langlist = prilang;
@@ -313,21 +313,21 @@ void KLocaleConfig::loadLanguageList()
}
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
}
void KLocaleConfig::loadCountryList()
{
// 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;
TQString sub = TQString::fromLatin1("l10n/");
// clear the list
m_comboCountry->clear();
- TQStringList regionlist = KGlobal::dirs()->findAllResources("locale",
+ TQStringList regionlist = TDEGlobal::dirs()->findAllResources("locale",
sub + TQString::fromLatin1("*.desktop"),
false, true );
@@ -356,12 +356,12 @@ void KLocaleConfig::loadCountryList()
.arg(tag) ) );
TQIconSet icon;
if ( !map.isNull() )
- icon = KGlobal::iconLoader()->loadIconSet(map, KIcon::Small);
+ icon = TDEGlobal::iconLoader()->loadIconSet(map, KIcon::Small);
m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 );
}
// add all languages to the list
- TQStringList countrylist = KGlobal::dirs()->findAllResources
+ TQStringList countrylist = TDEGlobal::dirs()->findAllResources
("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true);
for ( TQStringList::ConstIterator it = countrylist.begin();
@@ -383,20 +383,20 @@ void KLocaleConfig::loadCountryList()
TQString flag( locate( "locale",
TQString::fromLatin1( "l10n/%1/flag.png" )
.arg(tag) ) );
- TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
+ TQIconSet icon( TDEGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
m_comboCountry->insertItem( icon, name, tag, submenu, menu_index );
}
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
}
void KLocaleConfig::readLocale(const TQString &path, TQString &name,
const TQString &sub) const
{
// 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;
// read the name
TQString filepath = TQString::fromLatin1("%1%2/entry.desktop")
@@ -408,12 +408,12 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name,
name = entry.readEntry("Name");
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
}
void KLocaleConfig::save()
{
- KConfigBase *config = KGlobal::config();
+ KConfigBase *config = TDEGlobal::config();
config->setGroup("Locale");
diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h
index 511d9e9fd..3a2992826 100644
--- a/kcontrol/locale/kcmlocale.h
+++ b/kcontrol/locale/kcmlocale.h
@@ -79,7 +79,7 @@ private slots:
void slotInstallLanguage();
void slotUninstallLanguage();
void slotSelectLanguage();
- void slotLanguageSelectorExited(KProcess *);
+ void slotLanguageSelectorExited(TDEProcess *);
private:
TQStringList languageList() const;
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index 1530fda69..dc4cb2c2e 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -127,7 +127,7 @@ KLocaleConfigMoney::~KLocaleConfigMoney()
void KLocaleConfigMoney::save()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
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()
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 1cf6b949b..cf92ea1fb 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -76,7 +76,7 @@ KLocaleConfigOther::~KLocaleConfigOther()
void KLocaleConfigOther::save()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale",
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index 4ed4c263c..df51ae8a4 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -246,10 +246,10 @@ KLocaleConfigTime::~KLocaleConfigTime()
void KLocaleConfigTime::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",
@@ -299,7 +299,7 @@ void KLocaleConfigTime::save()
config->sync();
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
}
void KLocaleConfigTime::showEvent( TQShowEvent *e )
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index f561ecaf6..5df0f5eb7 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -172,8 +172,8 @@ void KLocaleApplication::load( bool useDefaults )
void KLocaleApplication::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;
KMessageBox::information(this, m_locale->translate
("Changed language settings apply only to "
"newly started applications.\nTo change the "
@@ -182,9 +182,9 @@ void KLocaleApplication::save()
m_locale->translate("Applying Language Settings"),
TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms"));
// restore the old global locale
- KGlobal::_locale = lsave;
+ TDEGlobal::_locale = lsave;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver(config, "Locale");
// ##### this doesn't make sense
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-23 12:43:01 +0000