Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit f39e1b1760.

custom/custom.c

@@ -27,7 +27,7 @@ int main(int argc, char **argv)
 /*	extern void initqt(void);*/
 /*	extern void initqtaxcontainer(void);*/
 /*	extern void initqtcanvas(void);*/
-/*	extern void initext(void);*/
+/*	extern void initqtext(void);*/
 /*	extern void initqtgl(void);*/
 /*	extern void initqtnetwork(void);*/
 /*	extern void initqtsql(void);*/
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 /*		{"qt", initqt},*/
 /*		{"qtaxcontainer", initqtaxcontainer},*/
 /*		{"qtcanvas", initqtcanvas},*/
-/*		{"qtext", initext},*/
+/*		{"qtext", initqtext},*/
 /*		{"qtgl", initqtgl},*/
 /*		{"qtnetwork", initqtnetwork},*/
 /*		{"qtsql", initqtsql},*/

custom/customw.c

@@ -31,7 +31,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 /*	extern void initqt(void);*/
 /*	extern void initqtaxcontainer(void);*/
 /*	extern void initqtcanvas(void);*/
-/*	extern void initext(void);*/
+/*	extern void initqtext(void);*/
 /*	extern void initqtgl(void);*/
 /*	extern void initqtnetwork(void);*/
 /*	extern void initqtsql(void);*/
@@ -48,7 +48,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 /*		{"qt", initqt},*/
 /*		{"qtaxcontainer", initqtaxcontainer},*/
 /*		{"qtcanvas", initqtcanvas},*/
-/*		{"qtext", initext},*/
+/*		{"qtext", initqtext},*/
 /*		{"qtgl", initqtgl},*/
 /*		{"qtnetwork", initqtnetwork},*/
 /*		{"qtsql", initqtsql},*/

doc/html/_sources/using.txt

@@ -284,7 +284,7 @@ previous examples.
       instance being constructed has a parent) then ownership of the instance
       is transferred from Python to C++.  It is needed because Qt maintains
       objects (i.e. instances derived from the ``QObject`` class) in a
-      hierachy.  When an object is destroyed all of its children are also
+      hierachy.  When an object is destroyed all of its tqchildren are also
       automatically destroyed.  It is important, therefore, that the Python
       garbage collector doesn't also try and destroy them.  This is covered in
       more detail in :ref:`ref-object-ownership`.  SIP provides many other

doc/html/_static/basic.css

@@ -3,7 +3,7 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
-/* -- main layout ----------------------------------------------------------- */
+/* -- main tqlayout ----------------------------------------------------------- */
 
 div.clearer {
     clear: both;

doc/html/_static/default.css

@@ -5,7 +5,7 @@
 
 @import url("basic.css");
 
-/* -- page layout ----------------------------------------------------------- */
+/* -- page tqlayout ----------------------------------------------------------- */
 
 body {
     font-family: sans-serif;

doc/html/_static/jquery.js

@@ -1039,7 +1039,7 @@ jQuery.extend({
 		// IE uses filters for opacity
 		if ( !jQuery.support.opacity && name == "opacity" ) {
 			if ( set ) {
-				// IE has trouble with opacity if it does not have layout
+				// IE has trouble with opacity if it does not have tqlayout
 				// Force it by setting the zoom level
 				elem.zoom = 1;
 
@@ -1182,7 +1182,7 @@ jQuery.each({
 	nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
 	prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
 	siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
-	children: function(elem){return jQuery.sibling(elem.firstChild);},
+	tqchildren: function(elem){return jQuery.sibling(elem.firstChild);},
 	contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
 }, function(name, fn){
 	jQuery.fn[ name ] = function( selector ) {
@@ -1250,7 +1250,7 @@ jQuery.each({
 
 	empty: function() {
 		// Remove element nodes and prevent memory leaks
-		jQuery(this).children().remove();
+		jQuery(this).tqchildren().remove();
 
 		// Remove any remaining nodes
 		while ( this.firstChild )

doc/html/using.html

@@ -321,7 +321,7 @@ argument.  It specifies that if the argument is not 0 (i.e. the <tt class="docut
 instance being constructed has a parent) then ownership of the instance
 is transferred from Python to C++.  It is needed because TQt maintains
 objects (i.e. instances derived from the <tt class="docutils literal"><span class="pre">TQObject</span></tt> class) in a
-hierachy.  When an object is destroyed all of its children are also
+hierachy.  When an object is destroyed all of its tqchildren are also
 automatically destroyed.  It is important, therefore, that the Python
 garbage collector doesn&#8217;t also try and destroy them.  This is covered in
 more detail in <a class="reference internal" href="#ref-object-ownership"><em>Ownership of Objects</em></a>.  SIP provides many other

sipgen/gencode.c

@@ -6068,7 +6068,7 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd,
         if (!noPyTQt4TQMetaObject(cd))
             prcode(fp,
 "\n"
-"const TQMetaObject *sip%C::metaObject() const\n"
+"const TQMetaObject *sip%C::tqmetaObject() const\n"
 "{\n"
 "    return sip_%s_qt_metaobject(sipPySelf,sipType_%C);\n"
 "}\n"
@@ -8186,7 +8186,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp)
 
         if (!noPyTQt4TQMetaObject(cd))
             prcode(fp,
-"    const TQMetaObject *metaObject() const;\n"
+"    const TQMetaObject *tqmetaObject() const;\n"
                 );
     }
 

siplib/siplib.c

@@ -9208,12 +9208,12 @@ static int sipWrapper_clear(sipWrapper *self)
         }
     }
 
-    /* Detach children (which will be owned by C/C++). */
+    /* Detach tqchildren (which will be owned by C/C++). */
     while ((sw = (sipSimpleWrapper *)self->first_child) != NULL)
     {
         /*
          * Although this object is being garbage collected it doesn't follow
-         * that it's children should be.  So we make sure that the child stays
+         * that it's tqchildren should be.  So we make sure that the child stays
          * alive and remember we have done so.
          */
         Py_INCREF(sw);

sphinx/using.rst

@@ -284,7 +284,7 @@ previous examples.
       instance being constructed has a parent) then ownership of the instance
       is transferred from Python to C++.  It is needed because Qt maintains
       objects (i.e. instances derived from the ``QObject`` class) in a
-      hierachy.  When an object is destroyed all of its children are also
+      hierachy.  When an object is destroyed all of its tqchildren are also
       automatically destroyed.  It is important, therefore, that the Python
       garbage collector doesn't also try and destroy them.  This is covered in
       more detail in :ref:`ref-object-ownership`.  SIP provides many other