5 files changed, 25 insertions, 25 deletions
diff --git a/languages/php/data/phpfunctions b/languages/php/data/phpfunctions
index d43bcb72..d5b80245 100644
--- a/languages/php/data/phpfunctions
+++ b/languages/php/data/phpfunctions
@@ -345,7 +345,7 @@ hw:[array|int] hw_getremotetqchildren(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)
-hw:void hw_insertdocument(int link, int tqparentid, hwdoc doc)
+hw:void hw_insertdocument(int link, int parentid, hwdoc doc)
 hw:hwdoc hw_new_document(string objrec, string data, int size)
 hw:void hw_free_document(hwdoc doc)
 hw:void hw_outputdocument(hwdoc doc)
@@ -358,8 +358,8 @@ hw:int hw_documentsize(hwdoc doc)
 hw:int hw_document_size(hwdoc doc)
 hw:string hw_documentattributes(hwdoc doc)
 hw:string hw_document_attributes(hwdoc doc)
-hw:array hw_gettqparentsobj(int link, int objid)
-hw:array hw_gettqparents(int link, int objid)
+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_getchildcoll(int link, int objid)
@@ -379,8 +379,8 @@ hw:void hw_identify(int link, string username, string password)
 hw:array hw_objrec2array(string objrec, [array format])
 hw:string hw_array2objrec(array objarr)
 hw:array hw_incollections(int link, array objids, array collids, int para)
-hw:void hw_inscoll(int link, int tqparentid, array objarr)
-hw:void hw_insdoc(int link, int tqparentid, string objrec [, string text])
+hw:void hw_inscoll(int link, int parentid, array objarr)
+hw:void hw_insdoc(int link, int parentid, string objrec [, string text])
 hw:int hw_getsrcbydestobj(int link, int destid)
 hw:int hw_mapid(int link, int serverid, int destid)
 hw:string hw_getrellink(int link, int rootid, int sourceid, int destid)
diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc
index f3feeef8..57a096d2 100644
--- a/languages/php/doc/php.toc
+++ b/languages/php/doc/php.toc
@@ -806,7 +806,7 @@
     <tocsect2 name="DirectoryIterator" url="class.directoryiterator.php"/>
     <tocsect2 name="FilterIterator" url="class.filteriterator.php"/>
     <tocsect2 name="LimitIterator" url="class.limititerator.php"/>
-    <tocsect2 name="ParentIterator" url="class.tqparentiterator.php"/>
+    <tocsect2 name="ParentIterator" url="class.parentiterator.php"/>
     <tocsect2 name="RecursiveDirectoryIterator" url="class.recursivedirectoryiterator.php"/>
     <tocsect2 name="RecursiveIteratorIterator" url="class.recursiveiteratoriterator.php"/>
     <tocsect2 name="SimpleXMLIterator" url="class.simplexmliterator.php"/>
@@ -4026,7 +4026,7 @@
 <entry name="Imagick::transverseImage" url="function.imagick-transverseimage.php"/>
 <entry name="Imagick::trimImage" url="function.imagick-trimimage.php"/>
 <entry name="Imagick::uniqueImageColors" url="function.imagick-uniqueimagecolors.php"/>
-<entry name="Imagick::unsharpMaskImage" url="function.imagick-unsharptqmaskimage.php"/>
+<entry name="Imagick::unsharpMaskImage" url="function.imagick-unsharpmaskimage.php"/>
 <entry name="Imagick::valid" url="function.imagick-valid.php"/>
 <entry name="Imagick::vignetteImage" url="function.imagick-vignetteimage.php"/>
 <entry name="Imagick::waveImage" url="function.imagick-waveimage.php"/>
@@ -4648,7 +4648,7 @@
 <entry name="HaruImage::getSize" url="function.haruimage-getsize.php"/>
 <entry name="HaruImage::getWidth" url="function.haruimage-getwidth.php"/>
 <entry name="HaruImage::setColorMask" url="function.haruimage-setcolortqmask.php"/>
-<entry name="HaruImage::setMaskImage" url="function.haruimage-settqmaskimage.php"/>
+<entry name="HaruImage::setMaskImage" url="function.haruimage-setmaskimage.php"/>
 <entry name="HaruEncoder::getByteType" url="function.haruencoder-getbytetype.php"/>
 <entry name="HaruEncoder::getType" url="function.haruencoder-gettype.php"/>
 <entry name="HaruEncoder::getUnicode" url="function.haruencoder-gettqunicode.php"/>
@@ -4706,7 +4706,7 @@
 <entry name="SWFDisplayItem->scale()" url="function.swfdisplayitem.scale.php"/>
 <entry name="SWFDisplayItem->scaleTo()" url="function.swfdisplayitem.scaleto.php"/>
 <entry name="SWFDisplayItem->setDepth()" url="function.swfdisplayitem.setdepth.php"/>
