From b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- languages/php/README.dox | 2 +- languages/php/data/phpfunctions | 34 ++++----- languages/php/doc/php.toc | 134 +++++++++++++++++------------------ languages/php/phpcodecompletion.cpp | 16 ++--- languages/php/phpconfigwidgetbase.ui | 24 +++---- languages/php/phperrorview.cpp | 4 +- languages/php/phpfile.cpp | 2 +- languages/php/phpinfodlg.ui | 4 +- languages/php/phpnewclassdlg.cpp | 2 +- languages/php/phpnewclassdlgbase.ui | 2 +- languages/php/phpparser.cpp | 2 +- languages/php/phpsupportpart.cpp | 2 +- 12 files changed, 114 insertions(+), 114 deletions(-) (limited to 'languages/php') diff --git a/languages/php/README.dox b/languages/php/README.dox index 4db52ea9..f388a3c6 100644 --- a/languages/php/README.dox +++ b/languages/php/README.dox @@ -14,7 +14,7 @@ all include files from your script. \maintainer Escuder Nicolas \feature PHP language support -\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. \bug bugs in php support component at Bugzilla database diff --git a/languages/php/data/phpfunctions b/languages/php/data/phpfunctions index 946dfaea..d0897bd5 100644 --- a/languages/php/data/phpfunctions +++ b/languages/php/data/phpfunctions @@ -184,7 +184,7 @@ domxml:string domxml_attrname([int dir_handle]) domxml:class domxml_node(string name) domxml:string domxml_lastchild([int node]) domxml:string domxml_parent([int node]) -domxml:string domxml_tqchildren([int node]) +domxml:string domxml_children([int node]) domxml:string domxml_getattr([int node,] string attrname) domxml:bool domxml_setattr([int node,] string attrname, string value) domxml:array domxml_attributes([int node]) @@ -199,7 +199,7 @@ domxml:string domxml_add_root([int doc_handle,] string name) domxml:class domxml_new_xmldoc(string version) domxml:string node_namespace([int node]) domxml:string node_attributes([int node]) -domxml:string node_tqchildren([int node]) +domxml:string node_children([int node]) domxml:class xmltree(string xmldoc) dotnet:int dotnet_load(string module_name) exif:string read_exif_data(string filename) @@ -341,7 +341,7 @@ hw:hwdoc hw_gettext(int link, int objid [, int rootid]) hw:void hw_edittext(int link, hwdoc doc) hw:hwdoc hw_getcgi(int link, int objid) hw:int hw_getremote(int link, int objid) -hw:[array|int] hw_getremotetqchildren(int link, string objrec) +hw:[array|int] hw_getremotechildren(int link, string objrec) hw:void hw_setlinkroot(int link, int rootid) hw:hwdoc hw_pipedocument(int link, int objid) hw:hwdoc hw_pipecgi(int link, int objid) @@ -360,8 +360,8 @@ hw:string hw_documentattributes(hwdoc doc) hw:string hw_document_attributes(hwdoc doc) hw:array hw_getparentsobj(int link, int objid) hw:array hw_getparents(int link, int objid) -hw:array hw_tqchildren(int link, int objid) -hw:array hw_tqchildrenobj(int link, int objid) +hw:array hw_children(int link, int objid) +hw:array hw_childrenobj(int link, int objid) hw:array hw_getchildcoll(int link, int objid) hw:array hw_getchildcollobj(int link, int objid) hw:int hw_docbyanchor(int link, int anchorid) @@ -1501,18 +1501,18 @@ swf:void swf_actiongotolabel(string label) swf:void swf_defineline(int objid, double x1, double y1, double x2, double y2, double width) swf:void swf_definerect(int objid, double x1, double y1, double x2, double y2, double width) swf:void swf_definepoly(int obj_id, array coords, int npoints, double width) -swf:void swf_starttqshape(int objid) -swf:void swf_tqshapelinesolid(double r, double g, double b, double a, double width) -swf:void swf_tqshapefilloff(void) -swf:void swf_tqshapefillsolid(double r, double g, double b, double a) -swf:void swf_tqshapefillbitmapclip(int bitmapid) -swf:void swf_tqshapefillbitmaptile(int bitmapid) -swf:void swf_tqshapemoveto(double x, double y) -swf:void swf_tqshapelineto(double x, double y) -swf:void swf_tqshapecurveto(double x1, double y1, double x2, double y2) -swf:void swf_tqshapecurveto3(double x1, double y1, double x2, double y2, double x3, double y3) -swf:void swf_tqshapearc(double x, double y, double r, double ang1, double ang2) -swf:void swf_endtqshape(void) +swf:void swf_startshape(int objid) +swf:void swf_shapelinesolid(double r, double g, double b, double a, double width) +swf:void swf_shapefilloff(void) +swf:void swf_shapefillsolid(double r, double g, double b, double a) +swf:void swf_shapefillbitmapclip(int bitmapid) +swf:void swf_shapefillbitmaptile(int bitmapid) +swf:void swf_shapemoveto(double x, double y) +swf:void swf_shapelineto(double x, double y) +swf:void swf_shapecurveto(double x1, double y1, double x2, double y2) +swf:void swf_shapecurveto3(double x1, double y1, double x2, double y2, double x3, double y3) +swf:void swf_shapearc(double x, double y, double r, double ang1, double ang2) +swf:void swf_endshape(void) swf:void swf_definefont(int fontid, string name) swf:void swf_setfont(int fontid) swf:void swf_fontsize(double height) diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc index 1c3e6db3..9e2035a7 100644 --- a/languages/php/doc/php.toc +++ b/languages/php/doc/php.toc @@ -557,11 +557,11 @@ - - - - - + + + + + @@ -688,7 +688,7 @@ - + @@ -3644,12 +3644,12 @@ - - - - - - + + + + + + @@ -3841,7 +3841,7 @@ - + @@ -4067,7 +4067,7 @@ - + @@ -4138,7 +4138,7 @@ - + @@ -4512,7 +4512,7 @@ - + @@ -4534,7 +4534,7 @@ - + @@ -4639,7 +4639,7 @@ - + @@ -4651,7 +4651,7 @@ - + @@ -4679,7 +4679,7 @@ - + @@ -4723,7 +4723,7 @@ - + @@ -4731,8 +4731,8 @@ - - + + @@ -4754,22 +4754,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -5063,7 +5063,7 @@ - + @@ -5096,7 +5096,7 @@ - + @@ -5124,20 +5124,20 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -5318,8 +5318,8 @@ - - + + @@ -5356,12 +5356,12 @@ - - + + - - + + @@ -5373,8 +5373,8 @@ - - + + @@ -5509,7 +5509,7 @@ - + @@ -5594,8 +5594,8 @@ - - + + @@ -5629,7 +5629,7 @@ - + @@ -5661,7 +5661,7 @@ - + @@ -6571,7 +6571,7 @@ - + @@ -6916,7 +6916,7 @@ - + diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index 60c9877b..81c3b742 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include @@ -234,7 +234,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) { for (funcIt = funcList.begin(); funcIt != funcList.end(); ++funcIt) { FunctionDom nFunc = *funcIt; - if ((function.isEmpty() || nFunc->name().tqstartsWith(function, FALSE)) && nFunc->isStatic()) { + if ((function.isEmpty() || nFunc->name().startsWith(function, FALSE)) && nFunc->isStatic()) { KTextEditor::CompletionEntry e; e.prefix = nClass->name() + " ::"; e.text = nFunc->name(); @@ -362,7 +362,7 @@ TQValueList PHPCodeCompletion::getClasses(TQString ClassList::Iterator classIt; for (classIt = classList.begin(); classIt != classList.end(); ++classIt) { ClassDom nClass = *classIt; - if (name == NULL || name.isEmpty() || nClass->name().tqstartsWith(name, FALSE)) { + if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, FALSE)) { KTextEditor::CompletionEntry e; TQStringList::Iterator it = added.find(nClass->name()); @@ -383,7 +383,7 @@ TQValueList PHPCodeCompletion::getFunctionsAndVars if (classname.isEmpty()) { TQValueList::Iterator it; for( it = m_globalFunctions.begin(); it != m_globalFunctions.end(); ++it ) { - if((*it).text.tqstartsWith(function, FALSE)){ + if((*it).text.startsWith(function, FALSE)){ KTextEditor::CompletionEntry e; e = (*it); list.append(e); @@ -393,7 +393,7 @@ TQValueList PHPCodeCompletion::getFunctionsAndVars FunctionList methodList = m_model->globalNamespace()->functionList(); FunctionList::Iterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) { - if ((*methodIt)->name().tqstartsWith(function, FALSE)){ + if ((*methodIt)->name().startsWith(function, FALSE)){ KTextEditor::CompletionEntry e; e.text = (*methodIt)->name(); ArgumentDom pArg = (*methodIt)->argumentList().first(); @@ -416,7 +416,7 @@ TQValueList PHPCodeCompletion::getFunctionsAndVars FunctionList::Iterator methodIt; for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) { FunctionDom pMethod = *methodIt; - if (function.isEmpty() || pMethod->name().tqstartsWith(function, FALSE)) { + if (function.isEmpty() || pMethod->name().startsWith(function, FALSE)) { KTextEditor::CompletionEntry e; ArgumentDom arg = pMethod->argumentList().first(); @@ -430,7 +430,7 @@ TQValueList PHPCodeCompletion::getFunctionsAndVars VariableList::Iterator attrIt; for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt) { VariableDom pVar = *attrIt; - if (function.isEmpty() || pVar->name().tqstartsWith(function, FALSE)) { + if (function.isEmpty() || pVar->name().startsWith(function, FALSE)) { KTextEditor::CompletionEntry e; e.prefix = nClass->name() + " ::"; e.text = pVar->name(); @@ -706,7 +706,7 @@ kdDebug(9018) << "checkForArgHint 0 " << line << endl; } void PHPCodeCompletion::setStatusBar(TQString expr, TQString type) { - m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").tqarg(expr).tqarg(type), 1000 ); + m_phpSupport->mainWindow()->statusBar()->message( i18n("Type of %1 is %2").arg(expr).arg(type), 1000 ); } #include "phpcodecompletion.moc" diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui index 962ac2a9..a1da7ee1 100644 --- a/languages/php/phpconfigwidgetbase.ui +++ b/languages/php/phpconfigwidgetbase.ui @@ -153,7 +153,7 @@ Expanding - + 20 170 @@ -230,7 +230,7 @@ <font size="+1">The php executable is called directly. Ideal for developers who want to develop terminal or graphical applications in PHP. You need a correctly installed php cgi version.</font> - + WordBreak|AlignVCenter|AlignLeft @@ -254,7 +254,7 @@ You need a correctly installed php cgi version.</font> <font size="+1">Uses an existing webserver. The pages are previewed in the internal web browser. Please make sure that the webserver was compiled with PHP support.</font> - + WordBreak|AlignVCenter|AlignLeft @@ -272,7 +272,7 @@ the internal web browser. Please make sure that the webserver was compiled with Expanding - + 21 171 @@ -318,7 +318,7 @@ the internal web browser. Please make sure that the webserver was compiled with Expanding - + 20 20 @@ -351,7 +351,7 @@ the internal web browser. Please make sure that the webserver was compiled with - tqlayout7 + layout7 @@ -366,7 +366,7 @@ the internal web browser. Please make sure that the webserver was compiled with exe_button - + 22 0 @@ -405,7 +405,7 @@ the internal web browser. Please make sure that the webserver was compiled with - tqlayout8 + layout8 @@ -426,7 +426,7 @@ the internal web browser. Please make sure that the webserver was compiled with true - + 20 0 @@ -451,7 +451,7 @@ the internal web browser. Please make sure that the webserver was compiled with - tqlayout9 + layout9 @@ -472,7 +472,7 @@ the internal web browser. Please make sure that the webserver was compiled with false - + 20 0 @@ -497,7 +497,7 @@ the internal web browser. Please make sure that the webserver was compiled with Expanding - + 20 343 diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index 11e3066f..cec0b4fb 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include class ProblemItem: public KListViewItem @@ -151,7 +151,7 @@ void PHPErrorView::slotFilter() if(!m_tabBar->isTabEnabled(4)) m_tabBar->setTabEnabled(4,true); - m_tabBar->tab(4)->setText(i18n("Filtered: %1").tqarg( m_filterEdit->text() )); + m_tabBar->tab(4)->setText(i18n("Filtered: %1").arg( m_filterEdit->text() )); m_tabBar->setCurrentTab(4); m_filteredList->clear(); diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 974698d3..d54028da 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -418,7 +418,7 @@ void PHPFile::ParseSource() { include_path.append(URLUtil::directory(fileName()) + "/"); include_path.append(""); - TQStringList list = includere.tqcapturedTexts(); + TQStringList list = includere.capturedTexts(); for ( TQStringList::Iterator it = include_path.begin(); it != include_path.end(); ++it ) { TQString abso = URLUtil::canonicalPath(*it + "/" + list[3]); diff --git a/languages/php/phpinfodlg.ui b/languages/php/phpinfodlg.ui index c4f26dfb..ea40dbf3 100644 --- a/languages/php/phpinfodlg.ui +++ b/languages/php/phpinfodlg.ui @@ -45,7 +45,7 @@ Expanding - + 20 20 @@ -62,7 +62,7 @@ Expanding - + 20 20 diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 314dfcf6..a95a9151 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/languages/php/phpnewclassdlgbase.ui b/languages/php/phpnewclassdlgbase.ui index 5ddb336a..94c18baa 100644 --- a/languages/php/phpnewclassdlgbase.ui +++ b/languages/php/phpnewclassdlgbase.ui @@ -40,7 +40,7 @@ Expanding - + 20 20 diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp index a0f1179e..cafd1a49 100644 --- a/languages/php/phpparser.cpp +++ b/languages/php/phpparser.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 52c9f109..85c70c00 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.1