diff options
Diffstat (limited to 'kbabel/kbabeldict/modules')
16 files changed, 117 insertions, 117 deletions
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 3292ccc9..fe312253 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -607,7 +607,7 @@ KDBSearchEngine::repeat () if (tot >= min && !inlibs) { id = item.key; - id = id.tqreplace ("\n", "\"\n\""); + id = id.replace ("\n", "\"\n\""); mle->append (txt.arg (tot).arg (ntra).arg (id)); } @@ -667,7 +667,7 @@ KDBSearchEngine::startSearchNow (int searchmode) bool allkey = (searchmode == MD_ALL_GOOD_KEYS); - bool equal, tqcontains, contained, regexp, intra; + bool equal, contains, contained, regexp, intra; intra = searchmode & MD_IN_TRANSLATION; @@ -700,12 +700,12 @@ KDBSearchEngine::startSearchNow (int searchmode) int pos; for (i = 0; i < len; i++) { - while ((pos = idMod->tqfind (remchar.at (i))) != -1) + while ((pos = idMod->find (remchar.at (i))) != -1) idMod->remove (pos, 1); } if (comm) - idMod->tqreplace (TQRegExp ("\\_\\:.*\\\\n"), ""); //Read it from catalog !!! (NOT ONLY HERE) + idMod->replace (TQRegExp ("\\_\\:.*\\\\n"), ""); //Read it from catalog !!! (NOT ONLY HERE) if (norm) @@ -802,12 +802,12 @@ KDBSearchEngine::startSearchNow (int searchmode) //Remove character in list of character to be ignored for (i = 0; i < len; i++) - while ((pos = msgId.tqfind (remchar.at (i))) != -1) + while ((pos = msgId.find (remchar.at (i))) != -1) msgId.remove (pos, 1); //Remove context information from id found if (comm) - msgId.tqreplace (TQRegExp ("\\_\\:.*\\\\n"), ""); + msgId.replace (TQRegExp ("\\_\\:.*\\\\n"), ""); if (norm) @@ -838,14 +838,14 @@ KDBSearchEngine::startSearchNow (int searchmode) //Remove character in list of character to be ignored for (i = 0; i < len; i++) while ((pos = - msgId.tqfind (remchar.at (i))) != + msgId.find (remchar.at (i))) != -1) msgId.remove (pos, 1); //Remove context information from id found if (comm) msgId. - tqreplace (TQRegExp ("\\_\\:.*\\\\n"), + replace (TQRegExp ("\\_\\:.*\\\\n"), ""); @@ -867,12 +867,12 @@ KDBSearchEngine::startSearchNow (int searchmode) equal = false; if (rules & Contains) - tqcontains = idMod->tqcontains (msgId); + contains = idMod->contains (msgId); else - tqcontains = false; + contains = false; if (rules & Contained) - contained = msgId.tqcontains (*idMod); + contained = msgId.contains (*idMod); else contained = false; @@ -887,7 +887,7 @@ KDBSearchEngine::startSearchNow (int searchmode) } while (intra && nn < item.numTra); - if (equal || tqcontains || contained || regexp || allkey) + if (equal || contains || contained || regexp || allkey) { if (equal) @@ -1034,7 +1034,7 @@ KDBSearchEngine::startSingleSearch (TQString searchString, in = reg.search (searchString, in + len); len = reg.matchedLength (); TQString regToAdd = searchString; - regToAdd.tqreplace (in, len, "[a-zA-Z0-9_%" + regaddchar + "]*"); + regToAdd.replace (in, len, "[a-zA-Z0-9_%" + regaddchar + "]*"); regToAdd.append ("$"); regToAdd.prepend ("^"); // fprintf(stderr,"%s",(const char *)regToAdd.local8Bit()); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp index 1d1cb9ae..6fa383df 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp @@ -1446,7 +1446,7 @@ DataBaseManager::putNewTranslation (TQString key, TQString tran, int catalog, isThisOne = (*ittr).translation == msgstr; // is there the catnum we are looking for? - if ((*ittr).infoRef.tqfind (catnum) != (*ittr).infoRef.end ()) + if ((*ittr).infoRef.find (catnum) != (*ittr).infoRef.end ()) { found_catalog_info = true; if (ow && !isThisOne) diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index 3d86ebb1..5a4d5a6e 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -120,7 +120,7 @@ InfoItem cinfo; Catalog * catalog=new Catalog(this,"ScanPoCatalog"); -TQString location=fileName.right(fileName.length()-fileName.tqfindRev("/")-1); +TQString location=fileName.right(fileName.length()-fileName.findRev("/")-1); connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); emit filename(location); emit fileProgress(0); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui index 3e694330..b457bf74 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui @@ -285,7 +285,7 @@ It also substitutes groups of more than one space character with only one space <cstring>containsCB</cstring> </property> <property name="text"> - <string>Query tqcontains</string> + <string>Query contains</string> </property> <property name="whatsThis" stdset="0"> <string>Match if query contains the database string</string> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C b/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C index 74a09037..a83d947b 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C +++ b/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C @@ -116,9 +116,9 @@ nmax++; normalizestr(a); // printf("#%s#\n",a); -// while (st.tqfind("#~")==0) +// while (st.find("#~")==0) // st = st.right(st.length()-2); -// while (st.tqfind(" ")==0) +// while (st.find(" ")==0) // st = st.right(st.length()-1); if(isAMsgId) nextIsFuzzy=false; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp index 36f66fc1..077565d4 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp @@ -250,7 +250,7 @@ void KDBSearchEngine2::stringChanged( TQString orig, TQString translated if(!init()) return; //if(translated.isEmpty()) return; InputInfo ii; - if(description.tqfind("fuzzy",false)==-1) + if(description.find("fuzzy",false)==-1) di->addEntry(orig,translated,&ii); } @@ -499,7 +499,7 @@ void KDBSearchEngine2::scanNowPressed() TQString sourceName; sourceName=pw->dbpw->sourceList->currentText(); if(!init()) return; - if(sources.tqcontains(sourceName)) + if(sources.contains(sourceName)) { TQValueList<KURL> urls=sources[sourceName].urls(); PoScanner ps(di); @@ -538,7 +538,7 @@ void KDBSearchEngine2::editSource() TQString sourceName; sourceName=pw->dbpw->sourceList->currentText(); - if(sources.tqcontains(sourceName)) + if(sources.contains(sourceName)) { bool nameIsNew; TQString newName; @@ -554,7 +554,7 @@ void KDBSearchEngine2::editSource() { return; } - nameIsNew=sources.tqcontains(newName); + nameIsNew=sources.contains(newName); if(newName!=sourceName && !nameIsNew) { @@ -602,13 +602,13 @@ void KDBSearchEngine2::addSource() if(sd.exec()==TQDialog::Accepted) { newName= sd.sourceName->text(); - nameIsNew=!sources.tqcontains(newName); + nameIsNew=!sources.contains(newName); } else { return; } - // nameIsNew=sources.tqcontains(newName); + // nameIsNew=sources.contains(newName); if(!nameIsNew) { KMessageBox::error(0,i18n("The name you chose is already used.\nPlease change the source name."), diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp index ab3d14b1..466b68e5 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp @@ -145,7 +145,7 @@ DataBaseInterface::ResultList ChunkByChunkSearchAlgorithm::exec( const TQString for(ResultList::iterator it1=r.begin();it1!=r.end() &&!di->stopNow(); ++it1) { TQString chunkTranslation= (*it1).result(); - if(!translationUsed.tqcontains(chunkTranslation)) + if(!translationUsed.contains(chunkTranslation)) { translationUsed[chunkTranslation]=true; kdDebug(0) << "a translation is: " << chunkTranslation << endl; @@ -330,7 +330,7 @@ DataBaseInterface::ResultList FuzzyChunkSearchAlgorithm::exec( const TQString & TQString re=di->format(di->simple(*it,true),query); QueryResult r(re,ori,score); for(TQPtrListIterator<AbstractChunk> it(querychunks); it.current() && di->stopNow() ; ++it){ - ori=ori.tqreplace(TQRegExp((*it)->chunkString(),false),"<font color=#000080><u><b>"+(*it)->chunkString()+"</b></u></font>"); + ori=ori.replace(TQRegExp((*it)->chunkString(),false),"<font color=#000080><u><b>"+(*it)->chunkString()+"</b></u></font>"); } r.setRichOriginal(ori); if(!di->stopNow()) diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp index e5250274..1fe02198 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp @@ -282,7 +282,7 @@ bool DataBaseInterface::addEntry(TQString original,TQString translated,InputInfo TQStringList wt=words(*otIt); for(TQStringList::iterator it = wt.begin(); it!=wt.end(); ++it) { - if(correlationDiff.tqcontains(*it)) + if(correlationDiff.contains(*it)) correlationDiff[*it]--; else correlationDiff[*it]=-1; @@ -299,7 +299,7 @@ bool DataBaseInterface::addEntry(TQString original,TQString translated,InputInfo TQStringList wt=words(*otIt); for(TQStringList::iterator it = wt.begin(); it!=wt.end(); ++it) { - if(correlationDiff.tqcontains(*it)) + if(correlationDiff.contains(*it)) correlationDiff[*it]++; else correlationDiff[*it]=1; @@ -408,7 +408,7 @@ TQMap<TQString,float> DataBaseInterface::correlation(TQString word,SearchFilter MainEntry e=get(k->getString(),filter); TQStringList trad=e.second.getTranslations(); - nocck=words(k->getString()).tqcontains(sword); + nocck=words(k->getString()).contains(sword); for( TQStringList::iterator it2=trad.begin();it2!=trad.end();++it2) { @@ -465,7 +465,7 @@ TQStringList DataBaseInterface::words(TQString s) int pos; do { - pos=str.tqfind(TQRegExp("\\s")); + pos=str.find(TQRegExp("\\s")); // if(!simple(str.left(pos)).isEmpty()) // list.append(simple(str.left(pos))); if(!str.left(pos).isEmpty()) @@ -484,13 +484,13 @@ TQString DataBaseInterface::simple(TQString str,bool ck) else res=str.lower(); //lowercase //FIXME: uncoment the foll. line (check speed) - res=res.tqreplace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); //remove enclosing tags + res=res.replace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); //remove enclosing tags //Try to get rid of regexps. - // res=res.tqreplace(TQRegExp("(('|-|_|\\s|[^\\w%])+)")," "); //strip non-word char - // res=res.tqreplace(TQRegExp("(('|-|_)+)")," "); //strip non-word char - // res=res.tqreplace(TQRegExp("[^\\w\\s%]"),""); //strip non-word char + // res=res.replace(TQRegExp("(('|-|_|\\s|[^\\w%])+)")," "); //strip non-word char + // res=res.replace(TQRegExp("(('|-|_)+)")," "); //strip non-word char + // res=res.replace(TQRegExp("[^\\w\\s%]"),""); //strip non-word char TQString r; TQChar c; @@ -607,16 +607,16 @@ TQString DataBaseInterface::format(TQString _s,TQString t) //FIXME use regexp TQString s=_s; - TQString noTagT=t.tqreplace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); - TQChar first=noTagT[noTagT.tqfind(TQRegExp("\\w"))]; + TQString noTagT=t.replace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); + TQChar first=noTagT[noTagT.find(TQRegExp("\\w"))]; bool firstCapital=isUpper(first); /* -bool dotsAtEnd=(t.tqfind("...")+3==t.length()); -bool gtgtAtEnd=(t.tqfind(">>")+2==t.length()); -bool ltltAtEnd=(t.tqfind("<<")==t.length()-2); +bool dotsAtEnd=(t.find("...")+3==t.length()); +bool gtgtAtEnd=(t.find(">>")+2==t.length()); +bool ltltAtEnd=(t.find("<<")==t.length()-2); -bool columnAtEnd=(t.tqfind(":")+1==t.length()); +bool columnAtEnd=(t.find(":")+1==t.length()); */ bool allupper=(t.upper()==t); @@ -643,13 +643,13 @@ if(columnAtEnd) if(allupper) s=s.upper(); - int pos=t.tqfind(TQRegExp("&")); + int pos=t.find(TQRegExp("&")); if(pos>=0) { - TQChar accel=t[t.tqfind(TQRegExp("&"))+1]; + TQChar accel=t[t.find(TQRegExp("&"))+1]; if(accel!='&') { - pos=s.tqfind(accel,false); + pos=s.find(accel,false); if(pos<0) pos=0; s.insert(pos,"&"); @@ -685,8 +685,8 @@ TQString DataBaseInterface::formatRegExp(TQString _s, TQString t, TQString tre,T //kdDebug(0) << "phRegExp: " << phRegExp << endl; //kdDebug(0) << "cap[" << i << "]: "<< *capit<< endl; - stringReplace = stringReplace.tqreplace(TQRegExp(phRegExp),*capit); - stringSearch = stringSearch.tqreplace(TQRegExp(phRegExp),*capit); + stringReplace = stringReplace.replace(TQRegExp(phRegExp),*capit); + stringSearch = stringSearch.replace(TQRegExp(phRegExp),*capit); i++; } @@ -694,7 +694,7 @@ TQString DataBaseInterface::formatRegExp(TQString _s, TQString t, TQString tre,T // kdDebug(0) << "stringReplace " << stringReplace << endl; TQRegExp stringSearchRegExp = TQRegExp(stringSearch); // kdDebug(0) << "before: "<<s<<endl; - s = s.tqreplace(stringSearchRegExp,stringReplace); + s = s.replace(stringSearchRegExp,stringReplace); // kdDebug(0) << "after: "<<s<<endl; } diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp index 0958b801..2b4d7360 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp @@ -77,7 +77,7 @@ void DBItemMainData::write(TQDataStream *s) void DBItemMainData::addTranslation(TQString str, unsigned int ref) { //get(); - if(translations[str].tqfind(ref)==translations[str].end()) // If it do not exists + if(translations[str].find(ref)==translations[str].end()) // If it do not exists translations[str].append(ref); //add a new reference. else { @@ -106,7 +106,7 @@ TQMapIterator<TQString,TQValueList<unsigned int> > it2; { //Dirty hack it2=it; it++; - if(it2.data().tqfind(ref)!=it2.data().end()) + if(it2.data().find(ref)!=it2.data().end()) removeTranslation(it2.key(),ref); } @@ -142,7 +142,7 @@ list.clear(); void DBItemMultiIndex::addEntry(unsigned int index) { // get(); - if(list.tqfind(index)==list.end()) + if(list.find(index)==list.end()) { list.append(index); qHeapSort(list); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index b7e64c2b..96239ba9 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -203,7 +203,7 @@ emit fileStarted(); Catalog * catalog=new Catalog(this,"ScanPoCatalog"); TQString pretty=u.prettyURL(); -TQString location=pretty.right(pretty.length()-pretty.tqfindRev("/")-1); +TQString location=pretty.right(pretty.length()-pretty.findRev("/")-1); connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); emit filename(location); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui index fe3b1f6f..64a74b8a 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui @@ -288,7 +288,7 @@ It also substitutes groups of more than one space character with only one space <cstring>containsCB</cstring> </property> <property name="text"> - <string>Query tqcontains</string> + <string>Query contains</string> </property> <property name="whatsThis" stdset="0"> <string>Match if query contains the database string</string> 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; diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index edc38dc0..71d79641 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp @@ -221,7 +221,7 @@ const TQValueList<int>* CompendiumData::textonlyDict(const TQString text) const void CompendiumData::registerObject(TQObject *obj) { - if(!_registered.tqcontainsRef(obj)) + if(!_registered.containsRef(obj)) _registered.append(obj); } diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index bc79f082..6e664316 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -232,7 +232,7 @@ bool PoCompendium::searchCaseInsensitive(const TQString& text, uint pluralForm, TQValueList<int>::ConstIterator it; for( it = indexList->begin(); it != indexList->end(); ++it ) { - if(foundIndices.tqcontains(*it)) + if(foundIndices.contains(*it)) { continue; } @@ -288,7 +288,7 @@ bool PoCompendium::searchTextOnly(const TQString& text, uint pluralForm, TQPtrLi TQValueList<int>::ConstIterator it; for( it = indexList->begin(); it != indexList->end(); ++it ) { - if(foundIndices.tqcontains(*it)) + if(foundIndices.contains(*it)) { continue; } @@ -346,12 +346,12 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(stop) break; - if(foundIndices.tqcontains(*it)) + if(foundIndices.contains(*it)) { continue; } - if(checkedIndices.tqcontains(*it)) + if(checkedIndices.contains(*it)) { continue; } @@ -397,7 +397,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr s=" "+*wit+" "; o=" "+origStr+" "; } - if(o.tqcontains(s)) + if(o.contains(s)) { found=true; } @@ -519,7 +519,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr emit progress( 50+(50*(checkCounter+1))/catalogInfo.total); } - if(checkedIndices.tqcontains(i)) + if(checkedIndices.contains(i)) { continue; } @@ -532,7 +532,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr continue; } - if(foundIndices.tqcontains(i)) + if(foundIndices.contains(i)) { continue; } @@ -689,7 +689,7 @@ bool PoCompendium::startSearch(const TQString& text, uint pluralForm, const Sear // search without whitespace searchTextOnly(searchStr, pluralForm, results, foundIndices, checkedIndices); - // now, search based on words (tqcontains, is contained, etc) + // now, search based on words (contains, is contained, etc) searchWords(searchStr, pluralForm, results, foundIndices, checkedIndices); @@ -797,9 +797,9 @@ void PoCompendium::slotLoadCompendium() TQString path=url; - if(path.tqcontains("@LANG@")) + if(path.contains("@LANG@")) { - path.tqreplace("@LANG@",langCode); + path.replace("@LANG@",langCode); } KURL u=KCmdLineArgs::makeURL(path.local8Bit()); realURL = u.url(); @@ -866,19 +866,19 @@ void PoCompendium::recheckData() TQString PoCompendium::maskString(TQString s) { - s.tqreplace("\\","\\\\"); - s.tqreplace("\?","\\?"); - s.tqreplace("[","\\["); - s.tqreplace(".","\\."); - s.tqreplace("*","\\*"); - s.tqreplace("+","\\+"); - s.tqreplace("^","\\^"); - s.tqreplace("$","\\$"); - s.tqreplace("(","\\("); - s.tqreplace(")","\\)"); - s.tqreplace("{","\\{"); - s.tqreplace("}","\\}"); - s.tqreplace("|","\\|"); + s.replace("\\","\\\\"); + s.replace("\?","\\?"); + s.replace("[","\\["); + s.replace(".","\\."); + s.replace("*","\\*"); + s.replace("+","\\+"); + s.replace("^","\\^"); + s.replace("$","\\$"); + s.replace("(","\\("); + s.replace(")","\\)"); + s.replace("{","\\{"); + s.replace("}","\\}"); + s.replace("|","\\|"); return s; } @@ -917,7 +917,7 @@ void PoCompendium::addResult(SearchResult *result, TQPtrList<SearchResult>& res) void PoCompendium::setLanguageCode(const TQString& lang) { - if(initialized && url.tqcontains("@LANG@") && lang!=langCode + if(initialized && url.contains("@LANG@") && lang!=langCode && !loadTimer->isActive() ) { initialized=false; @@ -1120,7 +1120,7 @@ TQString PoCompendium::searchTranslation(const TQString& text, int &sc, const ui return res.first()->translation; } - // now, search based on words (tqcontains, is contained, etc) + // now, search based on words (contains, is contained, etc) searchWords(searchStr, pluralForm, res, foundIndices, checkedIndices); if( matchNGram || @@ -1181,7 +1181,7 @@ void PoCompendium::unregisterData() void PoCompendium::registerData() { - data = compendiumDict()->tqfind(realURL); + data = compendiumDict()->find(realURL); if(!data) { data = new CompendiumData; diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 123935e7..42dfbdee 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -267,7 +267,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TQValueList<int>::ConstIterator it; for( it = indexList->begin(); it != indexList->end(); ++it ) { - if(foundIndices.tqcontains(*it)) + if(foundIndices.contains(*it)) { continue; } @@ -319,12 +319,12 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(stop) break; - if(foundIndices.tqcontains(*it)) + if(foundIndices.contains(*it)) { continue; } - if(checkedIndices.tqcontains(*it)) + if(checkedIndices.contains(*it)) { continue; } @@ -365,7 +365,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea s=" "+*wit+" "; o=" "+origStr+" "; } - if(o.tqcontains(s)) + if(o.contains(s)) { found=true; } @@ -471,7 +471,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea i++; - if(checkedIndices.tqcontains(i)) + if(checkedIndices.contains(i)) { continue; } @@ -479,7 +479,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea checkedIndices.append(i); checkCounter++; - if(foundIndices.tqcontains(i)) + if(foundIndices.contains(i)) { continue; } @@ -687,9 +687,9 @@ void TmxCompendium::slotLoadCompendium() TQString path=url; - if(path.tqcontains("@LANG@")) + if(path.contains("@LANG@")) { - path.tqreplace("@LANG@",langCode); + path.replace("@LANG@",langCode); } KURL u=KCmdLineArgs::makeURL(path.local8Bit()); realURL = u.url(); @@ -748,19 +748,19 @@ void TmxCompendium::recheckData() TQString TmxCompendium::maskString(TQString s) const { - s.tqreplace('\\',"\\\\"); - s.tqreplace('?',"\\?"); - s.tqreplace('[',"\\["); - s.tqreplace('.',"\\."); - s.tqreplace('*',"\\*"); - s.tqreplace('+',"\\+"); - s.tqreplace('^',"\\^"); - s.tqreplace('$',"\\$"); - s.tqreplace('(',"\\("); - s.tqreplace(')',"\\)"); - s.tqreplace('{',"\\{"); - s.tqreplace('}',"\\}"); - s.tqreplace('|',"\\|"); + s.replace('\\',"\\\\"); + s.replace('?',"\\?"); + s.replace('[',"\\["); + s.replace('.',"\\."); + s.replace('*',"\\*"); + s.replace('+',"\\+"); + s.replace('^',"\\^"); + s.replace('$',"\\$"); + s.replace('(',"\\("); + s.replace(')',"\\)"); + s.replace('{',"\\{"); + s.replace('}',"\\}"); + s.replace('|',"\\|"); return s; } @@ -797,7 +797,7 @@ void TmxCompendium::addResult(SearchResult *result) void TmxCompendium::setLanguageCode(const TQString& lang) { - if(initialized && url.tqcontains("@LANG@") && lang!=langCode + if(initialized && url.contains("@LANG@") && lang!=langCode && !loadTimer->isActive() ) { initialized=false; @@ -943,7 +943,7 @@ void TmxCompendium::unregisterData() void TmxCompendium::registerData() { - data = compendiumDict()->tqfind(realURL); + data = compendiumDict()->find(realURL); if(!data) { data = new TmxCompendiumData; diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index 1cd033bc..d4497e29 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp @@ -268,7 +268,7 @@ const TQString TmxCompendiumData::msgstr(const int index) const void TmxCompendiumData::registerObject(TQObject *obj) { - if(!_registered.tqcontainsRef(obj)) + if(!_registered.containsRef(obj)) _registered.append(obj); } |