rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

8 files changed, 86 insertions, 86 deletions

diff --git a/languages/php/data/phpfunctions b/languages/php/data/phpfunctions
index d5b80245..be8667f6 100644
--- a/languages/php/data/phpfunctions
+++ b/languages/php/data/phpfunctions
@@ -150,7 +150,7 @@ db:string dblist(void)
 db:int dbmopen(string filename, string mode)
 db:bool dbmclose(int dbm_identifier)
 db:int dbminsert(int dbm_identifier, string key, string value)
-db:int dbmtqreplace(int dbm_identifier, string key, string value)
+db:int dbmreplace(int dbm_identifier, string key, string value)
 db:string dbmfetch(int dbm_identifier, string key)
 db:int dbmexists(int dbm_identifier, string key)
 db:int dbmdelete(int dbm_identifier, string key)
@@ -165,7 +165,7 @@ dba:string dba_firstkey(int handle)
 dba:string dba_nextkey(int handle)
 dba:bool dba_delete(string key, int handle)
 dba:bool dba_insert(string key, string value, int handle)
-dba:bool dba_tqreplace(string key, string value, int handle)
+dba:bool dba_replace(string key, string value, int handle)
 dba:bool dba_optimize(int handle)
 dba:bool dba_sync(int handle)
 dbase:int dbase_open(string name, int mode)
@@ -559,7 +559,7 @@ ldap:array ldap_explode_dn(string dn, int with_attrib)
 ldap:string ldap_dn2ufn(string dn)
 ldap:int ldap_add(int link, string dn, array entry)
 ldap:int ldap_modify(int link, string dn, array entry)
-ldap:int ldap_mod_tqreplace(int link, string dn, array entry)
+ldap:int ldap_mod_replace(int link, string dn, array entry)
 ldap:int ldap_mod_add(int link, string dn, array entry)
 ldap:int ldap_mod_del(int link, string dn, array entry)
 ldap:int ldap_delete(int link, string dn)
@@ -861,7 +861,7 @@ ovrimos:int ovrimos_rollback(int connection_id)
 ovrimos:int ovrimos_setoption(int conn_id|result_id, int which, int option, int value)
 pcre:int preg_match(string pattern, string subject [, array subpatterns])
 pcre:int preg_match_all(string pattern, string subject, array subpatterns [, int order])
-pcre:string preg_tqreplace(string|array regex, string|array tqreplace, string|array subject [, int limit])
+pcre:string preg_replace(string|array regex, string|array replace, string|array subject [, int limit])
 pcre:array preg_split(string pattern, string subject [, int limit [, int flags]])
 pcre:string preg_quote(string str, string delim_char)
 pcre:array preg_grep(string regex, array input)
@@ -1403,8 +1403,8 @@ rand:int mt_getrandmax(void)
 quot_print:string quoted_printable_decode(string str)
 reg:int ereg(string pattern, string string [, array registers])
 reg:int eregi(string pattern, string string [, array registers])
-reg:string ereg_tqreplace(string pattern, string replacement, string string)
-reg:string eregi_tqreplace(string pattern, string replacement, string string])
+reg:string ereg_replace(string pattern, string replacement, string string)
+reg:string eregi_replace(string pattern, string replacement, string string])
 reg:array split(string pattern, string string [, int limit])
 reg:array spliti(string pattern, string string [, int limit])
 reg:string sql_regcase(string string)
@@ -1434,7 +1434,7 @@ string:int strrpos(string haystack, string needle)
 string:string strrchr(string haystack, string needle)
 string:string chunk_split(string str [, int chunklen [, string ending]])
 string:string substr(string str, int start [, int length])
-string:string substr_tqreplace(string str, string repl, int start [, int length])
+string:string substr_replace(string str, string repl, int start [, int length])
 string:string quotemeta(string str)
 string:int ord(string character)
 string:string chr(int ascii)
@@ -1447,7 +1447,7 @@ string:string addcslashes(string str, string charlist)
 string:string addslashes(string str)
 string:string stripcslashes(string str)
 string:string stripslashes(string str)
-string:string str_tqreplace(string needle, string str, string haystack)
+string:string str_replace(string needle, string str, string haystack)
 string:string hebrev(string str [, int max_chars_per_line])
 string:string hebrevc(string str [, int max_chars_per_line])
 string:string nl2br(string str)
diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc
index 67883245..7a35196d 100644
--- a/languages/php/doc/php.toc
+++ b/languages/php/doc/php.toc
@@ -1629,7 +1629,7 @@
 <entry name="newt_checkbox_set_flags" url="function.newt-checkbox-set-flags.php"/>
 <entry name="newt_checkbox_set_value" url="function.newt-checkbox-set-value.php"/>
 <entry name="newt_checkbox_tree_add_item" url="function.newt-checkbox-tree-add-item.php"/>
-<entry name="newt_checkbox_tree_find_item" url="function.newt-checkbox-tree-tqfind-item.php"/>
+<entry name="newt_checkbox_tree_find_item" url="function.newt-checkbox-tree-find-item.php"/>
 <entry name="newt_checkbox_tree_get_current" url="function.newt-checkbox-tree-get-current.php"/>
 <entry name="newt_checkbox_tree_get_entry_value" url="function.newt-checkbox-tree-get-entry-value.php"/>
 <entry name="newt_checkbox_tree_get_multi_selection" url="function.newt-checkbox-tree-get-multi-selection.php"/>
@@ -1840,7 +1840,7 @@
 <entry name="ncurses_qiflush" url="function.ncurses-qiflush.php"/>
 <entry name="ncurses_raw" url="function.ncurses-raw.php"/>
 <entry name="ncurses_refresh" url="function.ncurses-refresh.php"/>
-<entry name="ncurses_replace_panel" url="function.ncurses-tqreplace-panel.php"/>
+<entry name="ncurses_replace_panel" url="function.ncurses-replace-panel.php"/>
 <entry name="ncurses_reset_prog_mode" url="function.ncurses-reset-prog-mode.php"/>
 <entry name="ncurses_reset_shell_mode" url="function.ncurses-reset-shell-mode.php"/>
 <entry name="ncurses_resetty" url="function.ncurses-resetty.php"/>
@@ -2245,7 +2245,7 @@
 <entry name="dba_open" url="function.dba-open.php"/>
 <entry name="dba_optimize" url="function.dba-optimize.php"/>
 <entry name="dba_popen" url="function.dba-popen.php"/>
-<entry name="dba_tqreplace" url="function.dba-tqreplace.php"/>
+<entry name="dba_replace" url="function.dba-replace.php"/>
 <entry name="dba_sync" url="function.dba-sync.php"/>
 <entry name="dbx_close" url="function.dbx-close.php"/>
 <entry name="dbx_compare" url="function.dbx-compare.php"/>
@@ -2411,7 +2411,7 @@
 <entry name="dbase_numrecords" url="function.dbase-numrecords.php"/>
 <entry name="dbase_open" url="function.dbase-open.php"/>
 <entry name="dbase_pack" url="function.dbase-pack.php"/>
-<entry name="dbase_replace_record" url="function.dbase-tqreplace-record.php"/>
+<entry name="dbase_replace_record" url="function.dbase-replace-record.php"/>
 <entry name="dbplus_add" url="function.dbplus-add.php"/>
 <entry name="dbplus_aql" url="function.dbplus-aql.php"/>
 <entry name="dbplus_chdir" url="function.dbplus-chdir.php"/>
@@ -2419,7 +2419,7 @@
 <entry name="dbplus_curr" url="function.dbplus-curr.php"/>
 <entry name="dbplus_errcode" url="function.dbplus-errcode.php"/>
 <entry name="dbplus_errno" url="function.dbplus-errno.php"/>
-<entry name="dbplus_tqfind" url="function.dbplus-find.php"/>
+<entry name="dbplus_find" url="function.dbplus-find.php"/>
 <entry name="dbplus_first" url="function.dbplus-first.php"/>
 <entry name="dbplus_flush" url="function.dbplus-flush.php"/>
 <entry name="dbplus_freealllocks" url="function.dbplus-freealllocks.php"/>
@@ -3581,7 +3581,7 @@
 <entry name="mb_encode_mimeheader" url="function.mb-encode-mimeheader.php"/>
 <entry name="mb_encode_numericentity" url="function.mb-encode-numericentity.php"/>
 <entry name="mb_ereg_match" url="function.mb-ereg-match.php"/>
-<entry name="mb_ereg_tqreplace" url="function.mb-ereg-tqreplace.php"/>
+<entry name="mb_ereg_replace" url="function.mb-ereg-replace.php"/>
 <entry name="mb_ereg_search_getpos" url="function.mb-ereg-search-getpos.php"/>
 <entry name="mb_ereg_search_getregs" url="function.mb-ereg-search-getregs.php"/>
 <entry name="mb_ereg_search_init" url="function.mb-ereg-search-init.php"/>
