diff options
Diffstat (limited to 'kcontrol/locale/kcmlocale.cpp')
| -rw-r--r-- | kcontrol/locale/kcmlocale.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 5a3dc8b50..58177d810 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -25,7 +25,7 @@ #include <tqhbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistbox.h> #include <tqpushbutton.h> #include <tqtooltip.h> @@ -59,7 +59,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale, this, TQT_SLOT(changedCountry(const TQString &)) ); m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); - m_labLang->tqsetAlignment( AlignTop ); + m_labLang->setAlignment( AlignTop ); m_languages = new TQListBox(this); connect(m_languages, TQT_SIGNAL(selectionChanged()), @@ -174,12 +174,12 @@ void KLocaleConfig::slotAddLanguage(const TQString & code) // If it's already in list, just move it (delete the old, then insert a new) int oldPos = languageList.findIndex( code ); if ( oldPos != -1 ) - languageList.remove( languageList.tqat(oldPos) ); + languageList.remove( languageList.at(oldPos) ); if ( oldPos != -1 && oldPos < pos ) --pos; - TQStringList::Iterator it = languageList.tqat( pos ); + TQStringList::Iterator it = languageList.at( pos ); languageList.insert( it, code ); @@ -195,7 +195,7 @@ void KLocaleConfig::slotRemoveLanguage() TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - TQStringList::Iterator it = languageList.tqat( pos ); + TQStringList::Iterator it = languageList.at( pos ); if ( it != languageList.end() ) { @@ -214,8 +214,8 @@ void KLocaleConfig::slotLanguageUp() TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - TQStringList::Iterator it1 = languageList.tqat( pos - 1 ); - TQStringList::Iterator it2 = languageList.tqat( pos ); + TQStringList::Iterator it1 = languageList.at( pos - 1 ); + TQStringList::Iterator it2 = languageList.at( pos ); if ( it1 != languageList.end() && it2 != languageList.end() ) { @@ -236,8 +236,8 @@ void KLocaleConfig::slotLanguageDown() TQStringList languageList = m_locale->languageList(); int pos = m_languages->currentItem(); - TQStringList::Iterator it1 = languageList.tqat( pos ); - TQStringList::Iterator it2 = languageList.tqat( pos + 1 ); + TQStringList::Iterator it1 = languageList.at( pos ); + TQStringList::Iterator it2 = languageList.at( pos + 1 ); if ( it1 != languageList.end() && it2 != languageList.end() ) { @@ -270,7 +270,7 @@ void KLocaleConfig::loadLanguageList() it != first.end(); ++it ) { - TQString str = locate("locale", TQString::tqfromLatin1("%1/entry.desktop") + TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop") .arg(*it)); if (!str.isNull()) prilang << str; @@ -278,7 +278,7 @@ void KLocaleConfig::loadLanguageList() // add all languages to the list TQStringList alllang = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop"), + TQString::fromLatin1("*/entry.desktop"), false, true); TQStringList langlist = prilang; if (langlist.count() > 0) @@ -293,7 +293,7 @@ void KLocaleConfig::loadLanguageList() if ((*it).isNull()) { m_addLanguage->insertSeparator(); - submenu = TQString::tqfromLatin1("other"); + submenu = TQString::fromLatin1("other"); m_addLanguage->insertSubmenu(m_locale->translate("Other"), submenu, TQString::null, -1); menu_index = -2; // first entries should _not_ be sorted @@ -322,13 +322,13 @@ void KLocaleConfig::loadCountryList() KLocale *lsave = KGlobal::_locale; KGlobal::_locale = m_locale; - TQString sub = TQString::tqfromLatin1("l10n/"); + TQString sub = TQString::fromLatin1("l10n/"); // clear the list m_comboCountry->clear(); TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", - sub + TQString::tqfromLatin1("*.desktop"), + sub + TQString::fromLatin1("*.desktop"), false, true ); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -352,7 +352,7 @@ void KLocaleConfig::loadCountryList() m_locale->translate("without name")); TQString map( locate( "locale", - TQString::tqfromLatin1( "l10n/%1.png" ) + TQString::fromLatin1( "l10n/%1.png" ) .arg(tag) ) ); TQIconSet icon; if ( !map.isNull() ) @@ -362,7 +362,7 @@ void KLocaleConfig::loadCountryList() // add all languages to the list TQStringList countrylist = KGlobal::dirs()->findAllResources - ("locale", sub + TQString::tqfromLatin1("*/entry.desktop"), false, true); + ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) @@ -381,7 +381,7 @@ void KLocaleConfig::loadCountryList() int menu_index = submenu.isEmpty() ? -1 : -2; TQString flag( locate( "locale", - TQString::tqfromLatin1( "l10n/%1/flag.png" ) + TQString::fromLatin1( "l10n/%1/flag.png" ) .arg(tag) ) ); TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); @@ -399,7 +399,7 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name, KGlobal::_locale = m_locale; // read the name - TQString filepath = TQString::tqfromLatin1("%1%2/entry.desktop") + TQString filepath = TQString::fromLatin1("%1%2/entry.desktop") .arg(sub) .arg(path); @@ -419,7 +419,7 @@ void KLocaleConfig::save() config->writeEntry("Country", m_locale->country(), true, true); if ( m_locale->languageList().isEmpty() ) - config->writeEntry("Language", TQString::tqfromLatin1(""), true, true); + config->writeEntry("Language", TQString::fromLatin1(""), true, true); else config->writeEntry("Language", m_locale->languageList(), ':', true, true); @@ -502,7 +502,7 @@ void KLocaleConfig::slotTranslate() TQStringList KLocaleConfig::languageList() const { TQString fileName = locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())); KSimpleConfig entry(fileName); |