Remove additional unneeded tq method conversions

(cherry picked from commit 7e66d7c3611d907ea28b140281b472bb1c406be6)

5 files changed, 75 insertions, 75 deletions

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 b665d5c7..c40cda8f 100644
--- a/languages/php/doc/php.toc
+++ b/languages/php/doc/php.toc
@@ -688,7 +688,7 @@
     <tocsect2 name="SWFMorph" url="class.swfmorph.php"/>
     <tocsect2 name="SWFMovie" url="class.swfmovie.php"/>
     <tocsect2 name="SWFPrebuiltClip" url="class.swfprebuiltclip.php"/>
-    <tocsect2 name="SWFShape" url="class.swftqshape.php"/>
+    <tocsect2 name="SWFShape" url="class.swfshape.php"/>
     <tocsect2 name="SWFSound" url="class.swfsound.php"/>
     <tocsect2 name="SWFSoundInstance" url="class.swfsoundinstance.php"/>
     <tocsect2 name="SWFSprite" url="class.swfsprite.php"/>
@@ -3841,7 +3841,7 @@
 <entry name="Imagick::getImageFilename" url="function.imagick-getimagefilename.php"/>
 <entry name="Imagick::getImageFormat" url="function.imagick-getimageformat.php"/>
 <entry name="Imagick::getImageGamma" url="function.imagick-getimagegamma.php"/>
-<entry name="Imagick::getImageGeometry" url="function.imagick-getimagetqgeometry.php"/>
+<entry name="Imagick::getImageGeometry" url="function.imagick-getimagegeometry.php"/>
 <entry name="Imagick::getImageGreenPrimary" url="function.imagick-getimagegreenprimary.php"/>
 <entry name="Imagick::getImageHeight" url="function.imagick-getimageheight.php"/>
 <entry name="Imagick::getImageHistogram" url="function.imagick-getimagehistogram.php"/>
@@ -4067,7 +4067,7 @@
 <entry name="ImagickDraw::getStrokeMiterLimit" url="function.imagickdraw-getstrokemiterlimit.php"/>
 <entry name="ImagickDraw::getStrokeOpacity" url="function.imagickdraw-getstrokeopacity.php"/>
 <entry name="ImagickDraw::getStrokeWidth" url="function.imagickdraw-getstrokewidth.php"/>
-<entry name="ImagickDraw::getTextAlignment" url="function.imagickdraw-gettexttqalignment.php"/>
+<entry name="ImagickDraw::getTextAlignment" url="function.imagickdraw-gettextalignment.php"/>
 <entry name="ImagickDraw::getTextAntialias" url="function.imagickdraw-gettextantialias.php"/>
 <entry name="ImagickDraw::getTextDecoration" url="function.imagickdraw-gettextdecoration.php"/>
 <entry name="ImagickDraw::getTextEncoding" url="function.imagickdraw-gettextencoding.php"/>
@@ -4138,7 +4138,7 @@
 <entry name="ImagickDraw::setStrokeOpacity" url="function.imagickdraw-setstrokeopacity.php"/>
 <entry name="ImagickDraw::setStrokePatternURL" url="function.imagickdraw-setstrokepatternurl.php"/>
 <entry name="ImagickDraw::setStrokeWidth" url="function.imagickdraw-setstrokewidth.php"/>
-<entry name="ImagickDraw::setTextAlignment" url="function.imagickdraw-settexttqalignment.php"/>
+<entry name="ImagickDraw::setTextAlignment" url="function.imagickdraw-settextalignment.php"/>
 <entry name="ImagickDraw::setTextAntialias" url="function.imagickdraw-settextantialias.php"/>
 <entry name="ImagickDraw::setTextDecoration" url="function.imagickdraw-settextdecoration.php"/>
 <entry name="ImagickDraw::setTextEncoding" url="function.imagickdraw-settextencoding.php"/>
@@ -4679,7 +4679,7 @@
 <entry name="SWFBitmap->getWidth()" url="function.swfbitmap.getwidth.php"/>
 <entry name="SWFButton->addAction()" url="function.swfbutton.addaction.php"/>
 <entry name="SWFButton->addASound()" url="function.swfbutton.addasound.php"/>