@@ -3590,7 +3590,7 @@
 <entry name="mb_ereg_search_setpos" url="function.mb-ereg-search-setpos.php"/>
 <entry name="mb_ereg_search" url="function.mb-ereg-search.php"/>
 <entry name="mb_ereg" url="function.mb-ereg.php"/>
-<entry name="mb_eregi_tqreplace" url="function.mb-eregi-tqreplace.php"/>
+<entry name="mb_eregi_replace" url="function.mb-eregi-replace.php"/>
 <entry name="mb_eregi" url="function.mb-eregi.php"/>
 <entry name="mb_get_info" url="function.mb-get-info.php"/>
 <entry name="mb_http_input" url="function.mb-http-input.php"/>
@@ -5672,7 +5672,7 @@
 <entry name="hw_api->dstofsrcanchor" url="function.hwapi-dstofsrcanchor.php"/>
 <entry name="hw_api_error->count" url="function.hwapi-error-count.php"/>
 <entry name="hw_api_error->reason" url="function.hwapi-error-reason.php"/>
-<entry name="hw_api->tqfind" url="function.hwapi-find.php"/>
+<entry name="hw_api->find" url="function.hwapi-find.php"/>
 <entry name="hw_api->ftstat" url="function.hwapi-ftstat.php"/>
 <entry name="hwapi_hgcsp" url="function.hwapi-hgcsp.php"/>
 <entry name="hw_api->hwstat" url="function.hwapi-hwstat.php"/>
@@ -5700,7 +5700,7 @@
 <entry name="hw_api_reason->description" url="function.hwapi-reason-description.php"/>
 <entry name="hw_api_reason->type" url="function.hwapi-reason-type.php"/>
 <entry name="hw_api->remove" url="function.hwapi-remove.php"/>
-<entry name="hw_api->tqreplace" url="function.hwapi-tqreplace.php"/>
+<entry name="hw_api->replace" url="function.hwapi-replace.php"/>
 <entry name="hw_api->setcommittedversion" url="function.hwapi-setcommittedversion.php"/>
 <entry name="hw_api->srcanchors" url="function.hwapi-srcanchors.php"/>
 <entry name="hw_api->srcsofdst" url="function.hwapi-srcsofdst.php"/>
@@ -5929,7 +5929,7 @@
 <entry name="ldap_list" url="function.ldap-list.php"/>
 <entry name="ldap_mod_add" url="function.ldap-mod-add.php"/>
 <entry name="ldap_mod_del" url="function.ldap-mod-del.php"/>
-<entry name="ldap_mod_tqreplace" url="function.ldap-mod-tqreplace.php"/>
+<entry name="ldap_mod_replace" url="function.ldap-mod-replace.php"/>
 <entry name="ldap_modify" url="function.ldap-modify.php"/>
 <entry name="ldap_next_attribute" url="function.ldap-next-attribute.php"/>
 <entry name="ldap_next_entry" url="function.ldap-next-entry.php"/>
@@ -5951,7 +5951,7 @@
 <entry name="notes_create_db" url="function.notes-create-db.php"/>
 <entry name="notes_create_note" url="function.notes-create-note.php"/>
 <entry name="notes_drop_db" url="function.notes-drop-db.php"/>
-<entry name="notes_find_note" url="function.notes-tqfind-note.php"/>
+<entry name="notes_find_note" url="function.notes-find-note.php"/>
 <entry name="notes_header_info" url="function.notes-header-info.php"/>
 <entry name="notes_list_msgs" url="function.notes-list-msgs.php"/>
 <entry name="notes_mark_read" url="function.notes-mark-read.php"/>
@@ -5975,7 +5975,7 @@
 <entry name="Memcache::getVersion" url="function.memcache-getversion.php"/>
 <entry name="Memcache::increment" url="function.memcache-increment.php"/>
 <entry name="Memcache::pconnect" url="function.memcache-pconnect.php"/>
-<entry name="Memcache::tqreplace" url="function.memcache-tqreplace.php"/>
+<entry name="Memcache::replace" url="function.memcache-replace.php"/>
 <entry name="Memcache::set" url="function.memcache-set.php"/>
 <entry name="Memcache::setCompressThreshold" url="function.memcache-setcompressthreshold.php"/>
 <entry name="Memcache::setServerParams" url="function.memcache-setserverparams.php"/>
@@ -5992,7 +5992,7 @@
 <entry name="udm_crc32" url="function.udm-crc32.php"/>
 <entry name="udm_errno" url="function.udm-errno.php"/>
 <entry name="udm_error" url="function.udm-error.php"/>