-<entry name="SWFDisplayItem->setMaskLevel()" url="function.swfdisplayitem.settqmasklevel.php"/>
+<entry name="SWFDisplayItem->setMaskLevel()" url="function.swfdisplayitem.setmasklevel.php"/>
 <entry name="SWFDisplayItem->setMatrix()" url="function.swfdisplayitem.setmatrix.php"/>
 <entry name="SWFDisplayItem->setName()" url="function.swfdisplayitem.setname.php"/>
 <entry name="SWFDisplayItem->setRatio()" url="function.swfdisplayitem.setratio.php"/>
@@ -5288,7 +5288,7 @@
 <entry name="parsekit_compile_string" url="function.parsekit-compile-string.php"/>
 <entry name="parsekit_func_arginfo" url="function.parsekit-func-arginfo.php"/>
 <entry name="class_implements" url="function.class-implements.php"/>
-<entry name="class_parents" url="function.class-tqparents.php"/>
+<entry name="class_parents" url="function.class-parents.php"/>
 <entry name="iterator_count" url="function.iterator-count.php"/>
 <entry name="iterator_to_array" url="function.iterator-to-array.php"/>
 <entry name="spl_autoload_call" url="function.spl-autoload-call.php"/>
@@ -5356,10 +5356,10 @@
 <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="tqparentiterator.gettqchildren.php"/>
-<entry name="ParentIterator::hasChildren" url="tqparentiterator.hastqchildren.php"/>
-<entry name="ParentIterator::next" url="tqparentiterator.next.php"/>
-<entry name="ParentIterator::rewind" url="tqparentiterator.rewind.php"/>
+<entry name="ParentIterator::getChildren" url="parentiterator.gettqchildren.php"/>
+<entry name="ParentIterator::hasChildren" url="parentiterator.hastqchildren.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::key" url="recursivedirectoryiterator.key.php"/>
@@ -5625,8 +5625,8 @@
 <entry name="hw_GetObjectByQueryColl" url="function.hw-getobjectbyquerycoll.php"/>
 <entry name="hw_GetObjectByQueryCollObj" url="function.hw-getobjectbyquerycollobj.php"/>
 <entry name="hw_GetObjectByQueryObj" url="function.hw-getobjectbyqueryobj.php"/>
-<entry name="hw_GetParents" url="function.hw-gettqparents.php"/>
-<entry name="hw_GetParentsObj" url="function.hw-gettqparentsobj.php"/>
+<entry name="hw_GetParents" url="function.hw-getparents.php"/>
+<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"/>
@@ -5696,7 +5696,7 @@
 <entry name="hw_api_object->value" url="function.hwapi-object-value.php"/>
 <entry name="hw_api->object" url="function.hwapi-object.php"/>
 <entry name="hw_api->objectbyanchor" url="function.hwapi-objectbyanchor.php"/>
-<entry name="hw_api->tqparents" url="function.hwapi-tqparents.php"/>
+<entry name="hw_api->parents" url="function.hwapi-parents.php"/>
 <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"/>
@@ -5727,7 +5727,7 @@
 <entry name="HttpMessage::getHeader" url="function.httpmessage-getheader.php"/>
 <entry name="HttpMessage::getHeaders" url="function.httpmessage-getheaders.php"/>
 <entry name="HttpMessage::getHttpVersion" url="function.httpmessage-gethttpversion.php"/>
-<entry name="HttpMessage::getParentMessage" url="function.httpmessage-gettqparentmessage.php"/>
+<entry name="HttpMessage::getParentMessage" url="function.httpmessage-getparentmessage.php"/>
 <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"/>
@@ -6856,7 +6856,7 @@
 <entry name="DomNode->node_type" url="function.domnode-node-type.php"/>
 <entry name="DomNode->node_value" url="function.domnode-node-value.php"/>
 <entry name="DomNode->owner_document" url="function.domnode-owner-document.php"/>
-<entry name="DomNode->tqparent_node" url="function.domnode-tqparent-node.php"/>
+<entry name="DomNode->parent_node" url="function.domnode-tqparent-node.php"/>
 <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"/>
diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui
index 0c926873..962ac2a9 100644
--- a/languages/php/phpconfigwidgetbase.ui
+++ b/languages/php/phpconfigwidgetbase.ui
@@ -556,6 +556,6 @@ the internal web browser. Please make sure that the webserver was compiled with
     <slot>slotPHPIniButtonClicked()</slot>
     <slot>slotZendButtonClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/php/phpinfodlg.ui b/languages/php/phpinfodlg.ui
index 5d048211..c4f26dfb 100644
--- a/languages/php/phpinfodlg.ui
+++ b/languages/php/phpinfodlg.ui
@@ -82,6 +82,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/php/phpnewclassdlgbase.ui b/languages/php/phpnewclassdlgbase.ui
index 5084fb51..5ddb336a 100644
--- a/languages/php/phpnewclassdlgbase.ui
+++ b/languages/php/phpnewclassdlgbase.ui
@@ -193,8 +193,8 @@ class CLASSNAME extends BASECLASS {
     <include location="global" impldecl="in declaration">klineedit.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>