-<entry name="SWFButton->addShape()" url="function.swfbutton.addtqshape.php"/>
+<entry name="SWFButton->addShape()" url="function.swfbutton.addshape.php"/>
 <entry name="SWFButton->__construct()" url="function.swfbutton.construct.php"/>
 <entry name="SWFButton->setAction()" url="function.swfbutton.setaction.php"/>
 <entry name="SWFButton->setDown()" url="function.swfbutton.setdown.php"/>
@@ -4723,7 +4723,7 @@
 <entry name="SWFFont->getAscent()" url="function.swffont.getascent.php"/>
 <entry name="SWFFont->getDescent()" url="function.swffont.getdescent.php"/>
 <entry name="SWFFont->getLeading()" url="function.swffont.getleading.php"/>
-<entry name="SWFFont->getShape()" url="function.swffont.gettqshape.php"/>
+<entry name="SWFFont->getShape()" url="function.swffont.getshape.php"/>
 <entry name="SWFFont->getUTF8Width()" url="function.swffont.getutf8width.php"/>
 <entry name="SWFFont->getWidth()" url="function.swffont.getwidth.php"/>
 <entry name="SWFFontChar->addChars()" url="function.swffontchar.addchars.php"/>
@@ -4731,8 +4731,8 @@
 <entry name="SWFGradient->addEntry()" url="function.swfgradient.addentry.php"/>
 <entry name="SWFGradient->__construct()" url="function.swfgradient.construct.php"/>
 <entry name="SWFMorph->__construct()" url="function.swfmorph.construct.php"/>
-<entry name="SWFMorph->getShape1()" url="function.swfmorph.gettqshape1.php"/>
-<entry name="SWFMorph->getShape2()" url="function.swfmorph.gettqshape2.php"/>
+<entry name="SWFMorph->getShape1()" url="function.swfmorph.getshape1.php"/>
+<entry name="SWFMorph->getShape2()" url="function.swfmorph.getshape2.php"/>
 <entry name="SWFMovie->add()" url="function.swfmovie.add.php"/>
 <entry name="SWFMovie->addExport()" url="function.swfmovie.addexport.php"/>
 <entry name="SWFMovie->addFont()" url="function.swfmovie.addfont.php"/>
@@ -4754,22 +4754,22 @@
 <entry name="SWFMovie->streamMP3()" url="function.swfmovie.streammp3.php"/>
 <entry name="SWFMovie->writeExports()" url="function.swfmovie.writeexports.php"/>
 <entry name="SWFPrebuiltClip->__construct()" url="function.swfprebuiltclip.construct.php"/>
-<entry name="SWFShape->addFill()" url="function.swftqshape.addfill.php"/>
-<entry name="SWFShape->__construct()" url="function.swftqshape.construct.php"/>
-<entry name="SWFShape->drawArc()" url="function.swftqshape.drawarc.php"/>
-<entry name="SWFShape->drawCircle()" url="function.swftqshape.drawcircle.php"/>
-<entry name="SWFShape->drawCubic()" url="function.swftqshape.drawcubic.php"/>
-<entry name="SWFShape->drawCubicTo()" url="function.swftqshape.drawcubicto.php"/>
-<entry name="SWFShape->drawCurve()" url="function.swftqshape.drawcurve.php"/>
-<entry name="SWFShape->drawCurveTo()" url="function.swftqshape.drawcurveto.php"/>
-<entry name="SWFShape->drawGlyph()" url="function.swftqshape.drawglyph.php"/>
-<entry name="SWFShape->drawLine()" url="function.swftqshape.drawline.php"/>
-<entry name="SWFShape->drawLineTo()" url="function.swftqshape.drawlineto.php"/>
-<entry name="SWFShape->movePen()" url="function.swftqshape.movepen.php"/>
-<entry name="SWFShape->movePenTo()" url="function.swftqshape.movepento.php"/>
-<entry name="SWFShape->setLeftFill()" url="function.swftqshape.setleftfill.php"/>
-<entry name="SWFShape->setLine()" url="function.swftqshape.setline.php"/>
-<entry name="SWFShape->setRightFill()" url="function.swftqshape.setrightfill.php"/>
+<entry name="SWFShape->addFill()" url="function.swfshape.addfill.php"/>
+<entry name="SWFShape->__construct()" url="function.swfshape.construct.php"/>
+<entry name="SWFShape->drawArc()" url="function.swfshape.drawarc.php"/>
+<entry name="SWFShape->drawCircle()" url="function.swfshape.drawcircle.php"/>
+<entry name="SWFShape->drawCubic()" url="function.swfshape.drawcubic.php"/>
+<entry name="SWFShape->drawCubicTo()" url="function.swfshape.drawcubicto.php"/>
+<entry name="SWFShape->drawCurve()" url="function.swfshape.drawcurve.php"/>
+<entry name="SWFShape->drawCurveTo()" url="function.swfshape.drawcurveto.php"/>
+<entry name="SWFShape->drawGlyph()" url="function.swfshape.drawglyph.php"/>
+<entry name="SWFShape->drawLine()" url="function.swfshape.drawline.php"/>
+<entry name="SWFShape->drawLineTo()" url="function.swfshape.drawlineto.php"/>
+<entry name="SWFShape->movePen()" url="function.swfshape.movepen.php"/>
+<entry name="SWFShape->movePenTo()" url="function.swfshape.movepento.php"/>
+<entry name="SWFShape->setLeftFill()" url="function.swfshape.setleftfill.php"/>
+<entry name="SWFShape->setLine()" url="function.swfshape.setline.php"/>
+<entry name="SWFShape->setRightFill()" url="function.swfshape.setrightfill.php"/>
 <entry name="SWFSound" url="function.swfsound.construct.php"/>
 <entry name="SWFSoundInstance->loopCount()" url="function.swfsoundinstance.loopcount.php"/>
 <entry name="SWFSoundInstance->loopInPoint()" url="function.swfsoundinstance.loopinpoint.php"/>