-<entry name="udm_tqfind" url="function.udm-find.php"/>
+<entry name="udm_find" url="function.udm-find.php"/>
 <entry name="udm_free_agent" url="function.udm-free-agent.php"/>
 <entry name="udm_free_ispell_data" url="function.udm-free-ispell-data.php"/>
 <entry name="udm_free_res" url="function.udm-free-res.php"/>
@@ -6250,7 +6250,7 @@
 <entry name="msession_create" url="function.msession-create.php"/>
 <entry name="msession_destroy" url="function.msession-destroy.php"/>
 <entry name="msession_disconnect" url="function.msession-disconnect.php"/>
-<entry name="msession_tqfind" url="function.msession-find.php"/>
+<entry name="msession_find" url="function.msession-find.php"/>
 <entry name="msession_get_array" url="function.msession-get-array.php"/>
 <entry name="msession_get_data" url="function.msession-get-data.php"/>
 <entry name="msession_get" url="function.msession-get.php"/>
@@ -6304,12 +6304,12 @@
 <entry name="preg_match_all" url="function.preg-match-all.php"/>
 <entry name="preg_match" url="function.preg-match.php"/>
 <entry name="preg_quote" url="function.preg-quote.php"/>
-<entry name="preg_replace_callback" url="function.preg-tqreplace-callback.php"/>
-<entry name="preg_tqreplace" url="function.preg-tqreplace.php"/>
+<entry name="preg_replace_callback" url="function.preg-replace-callback.php"/>
+<entry name="preg_replace" url="function.preg-replace.php"/>
 <entry name="preg_split" url="function.preg-split.php"/>
-<entry name="ereg_tqreplace" url="function.ereg-tqreplace.php"/>
+<entry name="ereg_replace" url="function.ereg-replace.php"/>
 <entry name="ereg" url="function.ereg.php"/>
-<entry name="eregi_tqreplace" url="function.eregi-tqreplace.php"/>
+<entry name="eregi_replace" url="function.eregi-replace.php"/>
 <entry name="eregi" url="function.eregi.php"/>
 <entry name="split" url="function.split.php"/>
 <entry name="spliti" url="function.spliti.php"/>
@@ -6364,10 +6364,10 @@
 <entry name="sprintf" url="function.sprintf.php"/>
 <entry name="sscanf" url="function.sscanf.php"/>
 <entry name="str_getcsv" url="function.str-getcsv.php"/>
-<entry name="str_itqreplace" url="function.str-itqreplace.php"/>
+<entry name="str_ireplace" url="function.str-ireplace.php"/>
 <entry name="str_pad" url="function.str-pad.php"/>
 <entry name="str_repeat" url="function.str-repeat.php"/>
-<entry name="str_tqreplace" url="function.str-tqreplace.php"/>
+<entry name="str_replace" url="function.str-replace.php"/>
 <entry name="str_rot13" url="function.str-rot13.php"/>
 <entry name="str_shuffle" url="function.str-shuffle.php"/>
 <entry name="str_split" url="function.str-split.php"/>
@@ -6401,7 +6401,7 @@
 <entry name="strtr" url="function.strtr.php"/>
 <entry name="substr_compare" url="function.substr-compare.php"/>
 <entry name="substr_count" url="function.substr-count.php"/>
-<entry name="substr_tqreplace" url="function.substr-tqreplace.php"/>
+<entry name="substr_replace" url="function.substr-replace.php"/>
 <entry name="substr" url="function.substr.php"/>
 <entry name="trim" url="function.trim.php"/>
 <entry name="ucfirst" url="function.ucfirst.php"/>
@@ -6860,8 +6860,8 @@
 <entry name="DomNode->prefix" url="function.domnode-prefix.php"/>
 <entry name="DomNode->previous_sibling" url="function.domnode-previous-sibling.php"/>
 <entry name="DomNode->remove_child" url="function.domnode-remove-child.php"/>
-<entry name="DomNode->replace_child" url="function.domnode-tqreplace-child.php"/>
-<entry name="DomNode->replace_node" url="function.domnode-tqreplace-node.php"/>
+<entry name="DomNode->replace_child" url="function.domnode-replace-child.php"/>
+<entry name="DomNode->replace_node" url="function.domnode-replace-node.php"/>
 <entry name="DomNode->set_content" url="function.domnode-set-content.php"/>
 <entry name="DomNode->set_name" url="function.domnode-set-name.php"/>
 <entry name="DomNode->set_namespace" url="function.domnode-set-namespace.php"/>
diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp
index 8f0a9298..c8af6b94 100644
--- a/languages/php/phpcodecompletion.cpp
+++ b/languages/php/phpcodecompletion.cpp
@@ -146,9 +146,9 @@ void PHPCodeCompletion::cursorPositionChanged(){
    }
 
    if (m_config->getCodeHinting()) {
-      int pos1 = lineStr.tqfindRev("(", col - 1);
-      int pos2 = lineStr.tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), pos1 - 1);
-      int pos3 = lineStr.tqfindRev(")", col);
+      int pos1 = lineStr.findRev("(", col - 1);
+      int pos2 = lineStr.findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), pos1 - 1);
+      int pos3 = lineStr.findRev(")", col);
 
       if (pos1 > pos2 && pos1 != -1 && pos3 < pos1) {
          TQString line = lineStr.mid(pos2 + 1, pos1 - pos2 - 1).stripWhiteSpace();
@@ -163,7 +163,7 @@ void PHPCodeCompletion::cursorPositionChanged(){
          return;
       }
 
-      int pos = lineStr.tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1);
+      int pos = lineStr.findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1);
       TQString line = lineStr.mid(pos + 1, col - pos).stripWhiteSpace();
 
       if (checkForVariable(line, col)) {
@@ -180,7 +180,7 @@ kdDebug(9018) << "end checkForGlobalFunction" << endl;
          return;
       }
 
