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

3 files changed, 23 insertions, 23 deletions

diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh
index 0cb90869..3506ead3 100644
--- a/parts/appwizard/common/incadmin/ltmain.sh
+++ b/parts/appwizard/common/incadmin/ltmain.sh
@@ -4565,7 +4565,7 @@ func_mode_link ()
 	continue
 	;;
 
-      # Tru64 UNIX uses -model [arg] to determine the tqlayout of C++
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
       -model|-arch|-isysroot)
diff --git a/parts/appwizard/common/kde-index.docbook b/parts/appwizard/common/kde-index.docbook
index aacd7a48..332d3af3 100644
--- a/parts/appwizard/common/kde-index.docbook
+++ b/parts/appwizard/common/kde-index.docbook
@@ -257,7 +257,7 @@ Programming &%{APPNAMELC}; plugins is a joy to behold. Just read through the nex
 should consult the docbook reference for further details. The example below was
 taken from that reference and shortened a bit for readability. -->
 
-<refentry id="re-1007-unmanagetqchildren-1">
+<refentry id="re-1007-unmanagechildren-1">
 <refmeta>
 <refentrytitle>XtUnmanageChildren</refentrytitle>
 <refmiscinfo>Xt - Geometry Management</refmiscinfo>
@@ -265,10 +265,10 @@ taken from that reference and shortened a bit for readability. -->
 <refnamediv>
 <refname>XtUnmanageChildren
 </refname>
-<refpurpose>remove a list of tqchildren from a parent widget's managed
+<refpurpose>remove a list of children from a parent widget's managed
 list.
-<indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
-<indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm> 
+<indexterm id="ix-1007-unmanagechildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
+<indexterm id="ix-1007-unmanagechildren-2"><primary>XtUnmanageChildren</primary></indexterm> 
 </refpurpose>
 
 </refnamediv>
@@ -277,16 +277,16 @@ list.
 <date>4 March 1996</date>
 </refsynopsisdivinfo>
 <synopsis>
-void XtUnmanageChildren(<replaceable class="parameter">tqchildren</replaceable>, <replaceable class="parameter">num_tqchildren</replaceable>)
-    WidgetList <replaceable class="parameter">tqchildren</replaceable>;
-    Cardinal <replaceable class="parameter">num_tqchildren</replaceable>;
+void XtUnmanageChildren(<replaceable class="parameter">children</replaceable>, <replaceable class="parameter">num_children</replaceable>)
+    WidgetList <replaceable class="parameter">children</replaceable>;
+    Cardinal <replaceable class="parameter">num_children</replaceable>;
 </synopsis>
 
-<refsect2 id="r2-1007-unmanagetqchildren-1">
+<refsect2 id="r2-1007-unmanagechildren-1">
 <title>Inputs</title>
 <variablelist>
 <varlistentry>
-<term><replaceable class="parameter">tqchildren</replaceable>
+<term><replaceable class="parameter">children</replaceable>
 </term>
 <listitem>
 <para>Specifies an array of child widgets. Each child must be of
@@ -295,26 +295,26 @@ class RectObj or any subclass thereof.
 </listitem>
 </varlistentry>
 <varlistentry>
-<term><replaceable class="parameter">num_tqchildren</replaceable>
+<term><replaceable class="parameter">num_children</replaceable>
 </term>
 <listitem>
-<para>Specifies the number of elements in <replaceable class="parameter">tqchildren</replaceable>.
+<para>Specifies the number of elements in <replaceable class="parameter">children</replaceable>.
 </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </refsect2></refsynopsisdiv>
 
-<refsect1 id="r1-1007-unmanagetqchildren-1">
+<refsect1 id="r1-1007-unmanagechildren-1">
 <title>Description
 </title>
 <para><function>XtUnmanageChildren()</function> unmaps the specified widgets
-and removes them from their parent's tqgeometry management.
+and removes them from their parent's geometry management.
 The widgets will disappear from the screen, and (depending
 on its parent) may no longer have screen space allocated for
 them.
 </para>
-<para>Each of the widgets in the <replaceable class="parameter">tqchildren</replaceable> array must have
+<para>Each of the widgets in the <replaceable class="parameter">children</replaceable> array must have
 the same parent.
 </para>
 <para>See the &ldquo;Algorithm&rdquo; section below for full details of the
@@ -322,13 +322,13 @@ widget unmanagement procedure.
 </para>
 </refsect1>
 
-<refsect1 id="r1-1007-unmanagetqchildren-2">
+<refsect1 id="r1-1007-unmanagechildren-2">
 <title>Usage</title>
 <para>Unmanaging widgets is the usual method for temporarily
 making them invisible.  They can be re-managed with
 <function>XtManageChildren()</function>.
 </para>
-<para>You can unmap a widget, but leave it under tqgeometry
+<para>You can unmap a widget, but leave it under geometry
 management by calling <function>XtUnmapWidget()</function>.  You can
 destroy a widget's window without destroying the widget by
 calling <function>XtUnrealizeWidget()</function>.  You can destroy a
@@ -345,7 +345,7 @@ method once.
 </para>
 </refsect1>
 
-<refsect1 id="r1-1007-unmanagetqchildren-3">
+<refsect1 id="r1-1007-unmanagechildren-3">
 <title>Algorithm
 </title>
 <para><function>XtUnmanageChildren()</function> performs the following:
@@ -374,11 +374,11 @@ by unmapping it.
 </para>
 </refsect1>
 
-<refsect1 id="r1-1007-unmanagetqchildren-4">
+<refsect1 id="r1-1007-unmanagechildren-4">
 <title>Structures</title>
 <para>The <type>WidgetList</type> type is simply an array of widgets:
 </para>
-<screen id="sc-1007-unmanagetqchildren-1">typedef Widget *WidgetList;
+<screen id="sc-1007-unmanagechildren-1">typedef Widget *WidgetList;
 </screen>
 </refsect1>
 </refentry>
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index 037b4af0..2e875b75 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -117,15 +117,15 @@ def detect_kde(env):
 
 	## check for the qt and kde includes
 	print "Checking for the qt includes      : ",
-	if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"):
+	if qtincludes and os.path.isfile(qtincludes + "/qlayout.h"):
 		# The user told where to look for and it looks valid
 		print GREEN + "ok " + qtincludes + NORMAL
 	else:
-		if os.path.isfile(qtdir + "/include/qtqlayout.h"):
+		if os.path.isfile(qtdir + "/include/qlayout.h"):
 			# Automatic detection
 			print GREEN + "ok " + qtdir + "/include/ " + NORMAL
 			qtincludes = qtdir + "/include/"
-		elif os.path.isfile("/usr/include/qt3/qtqlayout.h"):
+		elif os.path.isfile("/usr/include/qt3/qlayout.h"):
 			# Debian probably
 			print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL
 			qtincludes = "/usr/include/qt3"