@@ -5063,7 +5063,7 @@
 <entry name="ps_show_xy" url="function.ps-show-xy.php"/>
 <entry name="ps_show2" url="function.ps-show2.php"/>
 <entry name="ps_show" url="function.ps-show.php"/>
-<entry name="ps_string_tqgeometry" url="function.ps-string-tqgeometry.php"/>
+<entry name="ps_string_geometry" url="function.ps-string-geometry.php"/>
 <entry name="ps_stringwidth" url="function.ps-stringwidth.php"/>
 <entry name="ps_stroke" url="function.ps-stroke.php"/>
 <entry name="ps_symbol_name" url="function.ps-symbol-name.php"/>
@@ -5096,7 +5096,7 @@
 <entry name="swf_definetext" url="function.swf-definetext.php"/>
 <entry name="swf_endbutton" url="function.swf-endbutton.php"/>
 <entry name="swf_enddoaction" url="function.swf-enddoaction.php"/>
-<entry name="swf_endtqshape" url="function.swf-endtqshape.php"/>
+<entry name="swf_endshape" url="function.swf-endshape.php"/>
 <entry name="swf_endsymbol" url="function.swf-endsymbol.php"/>
 <entry name="swf_fontsize" url="function.swf-fontsize.php"/>
 <entry name="swf_fontslant" url="function.swf-fontslant.php"/>
@@ -5124,20 +5124,20 @@
 <entry name="swf_scale" url="function.swf-scale.php"/>
 <entry name="swf_setfont" url="function.swf-setfont.php"/>
 <entry name="swf_setframe" url="function.swf-setframe.php"/>