-      pos = lineStr.stripWhiteSpace().tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1);
+      pos = lineStr.stripWhiteSpace().findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1);
       line = lineStr.mid(pos + 1, col - pos);
 
       if (checkForNew(line, col)) {
@@ -214,7 +214,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) {
    kdDebug(9018)   << "checkForStaticFunction" << endl;
    TQValueList<KTextEditor::CompletionEntry> list;
 
-   if (line.tqfind("::") == -1)
+   if (line.find("::") == -1)
       return false;
 
    TQRegExp Class("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)");
@@ -267,7 +267,7 @@ bool PHPCodeCompletion::checkForNew(TQString line, int col){
    kdDebug(9018)   << "checkForNew" << endl;
    TQValueList<KTextEditor::CompletionEntry> list;
 
-   if (line.tqfind("new ", 0, FALSE) == -1)
+   if (line.find("new ", 0, FALSE) == -1)
       return false;
 
    TQRegExp New("[& \t]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)");
@@ -297,7 +297,7 @@ bool PHPCodeCompletion::checkForExtends(TQString line, int col){
    kdDebug(9018)   << "checkForExtends" << endl;
    TQValueList<KTextEditor::CompletionEntry> list;
 
-   if (line.tqfind("extends", 0, FALSE) == -1)
+   if (line.find("extends", 0, FALSE) == -1)
       return false;
 
    TQRegExp extends("[ \t]*extends[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)");
@@ -316,12 +316,12 @@ bool PHPCodeCompletion::checkForVariable(TQString line, int col){
    TQValueList<KTextEditor::CompletionEntry> list;
    TQString args;
 
-   if (line.tqfind("->") == -1) {
+   if (line.find("->") == -1) {
          return false;
    }
 
    if (line.left(2) != "->") {
-      int pos = line.tqfindRev("->");
+      int pos = line.findRev("->");
       args = line.mid(pos + 2, line.length() - pos);
       line = line.mid(0, pos);
    }
@@ -365,7 +365,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getClasses(TQString
       if (name == NULL || name.isEmpty() || nClass->name().tqstartsWith(name, FALSE)) {
          KTextEditor::CompletionEntry e;
 
-         TQStringList::Iterator it = added.tqfind(nClass->name());
+         TQStringList::Iterator it = added.find(nClass->name());
          if (it == added.end()) {
             e.text = nClass->name();
             list.append(e);
@@ -532,7 +532,7 @@ TQString PHPCodeCompletion::getCurrentClassName() {
 TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) {
    kdDebug(9018) << "getClassName " << varName << "::" << classname << endl;
 
-   if (varName.tqfind("$") == 0)
+   if (varName.find("$") == 0)
        varName = varName.mid(1);
 
    if (varName.lower() == "this")
@@ -577,7 +577,7 @@ TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) {
 
    for(int i = m_currentLine; i >= 0; i--){
       TQString line = m_editInterface->textLine(i);
-      if (!line.isNull() && line.tqfind(varName,0 , FALSE) != -1) {
+      if (!line.isNull() && line.find(varName,0 , FALSE) != -1) {
 
          if (createmember.search(line) != -1) {
             TQString right = createmember.cap(1).stripWhiteSpace();
@@ -640,7 +640,7 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) {
    if (m_argWidgetShow == true)
       return false;
 
-   if (line.tqfind("::") != -1) {
+   if (line.find("::") != -1) {
       TQRegExp Static("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)");
       Static.setCaseSensitive(FALSE);
 
@@ -658,8 +658,8 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) {
       }
    }
 
-   if (line.tqfindRev("->") != -1) {
-      int pos1 = line.tqfindRev("->");
+   if (line.findRev("->") != -1) {
+      int pos1 = line.findRev("->");
 
       TQString classname;
       TQString function = line.mid(pos1 + 2);
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 241adb44..c21f9fdc 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -166,7 +166,7 @@ void PHPErrorView::filterList(KListView* listview, const TQString& level)
 {
     TQListViewItemIterator it( listview );
     while ( it.current() ) {
-        if ( it.current()->text(3).tqcontains(m_filterEdit->text(),false))
+        if ( it.current()->text(3).contains(m_filterEdit->text(),false))
        new KListViewItem(m_filteredList,level,
        it.current()->text(0),it.current()->text(1),it.current()->text(2),it.current()->text(3));
         ++it;
@@ -308,7 +308,7 @@ void PHPErrorView::reportProblem( int level, const TQString& fileName, int line,
    }
 
    TQString msg = text;
-   msg = msg.tqreplace( TQRegExp("\n"), "" );
+   msg = msg.replace( TQRegExp("\n"), "" );
 
    TQString relFileName = fileName;
    relFileName.remove(m_phpSupport->project()->projectDirectory());
diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp
index 6e258569..3e3fbd68 100644
--- a/languages/php/phpfile.cpp
+++ b/languages/php/phpfile.cpp
@@ -138,7 +138,7 @@ void PHPFile::Analyse() {
 }
 
 bool PHPFile::ParseClass(TQString line, int lineNo) {
-   if (line.tqfind("class ", 0, FALSE) == -1)
+   if (line.find("class ", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$");
@@ -159,7 +159,7 @@ bool PHPFile::ParseClass(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseFunction(TQString line, int lineNo) {
-   if (line.tqfind("function", 0, FALSE) == -1)
+   if (line.find("function", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp function("^[ \t]*(final|abstract|static|)[ \t]*(public|private|protected|)[ \t]*(static|)[ \t]*function[ \t&]*([_a-zA-Z\x7f-\xff][_a-zA-Z0-9\x7f-\xff]*)[ \t]*\\(([_a-zA-Z\x7f-\xff]*[_$, &'\\\"0-9A-Za-z\x7f-\xff\t-=]*)\\).*$");
@@ -198,7 +198,7 @@ bool PHPFile::ParseFunction(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseVariable(TQString line, int lineNo) {
-   if (line.tqfind("var") == -1 && line.tqfind("public") == -1 && line.tqfind("private") == -1 && line.tqfind("protected") == -1)
+   if (line.find("var") == -1 && line.find("public") == -1 && line.find("private") == -1 && line.find("protected") == -1)
       return FALSE;
 
    TQRegExp variable("^[ \t]*(var|public|private|protected|static)[ \t]*\\$([a-zA-Z_\x7f-\xff][0-9A-Za-z_\x7f-\xff]*)[ \t;=].*$");
@@ -227,7 +227,7 @@ bool PHPFile::ParseVariable(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseThisMember(TQString line, int lineNo) {
-   if (line.tqfind("$this->", 0, FALSE) == -1)
+   if (line.find("$this->", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp createthis;
@@ -240,7 +240,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) {
       return TRUE;
    }
 
-   if (line.tqfind("true", 0, FALSE) != -1 || line.tqfind("false", 0, FALSE) != -1) {
+   if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) {
       createthis.setPattern("\\$(this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;");
       if (createthis.search(line) != -1) {
          if (AddVariable(createthis.cap(1), "boolean", lineNo, TRUE) == FALSE)
@@ -249,7 +249,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) {
       }
    }
 
-   if (line.tqfind("new", 0, FALSE) != -1) {
+   if (line.find("new", 0, FALSE) != -1) {
       createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)");
       if (createthis.search(line) != -1) {
          if (AddVariable(createthis.cap(1), createthis.cap(2), lineNo, TRUE) == FALSE)
@@ -258,7 +258,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) {
       }
    }
 
-   if (line.tqfind("array", 0, FALSE) != -1) {
+   if (line.find("array", 0, FALSE) != -1) {
       createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+");
       if (createthis.search(line) != -1) {
          if (AddVariable(createthis.cap(1), "array", lineNo, TRUE) == FALSE)
@@ -271,7 +271,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseMember(TQString line, int lineNo) {
-   if (line.tqfind("$", 0, FALSE) == -1)
+   if (line.find("$", 0, FALSE) == -1)
       return FALSE;
 
    /// @todo Ajouter plus de test ....
@@ -293,7 +293,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) {
       return TRUE;
    }
 
-   if (line.tqfind("true", 0, FALSE) != -1 || line.tqfind("false", 0, FALSE) != -1) {
+   if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) {
       createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;");
       if (createmember.search(line) != -1) {
          if (AddVariable(createmember.cap(1), "boolean", lineNo) == FALSE)
@@ -302,7 +302,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) {
       }
    }
 
-   if (line.tqfind("new", 0, FALSE) != -1) {
+   if (line.find("new", 0, FALSE) != -1) {
       createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)");
       if (createmember.search(line) != -1) {
          if (AddVariable(createmember.cap(1), createmember.cap(2), lineNo) == FALSE)
@@ -311,7 +311,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) {
       }
    }
 
-   if (line.tqfind("array", 0, FALSE) != -1) {
+   if (line.find("array", 0, FALSE) != -1) {
       createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+");
       if (createmember.search(line) != -1) {
          if (AddVariable(createmember.cap(1), "array", lineNo) == FALSE)
@@ -326,7 +326,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) {
 bool PHPFile::ParseReturn(TQString line, int lineNo) {
    TQString rettype;
 
-   if (line.tqfind("return", 0, FALSE) == -1)
+   if (line.find("return", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp typeex;
@@ -337,7 +337,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) {
       TQString varname = typeex.cap(2).ascii();
       rettype = varname;
 
-      if (varname.tqfind("$") == 0) {
+      if (varname.find("$") == 0) {
          /// @todo search in variable
          /*
          varname = varname.mid(1);
@@ -357,7 +357,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) {
          rettype = "null";
       }
 
-      if (rettype.tqfind("$") == 0)
+      if (rettype.find("$") == 0)
          kdDebug(9018) << "ParseReturn value" << " " << rettype.latin1() << endl;
    }
 
@@ -366,7 +366,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseTodo(TQString line, int lineNo) {
-   if (line.tqfind("todo", 0, FALSE) == -1)
+   if (line.find("todo", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp todo("/[/]+[ \t]*[@]*todo([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$");
@@ -381,7 +381,7 @@ bool PHPFile::ParseTodo(TQString line, int lineNo) {
 }
 
 bool PHPFile::ParseFixme(TQString line, int lineNo) {
-   if (line.tqfind("fixme", 0, FALSE) == -1)
+   if (line.find("fixme", 0, FALSE) == -1)
       return FALSE;
 
    TQRegExp fixme("/[/]+[ \t]*[@]*fixme([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$");
@@ -411,7 +411,7 @@ void PHPFile::ParseSource() {
       line = (*it).local8Bit();
 
       if (!line.isNull()) {
-         if (line.tqfind("include", 0, FALSE) != -1 || line.tqfind("require", 0, FALSE) != -1)  {
+         if (line.find("include", 0, FALSE) != -1 || line.find("require", 0, FALSE) != -1)  {
             if (includere.search(line) != -1) {
                TQStringList include_path;
                include_path = include_path.split(":", m_part->getIncludePath());
@@ -432,16 +432,16 @@ void PHPFile::ParseSource() {
 
 
          if ( inMethod == TRUE ) {
-            bracketFuncOpen += line.tqcontains("{");
-            bracketFuncClose += line.tqcontains("}");
+            bracketFuncOpen += line.contains("{");
+            bracketFuncClose += line.contains("}");
             if (bracketFuncOpen == bracketFuncClose && bracketFuncOpen != 0 && bracketFuncClose != 0) {
                CloseFunction( lineNo );
             }
          }
 
          if ( inMethod == FALSE ) {
-            bracketOpen += line.tqcontains("{");
-            bracketClose += line.tqcontains("}");
+            bracketOpen += line.contains("{");
+            bracketClose += line.contains("}");
             if (bracketOpen == bracketClose && bracketOpen != 0 && bracketClose != 0 && inClass == TRUE) {
                CloseClass( lineNo );
             }
@@ -449,8 +449,8 @@ void PHPFile::ParseSource() {
 
          if ( inClass == FALSE ) {
             if (ParseClass(line, lineNo) == TRUE) {
-               bracketOpen = line.tqcontains("{");
-               bracketClose = line.tqcontains("}");
+               bracketOpen = line.contains("{");
+               bracketClose = line.contains("}");
             }
          }
 
@@ -459,8 +459,8 @@ void PHPFile::ParseSource() {
          }
 
          if (ParseFunction(line, lineNo) == TRUE) {
-            bracketFuncOpen = line.tqcontains("{");
-            bracketFuncClose = line.tqcontains("}");
+            bracketFuncOpen = line.contains("{");
+            bracketFuncClose = line.contains("}");
          }
 
          if ( inMethod == TRUE )
diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp
index 9227e8ff..2b014cfc 100644
--- a/languages/php/phpnewclassdlg.cpp
+++ b/languages/php/phpnewclassdlg.cpp
@@ -104,14 +104,14 @@ void PHPNewClassDlg::accept(){
 
   // generate the sourcecode for the class
   if(m_baseClassEdit->text().isEmpty()){
-    text = text.tqreplace(TQRegExp("extends BASECLASS"),"");
-    text = text.tqreplace(TQRegExp("BASECLASS\\:\\:BASECLASS\\(\\);"),"");
+    text = text.replace(TQRegExp("extends BASECLASS"),"");
+    text = text.replace(TQRegExp("BASECLASS\\:\\:BASECLASS\\(\\);"),"");
   }else{
-    text = text.tqreplace(TQRegExp("BASECLASS"),m_baseClassEdit->text());
+    text = text.replace(TQRegExp("BASECLASS"),m_baseClassEdit->text());
   }
-  text = text.tqreplace(TQRegExp("CLASSNAME"),m_classNameEdit->text());
-  text = text.tqreplace(TQRegExp("FILENAME"),m_fileNameEdit->text().upper());
-  text = text.tqreplace(TQRegExp("AUTHOR"),"not implemented");
+  text = text.replace(TQRegExp("CLASSNAME"),m_classNameEdit->text());
+  text = text.replace(TQRegExp("FILENAME"),m_fileNameEdit->text().upper());
+  text = text.replace(TQRegExp("AUTHOR"),"not implemented");
  
   file.setName(absFileName);
   if(file.open(IO_WriteOnly)){
diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp
index a4b5185e..a0f1179e 100644
--- a/languages/php/phpparser.cpp
+++ b/languages/php/phpparser.cpp
@@ -50,7 +50,7 @@ bool PHPParser::hasFile( const TQString& fileName )
 {
 //   kdDebug(9018) << "hasFile " << fileName.latin1() << endl;
    TQString abso = URLUtil::canonicalPath(fileName);
-   TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso);
+   TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso);
 
    if ( it == m_files.end() )
        return false;
@@ -67,7 +67,7 @@ void PHPParser::addFile( const TQString& fileName )
    kdDebug(9018) << "addFile " << fileName.latin1() << endl;
 
    TQFileInfo fi( abso );
-   if ((fi.extension().tqcontains("inc") || fi.extension().tqcontains("php") || fi.extension().tqcontains("html") || fi.extension().tqcontains("php3") || !fi.extension()) && !fi.extension().tqcontains("~")) {
+   if ((fi.extension().contains("inc") || fi.extension().contains("php") || fi.extension().contains("html") || fi.extension().contains("php3") || !fi.extension()) && !fi.extension().contains("~")) {
       m_files.insert(abso, new PHPFile(m_part, abso));
    }
 }
@@ -76,7 +76,7 @@ void PHPParser::removeFile( const TQString& fileName )
 {
 //   kdDebug(9018) << "removeFile " << fileName.latin1() << endl;
    TQString abso = URLUtil::canonicalPath(fileName);
-   TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso);
+   TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso);
 
    if ( it != m_files.end()) {
       PHPFile *file = it.data();
@@ -104,7 +104,7 @@ void PHPParser::reparseFile( const TQString& fileName )
 {
    kdDebug(9018) << "reparseFile" << endl;
    TQString abso = URLUtil::canonicalPath(fileName);
-   TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso);
+   TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso);
 
    if ( it != m_files.end()) {
       PHPFile *file = it.data();
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index 3dbf4211..4d20a30b 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -354,7 +354,7 @@ void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer,
 
    TQString buf = buffer;
    if (configData->getInvocationMode() == PHPConfigData::Shell)
-     buf.tqreplace("\n", "<br>");
+     buf.replace("\n", "<br>");
     m_htmlView->write(buf);
 }
 
@@ -364,7 +364,7 @@ void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer,
 
    TQString buf = buffer;
    if (configData->getInvocationMode() == PHPConfigData::Shell)
-      buf.tqreplace("\n", "<br>");
+      buf.replace("\n", "<br>");
    m_htmlView->write(buf);
 }