From 9a3f0aacd44fb866833ebcb852df3cd31475cb33 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kpersonalizer/kcountrypage.cpp | 8 ++++---- kpersonalizer/kfindlanguage.cpp | 22 +++++++++++----------- kpersonalizer/ksysinfo.cpp | 30 +++++++++++++++--------------- 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'kpersonalizer') diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index d7e286c15..bce43a152 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -92,11 +92,11 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { TQString tag = *it; int index; - index = tag.tqfindRev('/'); + index = tag.findRev('/'); if (index != -1) tag = tag.mid(index + 1); - index = tag.tqfindRev('.'); + index = tag.findRev('.'); if (index != -1) tag.truncate(index); @@ -118,9 +118,9 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { TQString submenu = '-' + entry.readEntry("Region"); TQString tag = *it; - int index = tag.tqfindRev('/'); + int index = tag.findRev('/'); tag.truncate(index); - index = tag.tqfindRev('/'); + index = tag.findRev('/'); tag = tag.mid(index+1); TQPixmap flag( locate( "locale", TQString::tqfromLatin1("l10n/%1/flag.png").arg(tag) ) ); 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; diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp index 15b30fbf9..e5f143229 100644 --- a/kpersonalizer/ksysinfo.cpp +++ b/kpersonalizer/ksysinfo.cpp @@ -57,9 +57,9 @@ void KSysInfo::initXInfo() { // vendor m_xvendor = !dpy ? TQString::null : (TQString)ServerVendor(dpy); // XFree-Inc? - m_xfree_inc = m_xvendor.tqcontains("XFree86"); + m_xfree_inc = m_xvendor.contains("XFree86"); // X.org ? - m_xorg = m_xvendor.tqcontains("X.Org"); + m_xorg = m_xvendor.contains("X.Org"); // release-number m_xrelease = !dpy ? 0 : VendorRelease(dpy); // RENDER-support @@ -106,22 +106,22 @@ void KSysInfo::initFontFamilies() { for (uint i=0; i < families.count(); i++) { TQString font = *families.tqat(i); //add further NORMAL fonts here - if ( (font.tqcontains("Arial [") || font=="Arial") && normal_priority < 15 ) { + if ( (font.contains("Arial [") || font=="Arial") && normal_priority < 15 ) { m_normal_font = font; normal_priority = 15; - } else if ( font.tqcontains("Vera Sans") && normal_priority < 12 ) { + } else if ( font.contains("Vera Sans") && normal_priority < 12 ) { m_normal_font = font; normal_priority = 12; - } else if ( (font.tqcontains("Luxi Sans") || font.tqcontains("Lucidux Sans")) && normal_priority < 10 ) { + } else if ( (font.contains("Luxi Sans") || font.contains("Lucidux Sans")) && normal_priority < 10 ) { m_normal_font = font; normal_priority = 10; - } else if ( font.tqcontains("Helmet") && normal_priority < 7 ) { + } else if ( font.contains("Helmet") && normal_priority < 7 ) { m_normal_font = font; normal_priority = 7; - } else if ( font.tqcontains("Nimbus Sans") && normal_priority < 5 ) { + } else if ( font.contains("Nimbus Sans") && normal_priority < 5 ) { m_normal_font = font; normal_priority = 5; - } else if ( font.tqcontains("Sans") & m_fdb->isSmoothlyScalable(font) && normal_priority < 3 ) { + } else if ( font.contains("Sans") & m_fdb->isSmoothlyScalable(font) && normal_priority < 3 ) { m_normal_font = font; normal_priority = 3; } else if ( m_fdb->isSmoothlyScalable(font) && !(m_fdb->isFixedPitch(font,"Normal") && m_fdb->isFixedPitch(font,"Bold")) && normal_priority < 2) { @@ -132,16 +132,16 @@ void KSysInfo::initFontFamilies() { normal_priority = 1; } //add further FIXED fonts here - if (font.tqcontains("Courier New") && fixed_priority < 15){ + if (font.contains("Courier New") && fixed_priority < 15){ m_fixed_font = font; fixed_priority = 15; - } else if ( (font.tqcontains("Luxi Mono") || font.tqcontains("Lucidux Mono")) && fixed_priority < 10 ) { + } else if ( (font.contains("Luxi Mono") || font.contains("Lucidux Mono")) && fixed_priority < 10 ) { m_fixed_font = font; fixed_priority = 10; - } else if (font.tqcontains("Andale Mono") && fixed_priority < 5) { + } else if (font.contains("Andale Mono") && fixed_priority < 5) { m_fixed_font = font; fixed_priority = 5; - } else if ( font.tqcontains("Mono") && m_fdb->isSmoothlyScalable(font) && fixed_priority < 3 ) { + } else if ( font.contains("Mono") && m_fdb->isSmoothlyScalable(font) && fixed_priority < 3 ) { m_fixed_font = font; fixed_priority = 3; } else if ( m_fdb->isSmoothlyScalable(font) && m_fdb->isFixedPitch(font,"Normal") && fixed_priority < 2 ) { @@ -201,11 +201,11 @@ TQFont KSysInfo::getFixedWidthFont(){ // File Parser while (file->readLine(buf, sizeof(buf) - 1) > 0) { TQString s1 = TQString::fromLocal8Bit(buf); - TQString s2 = s1.mid(s1.tqfind(":") + 1); - s1.truncate(s1.tqfind(":")); + TQString s2 = s1.mid(s1.find(":") + 1); + s1.truncate(s1.find(":")); s1=s1.stripWhiteSpace(); s2=s2.stripWhiteSpace(); - if(s1.tqcontains("MHz")){ + if(s1.contains("MHz")){ float fspeed = s2.toFloat(0); fspeed = floor(fspeed); m_cpu_speed = (int)fspeed; -- cgit v1.2.3