From 330c33ab6f97b279737bf9527c9add7bb1475450 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/kdevelop@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- languages/php/data/phpfunctions | 16 ++++++------ languages/php/doc/php.toc | 46 +++++++++++++++++----------------- languages/php/phpcodecompletion.cpp | 32 ++++++++++++------------ languages/php/phperrorview.cpp | 4 +-- languages/php/phpfile.cpp | 50 ++++++++++++++++++------------------- languages/php/phpnewclassdlg.cpp | 12 ++++----- languages/php/phpparser.cpp | 8 +++--- languages/php/phpsupportpart.cpp | 4 +-- 8 files changed, 86 insertions(+), 86 deletions(-) (limited to 'languages/php') 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 @@ - + @@ -1840,7 +1840,7 @@ - + @@ -2245,7 +2245,7 @@ - + @@ -2411,7 +2411,7 @@ - + @@ -2419,7 +2419,7 @@ - + @@ -3581,7 +3581,7 @@ - + @@ -3590,7 +3590,7 @@ - + @@ -5672,7 +5672,7 @@ - + @@ -5700,7 +5700,7 @@ - + @@ -5929,7 +5929,7 @@ - + @@ -5951,7 +5951,7 @@ - + @@ -5975,7 +5975,7 @@ - + @@ -5992,7 +5992,7 @@ - + @@ -6250,7 +6250,7 @@ - + @@ -6304,12 +6304,12 @@ - - + + - + - + @@ -6364,10 +6364,10 @@ - + - + @@ -6401,7 +6401,7 @@ - + @@ -6860,8 +6860,8 @@ - - + + 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 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 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 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 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 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::Iterator it = m_files.tqfind(abso); + TQMap::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::Iterator it = m_files.tqfind(abso); + TQMap::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::Iterator it = m_files.tqfind(abso); + TQMap::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", "
"); + buf.replace("\n", "
"); 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", "
"); + buf.replace("\n", "
"); m_htmlView->write(buf); } -- cgit v1.2.1