-<entry name="swf_tqshapearc" url="function.swf-tqshapearc.php"/>
-<entry name="swf_tqshapecurveto3" url="function.swf-tqshapecurveto3.php"/>
-<entry name="swf_tqshapecurveto" url="function.swf-tqshapecurveto.php"/>
-<entry name="swf_tqshapefillbitmapclip" url="function.swf-tqshapefillbitmapclip.php"/>
-<entry name="swf_tqshapefillbitmaptile" url="function.swf-tqshapefillbitmaptile.php"/>
-<entry name="swf_tqshapefilloff" url="function.swf-tqshapefilloff.php"/>
-<entry name="swf_tqshapefillsolid" url="function.swf-tqshapefillsolid.php"/>
-<entry name="swf_tqshapelinesolid" url="function.swf-tqshapelinesolid.php"/>
-<entry name="swf_tqshapelineto" url="function.swf-tqshapelineto.php"/>
-<entry name="swf_tqshapemoveto" url="function.swf-tqshapemoveto.php"/>
+<entry name="swf_shapearc" url="function.swf-shapearc.php"/>
+<entry name="swf_shapecurveto3" url="function.swf-shapecurveto3.php"/>
+<entry name="swf_shapecurveto" url="function.swf-shapecurveto.php"/>
+<entry name="swf_shapefillbitmapclip" url="function.swf-shapefillbitmapclip.php"/>
+<entry name="swf_shapefillbitmaptile" url="function.swf-shapefillbitmaptile.php"/>
+<entry name="swf_shapefilloff" url="function.swf-shapefilloff.php"/>
+<entry name="swf_shapefillsolid" url="function.swf-shapefillsolid.php"/>
+<entry name="swf_shapelinesolid" url="function.swf-shapelinesolid.php"/>
+<entry name="swf_shapelineto" url="function.swf-shapelineto.php"/>
+<entry name="swf_shapemoveto" url="function.swf-shapemoveto.php"/>
 <entry name="swf_showframe" url="function.swf-showframe.php"/>
 <entry name="swf_startbutton" url="function.swf-startbutton.php"/>
 <entry name="swf_startdoaction" url="function.swf-startdoaction.php"/>
-<entry name="swf_starttqshape" url="function.swf-starttqshape.php"/>
+<entry name="swf_startshape" url="function.swf-startshape.php"/>
 <entry name="swf_startsymbol" url="function.swf-startsymbol.php"/>
 <entry name="swf_textwidth" url="function.swf-textwidth.php"/>
 <entry name="swf_translate" url="function.swf-translate.php"/>
@@ -5318,8 +5318,8 @@
 <entry name="CachingIterator::rewind" url="cachingiterator.rewind.php"/>
 <entry name="CachingIterator::__toString" url="cachingiterator.tostring.php"/>
 <entry name="CachingIterator::valid" url="cachingiterator.valid.php"/>
-<entry name="RecursiveCachingIterator::getChildren" url="recursivecachingiterator.gettqchildren.php"/>
-<entry name="RecursiveCachingIterator::hasChildren" url="recursivecachingiterator.hastqchildren.php"/>
+<entry name="RecursiveCachingIterator::getChildren" url="recursivecachingiterator.getchildren.php"/>
+<entry name="RecursiveCachingIterator::hasChildren" url="recursivecachingiterator.haschildren.php"/>
 <entry name="DirectoryIterator::__construct" url="directoryiterator.construct.php"/>
 <entry name="DirectoryIterator::current" url="directoryiterator.current.php"/>
 <entry name="DirectoryIterator::getATime" url="directoryiterator.getatime.php"/>
@@ -5356,12 +5356,12 @@
 <entry name="LimitIterator::rewind" url="limititerator.rewind.php"/>
 <entry name="LimitIterator::seek" url="limititerator.seek.php"/>
 <entry name="LimitIterator::valid" url="limititerator.valid.php"/>
-<entry name="ParentIterator::getChildren" url="parentiterator.gettqchildren.php"/>
-<entry name="ParentIterator::hasChildren" url="parentiterator.hastqchildren.php"/>
+<entry name="ParentIterator::getChildren" url="parentiterator.getchildren.php"/>
+<entry name="ParentIterator::hasChildren" url="parentiterator.haschildren.php"/>
 <entry name="ParentIterator::next" url="parentiterator.next.php"/>
 <entry name="ParentIterator::rewind" url="parentiterator.rewind.php"/>
-<entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.gettqchildren.php"/>
-<entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.hastqchildren.php"/>
+<entry name="RecursiveDirectoryIterator::getChildren" url="recursivedirectoryiterator.getchildren.php"/>
+<entry name="RecursiveDirectoryIterator::hasChildren" url="recursivedirectoryiterator.haschildren.php"/>
 <entry name="RecursiveDirectoryIterator::key" url="recursivedirectoryiterator.key.php"/>
 <entry name="RecursiveDirectoryIterator::next" url="recursivedirectoryiterator.next.php"/>
 <entry name="RecursiveDirectoryIterator::rewind" url="recursivedirectoryiterator.rewind.php"/>
