diff options
Diffstat (limited to 'kpersonalizer/kfindlanguage.cpp')
| -rw-r--r-- | kpersonalizer/kfindlanguage.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp index 61e2b1935..4e3537206 100644 --- a/kpersonalizer/kfindlanguage.cpp +++ b/kpersonalizer/kfindlanguage.cpp @@ -34,19 +34,19 @@ KFindLanguage::KFindLanguage() { m_oldlang = config->readEntry("Language"); m_oldlang = m_oldlang.lower(); - m_oldlang = m_oldlang.left(m_oldlang.tqfind(':')); // only use the first lang + m_oldlang = m_oldlang.left(m_oldlang.find(':')); // only use the first lang m_country = config->readEntry("Country", "C"); if (m_country == "C") { m_country = TQString::tqfromLatin1(getenv("LANG")); if(m_country.left(5) == "nn_NO") // glibc's nn_NO is KDE's no_NY m_country = "no"; - if(m_country.tqcontains("_")) - m_country = m_country.mid(m_country.tqfind("_")+1); - if(m_country.tqcontains(".")) - m_country = m_country.left(m_country.tqfind(".")); - if(m_country.tqcontains("@")) - m_country = m_country.left(m_country.tqfind("@")); + if(m_country.contains("_")) + m_country = m_country.mid(m_country.find("_")+1); + if(m_country.contains(".")) + m_country = m_country.left(m_country.find(".")); + if(m_country.contains("@")) + m_country = m_country.left(m_country.find("@")); if(m_country != "C") m_country = m_country.lower(); if(m_country == "en") // special-case "en" - should be "en_GB" or "en_US", but plain "en" is in use quite often @@ -82,9 +82,9 @@ KFindLanguage::KFindLanguage() { TQString name = entry.readEntry("Name", i18n("without name")); TQString tag = *it; - int index = tag.tqfindRev('/'); + int index = tag.findRev('/'); tag = tag.left(index); - index = tag.tqfindRev('/'); + index = tag.findRev('/'); tag = tag.mid(index+1); m_langlist << tag; @@ -109,10 +109,10 @@ KFindLanguage::KFindLanguage() { TQStringList::ConstIterator it; for( it = m_langlist.begin(); it != m_langlist.end(); ++it) { int match=0; - TQString l = (*it).left((*it).tqfind(";")); + TQString l = (*it).left((*it).find(";")); if (l == "C") match++; - if(l.tqcontains(compare)) + if(l.contains(compare)) match+=2; if(l.left(compare.length()) == compare) match+=10; |