summaryrefslogtreecommitdiffstats
path: root/tdeui/kswitchlanguagedialog.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:47:22 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdeui/kswitchlanguagedialog.cpp
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kswitchlanguagedialog.cpp')
-rw-r--r--tdeui/kswitchlanguagedialog.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp
index fa43dcaf2..5ce1bc074 100644
--- a/tdeui/kswitchlanguagedialog.cpp
+++ b/tdeui/kswitchlanguagedialog.cpp
@@ -114,7 +114,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog(
if (defaultLanguages.count() == 0)
{
- d->addLanguageButton(KGlobal::locale()->defaultLanguage(), true);
+ d->addLanguageButton(TDEGlobal::locale()->defaultLanguage(), true);
}
TQHBoxLayout *addButtonHorizontalLayout = new TQHBoxLayout();
@@ -185,7 +185,7 @@ void KSwitchLanguageDialog::languageOnButtonChanged(const TQString & languageCod
{
//update all buttons which have matching id
//might update buttons which were not changed, but well...
- languageButton->setText(KGlobal::locale()->twoAlphaToLanguageName(languageCode));
+ languageButton->setText(TDEGlobal::locale()->twoAlphaToLanguageName(languageCode));
}
}
}
@@ -207,7 +207,7 @@ void KSwitchLanguageDialog::slotOk()
first = false;
}
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
if (d->applicationLanguageList().join(":") != languageString)
{
@@ -241,7 +241,7 @@ KSwitchLanguageDialogPrivate::KSwitchLanguageDialogPrivate(
void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *button)
{
- KLocale *locale = KGlobal::locale();
+ KLocale *locale = TDEGlobal::locale();
TQStringList allLanguages = locale->allLanguagesTwoAlpha();
for ( TQStringList::ConstIterator it = allLanguages.begin(); it != allLanguages.end(); ++it )
{
@@ -258,7 +258,7 @@ void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *but
TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
TQStringList languagesList;
if (config->hasGroup("Locale"))
@@ -272,7 +272,7 @@ TQStringList KSwitchLanguageDialogPrivate::applicationLanguageList()
}
if (languagesList.empty())
{
- languagesList = KGlobal::locale()->languageList();
+ languagesList = TDEGlobal::locale()->languageList();
}
return languagesList;
}
@@ -283,7 +283,7 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo
KLanguageButton *languageButton = new KLanguageButton(page);
- languageButton->setText(KGlobal::locale()->twoAlphaToLanguageName(languageCode));
+ languageButton->setText(TDEGlobal::locale()->twoAlphaToLanguageName(languageCode));
fillApplicationLanguages(languageButton);