@@ -5373,8 +5373,8 @@
 <entry name="RecursiveIteratorIterator::rewind" url="recursiveiteratoriterator.rewind.php"/>
 <entry name="RecursiveIteratorIterator::valid" url="recursiveiteratoriterator.valid.php"/>
 <entry name="SimpleXMLIterator::current" url="simplexmliterator.current.php"/>
-<entry name="SimpleXMLIterator::getChildren" url="simplexmliterator.gettqchildren.php"/>
-<entry name="SimpleXMLIterator::hasChildren" url="simplexmliterator.hastqchildren.php"/>
+<entry name="SimpleXMLIterator::getChildren" url="simplexmliterator.getchildren.php"/>
+<entry name="SimpleXMLIterator::hasChildren" url="simplexmliterator.haschildren.php"/>
 <entry name="SimpleXMLIterator::key" url="simplexmliterator.key.php"/>
 <entry name="SimpleXMLIterator::next" url="simplexmliterator.next.php"/>
 <entry name="SimpleXMLIterator::rewind" url="simplexmliterator.rewind.php"/>
@@ -5509,7 +5509,7 @@
 <entry name="tidy_set_encoding" url="function.tidy-set-encoding.php"/>
 <entry name="tidy_setopt" url="function.tidy-setopt.php"/>
 <entry name="tidy_warning_count" url="function.tidy-warning-count.php"/>
-<entry name="tidyNode->hasChildren" url="function.tidynode-hastqchildren.php"/>
+<entry name="tidyNode->hasChildren" url="function.tidynode-haschildren.php"/>
 <entry name="tidyNode->hasSiblings" url="function.tidynode-hassiblings.php"/>
 <entry name="tidyNode->isAsp" url="function.tidynode-isasp.php"/>
 <entry name="tidyNode->isComment" url="function.tidynode-iscomment.php"/>
@@ -5594,8 +5594,8 @@
 <entry name="ftp_systype" url="function.ftp-systype.php"/>
 <entry name="hw_Array2Objrec" url="function.hw-array2objrec.php"/>
 <entry name="hw_changeobject" url="function.hw-changeobject.php"/>
-<entry name="hw_Children" url="function.hw-tqchildren.php"/>
-<entry name="hw_ChildrenObj" url="function.hw-tqchildrenobj.php"/>
+<entry name="hw_Children" url="function.hw-children.php"/>
+<entry name="hw_ChildrenObj" url="function.hw-childrenobj.php"/>
 <entry name="hw_Close" url="function.hw-close.php"/>
 <entry name="hw_Connect" url="function.hw-connect.php"/>
 <entry name="hw_connection_info" url="function.hw-connection-info.php"/>
@@ -5629,7 +5629,7 @@
 <entry name="hw_GetParentsObj" url="function.hw-getparentsobj.php"/>
 <entry name="hw_getrellink" url="function.hw-getrellink.php"/>
 <entry name="hw_GetRemote" url="function.hw-getremote.php"/>
-<entry name="hw_getremotetqchildren" url="function.hw-getremotetqchildren.php"/>
+<entry name="hw_getremotechildren" url="function.hw-getremotechildren.php"/>
 <entry name="hw_GetSrcByDestObj" url="function.hw-getsrcbydestobj.php"/>
 <entry name="hw_GetText" url="function.hw-gettext.php"/>
 <entry name="hw_getusername" url="function.hw-getusername.php"/>
@@ -5661,7 +5661,7 @@
 <entry name="hw_api_attribute" url="function.hwapi-attribute.php"/>
 <entry name="hw_api->checkin" url="function.hwapi-checkin.php"/>
 <entry name="hw_api->checkout" url="function.hwapi-checkout.php"/>
-<entry name="hw_api->tqchildren" url="function.hwapi-tqchildren.php"/>
+<entry name="hw_api->children" url="function.hwapi-children.php"/>
 <entry name="hw_api_content->mimetype" url="function.hwapi-content-mimetype.php"/>
 <entry name="hw_api_content->read" url="function.hwapi-content-read.php"/>
 <entry name="hw_api->content" url="function.hwapi-content.php"/>
@@ -5731,7 +5731,7 @@
 <entry name="HttpMessage::getRequestMethod" url="function.httpmessage-getrequestmethod.php"/>
 <entry name="HttpMessage::getRequestUrl" url="function.httpmessage-getrequesturl.php"/>
 <entry name="HttpMessage::getResponseCode" url="function.httpmessage-getresponsecode.php"/>
