From 0813b39aed2cf4c84157a22c4c9594336d93d412 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/kdesdk@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../kbabeldict/modules/poauxiliary/poauxiliary.cpp | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp') diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index fae9fb0e..ce4b7800 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -184,7 +184,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi kapp->tqprocessEvents(100); - text.tqreplace("\n",""); + text.replace("\n",""); Entry *entry = msgidDict[text]; if(entry) @@ -358,27 +358,27 @@ void PoAuxiliary::loadAuxiliary() TQString path=url; - if(path.tqcontains("@LANG@")) + if(path.contains("@LANG@")) { - path.tqreplace("@LANG@",langCode); + path.replace("@LANG@",langCode); } - if(path.tqcontains("@PACKAGE@")) + if(path.contains("@PACKAGE@")) { - int pos=package.tqfindRev("/"); + int pos=package.findRev("/"); if( pos<0 ) pos=0; - path.tqreplace("@PACKAGE@",package.mid(pos)); + path.replace("@PACKAGE@",package.mid(pos)); } - if(path.tqcontains("@PACKAGEDIR@")) + if(path.contains("@PACKAGEDIR@")) { TQString packagedir; - int pos=package.tqfindRev("/"); + int pos=package.findRev("/"); if( pos > 0 ) packagedir=package.left(pos); else packagedir=""; - path.tqreplace("@PACKAGEDIR@",packagedir); + path.replace("@PACKAGEDIR@",packagedir); kdDebug(KBABEL_SEARCH) << "Packagedir found " << packagedir << endl; } TQRegExp reg("@DIR[0-9]+@"); - if(path.tqcontains(reg)) + if(path.contains(reg)) { int pos=reg.search(path); int len = reg.matchedLength(); @@ -393,7 +393,7 @@ void PoAuxiliary::loadAuxiliary() { TQString dir=directory(editedFile,number); TQString s("@DIR%1@"); - path.tqreplace(s.tqarg(number),dir); + path.replace(s.tqarg(number),dir); pos+=dir.length(); } @@ -461,7 +461,7 @@ void PoAuxiliary::loadAuxiliary() Entry *e = new Entry; // FIXME: should care about plural forms e->orig = catalog->msgid(i).first(); - e->orig.tqreplace("\n",""); + e->orig.replace("\n",""); kdWarning() << "PoAuxialiary does not support plural forms" << endl; e->translation = catalog->msgstr(i).first(); e->comment = catalog->comment(i); @@ -491,7 +491,7 @@ void PoAuxiliary::loadAuxiliary() void PoAuxiliary::setEditedFile(const TQString& file) { - if(initialized && (url.tqcontains("@DIR") || KURL::isRelativeURL(url)) + if(initialized && (url.contains("@DIR") || KURL::isRelativeURL(url)) && file!=editedFile && !loadTimer->isActive() ) { initialized=false; @@ -503,7 +503,7 @@ void PoAuxiliary::setEditedFile(const TQString& file) void PoAuxiliary::setEditedPackage(const TQString& pack) { - if(initialized && url.tqcontains("@PACKAGE@") && pack!=package + if(initialized && url.contains("@PACKAGE@") && pack!=package && !loadTimer->isActive() ) { initialized=false; @@ -515,7 +515,7 @@ void PoAuxiliary::setEditedPackage(const TQString& pack) void PoAuxiliary::setLanguageCode(const TQString& lang) { - if(initialized && url.tqcontains("@LANG@") && lang!=langCode + if(initialized && url.contains("@LANG@") && lang!=langCode && !loadTimer->isActive() ) { initialized=false; -- cgit v1.2.1