rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 58 insertions, 58 deletions

diff --git a/tools/kfile-plugins/abiword/kfile_abiword.cpp b/tools/kfile-plugins/abiword/kfile_abiword.cpp
index f643a649..ca130b15 100644
--- a/tools/kfile-plugins/abiword/kfile_abiword.cpp
+++ b/tools/kfile-plugins/abiword/kfile_abiword.cpp
@@ -66,7 +66,7 @@ bool AbiwordPlugin::readInfo( KFileMetaInfo& info, uint what)
 
     //Find the last extension
     TQString strExt;
-    const int result=info.path().tqfindRev('.');
+    const int result=info.path().findRev('.');
     if (result>=0)
     {
         strExt=info.path().mid(result);
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp
index 8d72d076..8b873ac1 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.cpp
+++ b/tools/kfile-plugins/ooo/kfile_ooo.cpp
@@ -391,7 +391,7 @@ bool KOfficePlugin::writeTextNode(TQDomDocument & doc,
   if (nodeA.firstChild().isNull())
     nodeA.appendChild(txtNode);
   else
-    nodeA.tqreplaceChild( txtNode, nodeA.firstChild());
+    nodeA.replaceChild( txtNode, nodeA.firstChild());
   return true;
 }
 
@@ -436,7 +436,7 @@ bool KOfficePlugin::writeInfo( const KFileMetaInfo& info) const
       if (s != el.text()){
 	TQDomText txt = doc.createTextNode(s);
 	if (!el.firstChild().isNull())
-	  el.tqreplaceChild(txt, el.firstChild());
+	  el.replaceChild(txt, el.firstChild());
 	else
 	  el.appendChild(txt);
       }
diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc
index e7edffa7..53ef6080 100644
--- a/tools/thesaurus/main.cc
+++ b/tools/thesaurus/main.cc
@@ -185,10 +185,10 @@ Thesaurus::Thesaurus(TQObject* tqparent, const char* name, const TQStringList &)
     connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotGotoHistory(int)));
 
     TQHBoxLayout *row2 = new TQHBoxLayout( m_top_layout );
-    m_tqreplace = new KLineEdit(m_page);
-    m_replace_label = new TQLabel(m_tqreplace, i18n("&Replace with:"), m_page);
+    m_replace = new KLineEdit(m_page);
+    m_replace_label = new TQLabel(m_replace, i18n("&Replace with:"), m_page);
     row2->addWidget(m_replace_label, 0);
-    row2->addWidget(m_tqreplace, 1);
+    row2->addWidget(m_replace, 1);
 
     // Set focus
     m_edit->setFocus();