-<entry name="HttpMessage::getResponseStatus" url="function.httpmessage-getresponsestatus.php"/>
+<entry name="HttpMessage::getResponsetStatus" url="function.httpmessage-getresponsestatus.php"/>
 <entry name="HttpMessage::getType" url="function.httpmessage-gettype.php"/>
 <entry name="HttpMessage::guessContentType" url="function.httpmessage-guesscontenttype.php"/>
 <entry name="HttpMessage::prepend" url="function.httpmessage-prepend.php"/>
@@ -5743,7 +5743,7 @@
 <entry name="HttpMessage::setRequestMethod" url="function.httpmessage-setrequestmethod.php"/>
 <entry name="HttpMessage::setRequestUrl" url="function.httpmessage-setrequesturl.php"/>
 <entry name="HttpMessage::setResponseCode" url="function.httpmessage-setresponsecode.php"/>
-<entry name="HttpMessage::setResponseStatus" url="function.httpmessage-setresponsestatus.php"/>
+<entry name="HttpMessage::setResponsetStatus" url="function.httpmessage-setresponsestatus.php"/>
 <entry name="HttpMessage::setType" url="function.httpmessage-settype.php"/>
 <entry name="HttpMessage::toMessageTypeObject" url="function.httpmessage-tomessagetypeobject.php"/>
 <entry name="HttpMessage::toString" url="function.httpmessage-tostring.php"/>
@@ -5788,7 +5788,7 @@
 <entry name="HttpRequest::getResponseHeader" url="function.httprequest-getresponseheader.php"/>
 <entry name="HttpRequest::getResponseInfo" url="function.httprequest-getresponseinfo.php"/>
 <entry name="HttpRequest::getResponseMessage" url="function.httprequest-getresponsemessage.php"/>
-<entry name="HttpRequest::getResponseStatus" url="function.httprequest-getresponsestatus.php"/>
+<entry name="HttpRequest::getResponsetStatus" url="function.httprequest-getresponsestatus.php"/>
 <entry name="HttpRequest::getSslOptions" url="function.httprequest-getssloptions.php"/>
 <entry name="HttpRequest::getUrl" url="function.httprequest-geturl.php"/>
 <entry name="HttpRequest::resetCookies" url="function.httprequest-resetcookies.php"/>
@@ -6916,7 +6916,7 @@
 <entry name="SimpleXMLElement->addChild()" url="function.simplexml-element-addChild.php"/>
 <entry name="SimpleXMLElement->asXML()" url="function.simplexml-element-asXML.php"/>
 <entry name="SimpleXMLElement->attributes()" url="function.simplexml-element-attributes.php"/>
-<entry name="SimpleXMLElement->tqchildren()" url="function.simplexml-element-tqchildren.php"/>
+<entry name="SimpleXMLElement->children()" url="function.simplexml-element-children.php"/>
 <entry name="SimpleXMLElement->__construct()" url="function.simplexml-element-construct.php"/>
 <entry name="SimpleXMLElement->getDocNamespaces()" url="function.simplexml-element-getDocNamespaces.php"/>
 <entry name="SimpleXMLElement->getName()" url="function.simplexml-element-getName.php"/>
diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp
index d5b48e9b..876a8ef2 100644
--- a/languages/php/phpcodecompletion.cpp
+++ b/languages/php/phpcodecompletion.cpp
@@ -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 c136780e..535e7a95 100644
--- a/languages/php/phpconfigwidgetbase.ui
+++ b/languages/php/phpconfigwidgetbase.ui
@@ -230,7 +230,7 @@
                                     <string>&lt;font size="+1"&gt;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.&lt;/font&gt;</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignVCenter|AlignLeft</set>
                                 </property>
                                 <property name="hAlign" stdset="0">
@@ -254,7 +254,7 @@ You need a correctly installed php cgi version.&lt;/font&gt;</string>
                                     <string>&lt;font size="+1"&gt;Uses an existing webserver. The pages are previewed in 
 the internal web browser. Please make sure that the webserver was compiled with PHP support.&lt;/font&gt;</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignVCenter|AlignLeft</set>
                                 </property>
                                 <property name="hAlign" stdset="0">
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 658812f7..52114058 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -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();