@@ -255,7 +255,7 @@ bool Thesaurus::run(const TQString& command, void* data, const TQString& datatyp
         m_replacement = false;
         m_dialog->showButtonOK(false);
         m_dialog->setButtonCancelText(i18n("&Close"));
-        m_tqreplace->setEnabled(false);
+        m_replace->setEnabled(false);
         m_replace_label->setEnabled(false);
     } else {
         kdDebug(31000) << "Thesaurus does only accept the command 'thesaurus' or 'thesaurus_standalone'" << endl;
@@ -281,7 +281,7 @@ bool Thesaurus::run(const TQString& command, void* data, const TQString& datatyp
     }
 
     if( m_dialog->exec() == TQDialog::Accepted ) {    // "Replace"
-        *((TQString*)data) = m_tqreplace->text();
+        *((TQString*)data) = m_replace->text();
     }
 
     return TRUE;
@@ -350,13 +350,13 @@ void Thesaurus::slotSetReplaceTerm(TQListBoxItem *item)
 {
     if( ! item )
         return;
-    m_tqreplace->setText(item->text());
+    m_replace->setText(item->text());
 }
 
 void Thesaurus::slotSetReplaceTerm(const TQString &term)
 {
     if( m_replacement && term != m_no_match ) {
-        m_tqreplace->setText(term);
+        m_replace->setText(term);
     }
 }
 
@@ -446,7 +446,7 @@ void Thesaurus::thesExited(KProcess *)
         if( line.startsWith("  ") ) {  // ignore license (two spaces)
             continue;
         }
-        int sep_pos = line.tqfind("#");
+        int sep_pos = line.find("#");
         TQString syn_part = line.left(sep_pos);
         TQString hyper_part = line.right(line.length()-sep_pos-1);
         TQStringList syn_tmp = TQStringList::split(TQChar(';'), syn_part);
@@ -456,13 +456,13 @@ void Thesaurus::thesExited(KProcess *)
             for ( TQStringList::Iterator it2 = syn_tmp.begin(); it2 != syn_tmp.end(); ++it2 ) {
                 // add if it's not the term itself and if it's not yet in the list
                 TQString term = (*it2);
-                if( term.lower() != search_term.lower() && syn.tqcontains(term) == 0 ) {
+                if( term.lower() != search_term.lower() && syn.contains(term) == 0 ) {
                     syn.append(term);
                 }
             }
             for ( TQStringList::Iterator it2 = hyper_tmp.begin(); it2 != hyper_tmp.end(); ++it2 ) {
                 TQString term = (*it2);
-                if( term.lower() != search_term.lower() && hyper.tqcontains(term) == 0 ) {
+                if( term.lower() != search_term.lower() && hyper.contains(term) == 0 ) {
                     hyper.append(term);
                 }
             }
@@ -471,7 +471,7 @@ void Thesaurus::thesExited(KProcess *)
             // match on the right side of the '#' -- hypernyms
             for ( TQStringList::Iterator it2 = syn_tmp.begin(); it2 != syn_tmp.end(); ++it2 ) {
                 TQString term = (*it2);
-                if( term.lower() != search_term && hypo.tqcontains(term) == 0 ) {
+                if( term.lower() != search_term && hypo.contains(term) == 0 ) {
                     hypo.append(term);
                 }
             }
@@ -671,9 +671,9 @@ void Thesaurus::wnExited(KProcess *)
                 continue;
             }
             // Escape XML:
-            l = l.tqreplace('&', "&amp;");
-            l = l.tqreplace('<', "&lt;");
-            l = l.tqreplace('>', "&gt;");
+            l = l.replace('&', "&amp;");
+            l = l.replace('<', "&lt;");
+            l = l.replace('>', "&gt;");
             // TODO?: 
             // move "=>" in own column?
             l = formatLine(l);
@@ -768,7 +768,7 @@ TQString Thesaurus::formatLine(TQString l)
     re.setPattern("(.*)(=&gt;|HAS \\w+:|PART OF:)(.*) --");
     re.setMinimal(true);    // non-greedy
     if( re.search(l) != -1 ) {
-        int dash_pos = l.tqfind("--");
+        int dash_pos = l.find("--");
         TQString line_end = l.mid(dash_pos+2, l.length()-dash_pos);
         l = re.cap(1);
         l += re.cap(2) + " ";
diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h
index 9225bb55..6a6460c3 100644
--- a/tools/thesaurus/main.h
+++ b/tools/thesaurus/main.h
@@ -144,7 +144,7 @@ protected:
     TQLabel *m_edit_label;
 
     TQLabel *m_replace_label;
-    KLineEdit *m_tqreplace;
+    KLineEdit *m_replace;
 
     TQString m_data_file;
 
diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt
index 8b182981..e7b38dd7 100644
--- a/tools/thesaurus/thesaurus.txt
+++ b/tools/thesaurus/thesaurus.txt
@@ -4091,8 +4091,8 @@
 ;encounter;coming upon;#;joining;connection;connexion;
 ;junction;adjunction;#;joining;connection;connexion;
 ;lick;lap;#;touch;touching;
-;discovery;tqfind;uncovering;#;deed;feat;effort;exploit;
-;determination;finding;#;discovery;tqfind;uncovering;
+;discovery;find;uncovering;#;deed;feat;effort;exploit;
+;determination;finding;#;discovery;find;uncovering;
 ;designation;identification;#;determination;finding;
 ;diagnosis;diagnosing;#;designation;identification;
 ;prognosis;prospect;medical prognosis;#;medical diagnosis;
@@ -6109,7 +6109,7 @@
 ;filter;#;electrical device;
 ;finger;#;covering;
 ;fipple flute;fipple pipe;recorder;vertical flute;#;woodwind;woodwind instrument;wood;
-;fire;#;fitqreplace;hearth;open fitqreplace;
+;fire;#;fireplace;hearth;open fireplace;
 ;firearm;piece;small-arm;#;gun;
 ;first gear;first;low gear;low;#;gear;gear mechanism;
 ;fishing gear;tackle;fishing tackle;#;gear;paraphernalia;appurtenances;
@@ -8257,7 +8257,7 @@
 ;realization;realisation;recognition;#;understanding;apprehension;discernment;savvy;
 ;light;#;insight;brainstorm;brainwave;
 ;revelation;#;insight;brainstorm;brainwave;
-;discovery;breakthrough;tqfind;#;insight;brainstorm;brainwave;
+;discovery;breakthrough;find;#;insight;brainstorm;brainwave;
 ;flash;#;insight;brainstorm;brainwave;
 ;linguistic process;language;#;higher cognitive process;
 ;reading;#;linguistic process;language;
@@ -15155,10 +15155,10 @@
 ;advance;gain;#;wax;mount;climb;rise;
 ;raise;#;increase;
 ;accumulate;cumulate;conglomerate;pile up;gather;amass;#;increase;
-;change;exchange;commute;convert;#;tqreplace;
+;change;exchange;commute;convert;#;replace;
 ;commute;convert;exchange;#;change;alter;
-;tqreplace;#;regenerate;renew;
-;change;#;tqreplace;
+;replace;#;regenerate;renew;
+;change;#;replace;
 ;proof;#;strengthen;
 ;shake;#;weaken;
 ;reform;straighten out;see the light;#;better;improve;ameliorate;meliorate;
@@ -15320,7 +15320,7 @@
 ;age;#;change;alter;
 ;mature;maturate;grow;#;develop;
 ;grow;#;change;
-;find oneself;tqfind;#;mature;maturate;grow;
+;find oneself;find;#;mature;maturate;grow;
 ;evolve;#;develop;
 ;evolve;work out;work up;#;develop;make grow;
 ;elaborate;work out;#;develop;make grow;
@@ -15797,8 +15797,8 @@
 ;blue;#;discolor;discolour;colour;color;
 ;translate;#;move;displace;
 ;inform;#;change;alter;
-;receive;get;tqfind;obtain;incur;#;change;
-;take;#;receive;get;tqfind;obtain;incur;
+;receive;get;find;obtain;incur;#;change;
+;take;#;receive;get;find;obtain;incur;
 ;assume;acquire;adopt;take on;take;#;change;
 ;parallel;collimate;#;change;alter;
 ;camp;#;change;alter;
@@ -15844,7 +15844,7 @@
 ;come back;return;be restored;#;reappear;re-emerge;
 ;drop;#;change;
 ;mangle;mutilate;murder;#;disfigure;distort;
-;shift;#;substitute;tqreplace;
+;shift;#;substitute;replace;
 ;run;#;become;go;get;
 ;clear;#;change;alter;
 ;save;make unnecessary;#;prevent;forestall;foreclose;preclude;forbid;
@@ -16201,7 +16201,7 @@
 ;identify;#;associate;tie in;relate;link;link up;connect;
 ;debate;#;deliberate;cogitate;
 ;conclude;#;end;terminate;cease;
-;tqfind;feel;#;conclude;
+;find;feel;#;conclude;
 ;pin down;peg down;nail down;narrow down;narrow;specify;#;determine;
 ;rule;decree;#;decide;make up one's mind;determine;
 ;overrule;overturn;override;overthrow;reverse;#;rule;decree;
@@ -16222,7 +16222,7 @@
 ;divine;#;think;opine;suppose;imagine;reckon;guess;
 ;tell;#;guess;infer;
 ;believe;trust;#;expect;anticipate;
-;discover;tqfind;#;learn;hear;get word;get wind;pick up;find out;get a line;discover;see;
+;discover;find;#;learn;hear;get word;get wind;pick up;find out;get a line;discover;see;
 ;price;#;ascertain;
 ;concentrate;focus;center;centre;pore;rivet;#;think;cogitate;cerebrate;
 ;recall;#;concentrate;focus;center;centre;pore;rivet;
@@ -16235,7 +16235,7 @@
 ;mind;worry;#;think about;
 ;beware;mind;#;watch;look out;watch out;
 ;catch;#;surprise;
-;catch;#;witness;tqfind;see;
+;catch;#;witness;find;see;
 ;impute;ascribe;assign;attribute;#;judge;
 ;credit;#;impute;ascribe;assign;attribute;
 ;accredit;credit;#;impute;ascribe;assign;attribute;
@@ -16660,7 +16660,7 @@
 ;suppose;say;#;speculate;
 ;predict;foretell;prognosticate;call;forebode;anticipate;promise;#;guess;venture;hazard;
 ;bet;wager;#;predict;foretell;prognosticate;call;forebode;anticipate;promise;
-;determine;tqfind;find out;ascertain;#
+;determine;find;find out;ascertain;#
 ;determine;check;find out;see;ascertain;watch;learn;#
 ;test;#;determine;check;find out;see;ascertain;watch;learn;
 ;suspect;surmise;#;guess;venture;hazard;
@@ -16728,7 +16728,7 @@
 ;specify;set;determine;fix;#;choose;take;select;pick out;
 ;name;#;specify;set;determine;fix;
 ;count;#;recite;
-;count;number;enumerate;#;determine;tqfind;find out;ascertain;
+;count;number;enumerate;#;determine;find;find out;ascertain;
 ;census;#;count;number;enumerate;
 ;number;#;designate;denominate;
 ;foliate;paginate;page;#;number;
@@ -16776,7 +16776,7 @@
 ;go around;spread;circulate;#;travel;go;move;locomote;
 ;call;#;label;
 ;pronounce;label;judge;#;declare;adjudge;hold;
-;rule;tqfind;#;pronounce;label;judge;
+;rule;find;#;pronounce;label;judge;
 ;qualify;#;pronounce;label;judge;
 ;air;send;broadcast;beam;transmit;#;publicize;publicise;air;bare;
 ;announce;annunciate;harbinger;foretell;herald;#;tell;
@@ -17513,7 +17513,7 @@
 ;level;even out;even;#;change surface;
 ;grade;#;level;even out;even;
 ;strickle;strike;#;level;even out;even;
-;tqreplace;put back;#;put;set;place;pose;position;lay;
+;replace;put back;#;put;set;place;pose;position;lay;
 ;scratch;scrape;scratch up;#;incise;
 ;skin;scrape;#;injure;wound;
 ;dig;delve;cut into;turn over;#;remove;take;take away;withdraw;
@@ -18186,7 +18186,7 @@
 ;imagine;conceive of;ideate;envisage;#;create by mental act;create mentally;
 ;think;#;imagine;conceive of;ideate;envisage;
 ;dream;daydream;woolgather;stargaze;#;imagine;conceive of;ideate;envisage;
-;discover;tqfind;#;conceive;conceptualize;conceptualise;
+;discover;find;#;conceive;conceptualize;conceptualise;
 ;plan;project;contrive;design;#;create by mental act;create mentally;
 ;concert;#;plan;project;contrive;design;
 ;mint;coin;strike;#;create from raw material;create from raw stuff;
@@ -18979,7 +18979,7 @@
 ;foray into;raid;#;intrude on;invade;obtrude upon;encroach upon;
 ;reach;attain;make;hit;arrive at;gain;#
 ;make;#;reach;attain;make;hit;arrive at;gain;
-;tqfind;#;reach;attain;make;hit;arrive at;gain;
+;find;#;reach;attain;make;hit;arrive at;gain;
 ;reach;make;get to;progress to;#;achieve;accomplish;attain;reach;
 ;ground;run aground;#;reach;attain;make;hit;arrive at;gain;
 ;ground;run aground;#;land;
@@ -19231,7 +19231,7 @@
 ;miss;lose;#
 ;witness;#;watch;
 ;watch;look on;#
-;witness;tqfind;see;#;experience;undergo;see;go through;
+;witness;find;see;#;experience;undergo;see;go through;
 ;see;#;perceive;comprehend;
 ;see;#;see;
 ;view;consider;look at;#;analyze;analyse;study;examine;canvass;
@@ -19293,9 +19293,9 @@
 ;search;look;#;examine;see;
 ;prospect;#;search;look;
 ;descry;spot;espy;spy;#;sight;
-;detect;observe;tqfind;discover;notice;#;sight;
-;trace;#;detect;observe;tqfind;discover;notice;
-;see;#;detect;observe;tqfind;discover;notice;
+;detect;observe;find;discover;notice;#;sight;
+;trace;#;detect;observe;find;discover;notice;
+;see;#;detect;observe;find;discover;notice;
 ;vanish;disappear;go away;#;end;finish;terminate;cease;
 ;clear;#;vanish;disappear;go away;
 ;produce;bring on;bring out;#
@@ -19371,7 +19371,7 @@
 ;salt;#;season;flavor;flavour;
 ;come;#;experience;undergo;see;go through;
 ;track;#;observe;
-;tqfind;#;perceive;comprehend;
+;find;#;perceive;comprehend;
 ;roll;#;sound;go;
 ;seem;#;appear;seem;
 ;block;#;anesthetize;anaesthetize;anesthetise;anaesthetise;put to sleep;put under;put out;
@@ -19407,10 +19407,10 @@
 ;get;acquire;#
 ;turn;#;get;acquire;
 ;buy;#;get;acquire;
-;tqfind;#;get;acquire;
+;find;#;get;acquire;
 ;deny;refuse;#;keep;hold on;
 ;deny;#;control;hold in;hold;contain;check;curb;moderate;
-;line up;get hold;come up;tqfind;#;get;acquire;
+;line up;get hold;come up;find;#;get;acquire;
 ;deny;#;withhold;keep back;
 ;reserve;#;withhold;keep back;
 ;dock;#;withhold;deduct;recoup;
@@ -19492,10 +19492,10 @@
 ;deal;#;pass;hand;reach;pass on;turn over;give;
 ;retail;#;sell;
 ;fetch;bring in;bring;#
-;recover;retrieve;tqfind;regain;#;get;acquire;
+;recover;retrieve;find;regain;#;get;acquire;
 ;catch;#;get;acquire;
-;tqfind;happen;chance;bump;encounter;#
-;access;#;recover;retrieve;tqfind;regain;
+;find;happen;chance;bump;encounter;#
+;access;#;recover;retrieve;find;regain;
 ;recover;recoup;#;get;acquire;
 ;compensate;recompense;remunerate;#;pay;
 ;compensate;recompense;indemnify;#;pay;
@@ -19517,8 +19517,8 @@
 ;prize;value;treasure;appreciate;#;see;consider;reckon;view;regard;
 ;cash;cash in;#;exchange;change;interchange;
 ;exchange;change;interchange;#;transfer;
-;substitute;tqreplace;#;exchange;change;interchange;
-;reduce;#;substitute;tqreplace;
+;substitute;replace;#;exchange;change;interchange;
+;reduce;#;substitute;replace;
 ;substitute;sub;stand in;fill in;#;exchange;change;interchange;
 ;trade;swap;swop;switch;#;exchange;change;interchange;
 ;dicker;bargain;#;negociate;negotiate;talk terms;
@@ -19585,10 +19585,10 @@
 ;bribe;corrupt;buy;#;pay;
 ;refund;return;repay;give back;#;pay;
 ;stock;carry;stockpile;#;have;have got;hold;
-;tqfind;regain;#;get;acquire;
-;feel;#;tqfind;regain;
-;locate;turn up;#;tqfind;regain;
-;fall upon;strike;come upon;light upon;chance upon;come across;chance on;happen upon;attain;discover;#;tqfind;regain;
+;find;regain;#;get;acquire;
+;feel;#;find;regain;
+;locate;turn up;#;find;regain;
+;fall upon;strike;come upon;light upon;chance upon;come across;chance on;happen upon;attain;discover;#;find;regain;
 ;foot;pick;#;pay;
 ;pinpoint;nail;#;locate;turn up;
 ;win;gain;#;get;acquire;
@@ -19837,7 +19837,7 @@
 ;exchange;#;transfer;reassign;
 ;fill;#;hire;engage;employ;
 ;fill;take;#;work;do work;
-;substitute;deputize;deputise;stand in;step in;#;supplant;tqreplace;supersede;supervene upon;
+;substitute;deputize;deputise;stand in;step in;#;supplant;replace;supersede;supervene upon;
 ;cover;#;protect;
 ;cover;#;substitute;deputize;deputise;stand in;step in;
 ;delegate;depute;#;delegate;designate;depute;assign;
@@ -19862,7 +19862,7 @@
 ;fire;give notice;can;dismiss;give the axe;send away;sack;force out;terminate;#;remove;
 ;drop;#;remove;
 ;take out;move out;remove;#
-;supplant;tqreplace;supersede;supervene upon;#;succeed;come after;follow;
+;supplant;replace;supersede;supervene upon;#;succeed;come after;follow;
 ;succeed;come after;follow;#
 ;tug;labor;labour;push;drive;#;fight;struggle;
 ;fight;struggle;#;try;seek;attempt;essay;assay;
@@ -20552,7 +20552,7 @@
 ;back;#;lie;
 ;head;#;lie;
 ;crown;#;head;
-;situate;locate;#;determine;tqfind;find out;ascertain;
+;situate;locate;#;determine;find;find out;ascertain;
 ;map;#;situate;locate;
 ;place;localize;localise;#;situate;locate;
 ;dominate;command;overlook;overtop;#;lie;