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

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.

10 files changed, 63 insertions, 63 deletions

diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 8498f392..eb3fb4f6 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -27,8 +27,8 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqregexp.h>
-#include <textstream.h>
-#include <textview.h>
+#include <tqtextstream.h>
+#include <tqtextview.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 #include <tqvalidator.h>
@@ -61,7 +61,7 @@
 #include <kfileitem.h>
 #include <kio/chmodjob.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "domutil.h"
 #include "kdevversioncontrol.h"
@@ -486,7 +486,7 @@ void AppWizardDialog::accept()
 	}
 	else
 	{
-		KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").arg( source + "/" + m_pCurrentAppInfo->sourceArchive ) );
+		KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").tqarg( source + "/" + m_pCurrentAppInfo->sourceArchive ) );
 		templateArchive.close();
 		return;
 	}
@@ -509,7 +509,7 @@ void AppWizardDialog::accept()
 	m_pCurrentAppInfo->subMap.insert("EMAIL", email_edit->text() );
 	m_pCurrentAppInfo->subMap.insert("VERSION", version_edit->text());
 	m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" );
-	m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) );
+	m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::tqcurrentDate().year() ) );
 
 	// This isn't too pretty, but we have several templates that use KAboutData::License_${LICENSE}
 	// and unsurprisingly, KAboutData doesn't cover every imaginable case.
@@ -543,7 +543,7 @@ void AppWizardDialog::accept()
 
 	// This is too silly for words, but it's either this or reimplementing FileTemplate
 	TQString tempProjectDomSource = "<!DOCTYPE tdevelop><tdevelop><general><author>%1</author><email>%2</email><version>%3</version></general></tdevelop>";
-	tempProjectDomSource = tempProjectDomSource.arg( author_edit->text() ).arg( email_edit->text() ).arg( version_edit->text() );
+	tempProjectDomSource = tempProjectDomSource.tqarg( author_edit->text() ).tqarg( email_edit->text() ).tqarg( version_edit->text() );
 	TQDomDocument tempProjectDom;
 	tempProjectDom.setContent( tempProjectDomSource );
 
@@ -559,13 +559,13 @@ void AppWizardDialog::accept()
 		temps.setEncoding(TQTextStream::UnicodeUTF8);
 		temps << templateText;
 		f.flush();
-		TQString templateName( TQString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() );
+		TQString templateName( TQString( "%1_TEMPLATE" ).tqarg( (*it).suffix ).upper() );
 		cleanUpSubstMap << templateName;
 		m_pCurrentAppInfo->subMap.insert( templateName, KMacroExpander::expandMacros(templateText , m_pCurrentAppInfo->subMap)  );
 
 		installFile file;
 		file.source = tempFile->name();
-		file.dest = TQString( "%{dest}/templates/%1" ).arg( (*it).suffix );
+		file.dest = TQString( "%{dest}/templates/%1" ).tqarg( (*it).suffix );
 		file.process = true;
 		file.isXML = false;
 		m_pCurrentAppInfo->fileList.append( file );
@@ -585,8 +585,8 @@ void AppWizardDialog::accept()
 			for( ; it != files.end(); ++it )
 			{
 				installFile file;
-				file.source = TQString( "%{tdevelop}/template-common/%1" ).arg( *it );
-				file.dest = TQString("%{dest}/%1").arg( *it );
+				file.source = TQString( "%{tdevelop}/template-common/%1" ).tqarg( *it );
+				file.dest = TQString("%{dest}/%1").tqarg( *it );
 				file.process = true;
 				file.isXML = false;
 				m_pCurrentAppInfo->fileList.append( file );
@@ -645,7 +645,7 @@ void AppWizardDialog::accept()
 		{
 			if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) )
 			{
-				KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").arg( (*dirIt).dir ) );
+				KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").tqarg( (*dirIt).dir ) );
 				return;
 			}
 		}
@@ -664,7 +664,7 @@ void AppWizardDialog::accept()
 			}
 			else
 			{
-				KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").arg( (*archIt).source ) );
+				KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").tqarg( (*archIt).source ) );
 				archive.close();
 				return;
 			}
@@ -682,7 +682,7 @@ void AppWizardDialog::accept()
 		{
 			if( !copyFile( *fileIt ) )
 			{
-				KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( (*fileIt).dest) );
+				KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( (*fileIt).dest) );
 				return;
 			}
 			setPermissions(*fileIt);
@@ -824,7 +824,7 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQStrin
 				// ( where should we currently get that info from? )
 				if ( !copyFile( TQDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) )
 				{
-					KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( dest) );
+					KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( dest) );
 					return;
 				}
 				setPermissions(file, dest + "/" + file->name());
@@ -893,7 +893,7 @@ void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item)
             if (it == l.end())
                 m_lastPage = edit;
             fileTemplate.edit = edit;
-            addPage(edit, i18n("Template for .%1 Files").arg(fileTemplate.suffix));
+            addPage(edit, i18n("Template for .%1 Files").tqarg(fileTemplate.suffix));
             m_fileTemplates.append(fileTemplate);
         }
         licenseChanged();	// to populate the template views
@@ -919,7 +919,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir)
         TQDir newDir (dir);
         kdDebug(9010) << "DevPrjDir == newdir?: " << defPrjDir.absPath() << " == " << newDir.absPath() << endl;
         if (defPrjDir != newDir) {
-            if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").arg( newDir.absPath() ),
+            if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").tqarg( newDir.absPath() ),
                                            i18n("New Project"), i18n("Set"), i18n("Do Not Set")) == KMessageBox::Yes)
             {
                 config->writePathEntry("DefaultProjectsDir", newDir.absPath() + "/");
@@ -1015,7 +1015,7 @@ void AppWizardDialog::openAfterGeneration()
 	{
 		KMessageBox::sorry( 0, i18n("This is not a valid project file.\n"
 				"XML error in line %1, column %2:\n%3")
-				.arg(errorLine).arg(errorCol).arg(errorMsg));
+				.tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg));
 		return;
 	}
 
@@ -1023,7 +1023,7 @@ void AppWizardDialog::openAfterGeneration()
 	DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap );
 
 	//save the selected vcs
-	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText()));
+	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").tqarg(m_vcsForm->combo->currentText()));
 	if (offers.count() == 1)
 	{
 		KService::Ptr service = offers.first();
@@ -1318,7 +1318,7 @@ void AppWizardDialog::showTemplates(bool all)
 		TQDictIterator<TQListViewItem> dit(m_categoryMap);
 		for (; dit.current(); ++dit)
 		{
-			//checking whether all children are not visible
+			//checking whether all tqchildren are not visible
 			kdDebug(9010) << "check: " << dit.current()->text(0) << endl;
 			bool visible = false;
 			TQListViewItemIterator it(dit.current());
diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui
index 525aeef0..902be185 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -139,13 +139,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>250</width>
                         <height>180</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>250</width>
                         <height>180</height>
@@ -160,7 +160,7 @@
                 <property name="scaledContents">
                     <bool>true</bool>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>AlignCenter</set>
                 </property>
                 <property name="hAlign" stdset="0">
@@ -179,7 +179,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout2</cstring>
+                            <cstring>tqlayout2</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -219,7 +219,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout1</cstring>
+                            <cstring>tqlayout1</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -286,13 +286,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>250</width>
                         <height>0</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>250</width>
                         <height>32767</height>
@@ -345,7 +345,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout6</cstring>
+                            <cstring>tqlayout6</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -388,7 +388,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout8</cstring>
+                            <cstring>tqlayout8</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -422,7 +422,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout7</cstring>
+                                    <cstring>tqlayout7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -491,7 +491,7 @@
                         <verstretch>1</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>550</width>
                         <height>270</height>
diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh
index 3506ead3..0cb90869 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 layout of C++
+      # Tru64 UNIX uses -model [arg] to determine the tqlayout 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 332d3af3..aacd7a48 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-unmanagechildren-1">
+<refentry id="re-1007-unmanagetqchildren-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 children from a parent widget's managed
+<refpurpose>remove a list of tqchildren from a parent widget's managed
 list.
-<indexterm id="ix-1007-unmanagechildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
-<indexterm id="ix-1007-unmanagechildren-2"><primary>XtUnmanageChildren</primary></indexterm> 
+<indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
+<indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm> 
 </refpurpose>
 
 </refnamediv>
@@ -277,16 +277,16 @@ list.
 <date>4 March 1996</date>
 </refsynopsisdivinfo>
 <synopsis>
-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>;
+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>;
 </synopsis>
 
-<refsect2 id="r2-1007-unmanagechildren-1">
+<refsect2 id="r2-1007-unmanagetqchildren-1">
 <title>Inputs</title>
 <variablelist>
 <varlistentry>
-<term><replaceable class="parameter">children</replaceable>
+<term><replaceable class="parameter">tqchildren</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_children</replaceable>
+<term><replaceable class="parameter">num_tqchildren</replaceable>
 </term>
 <listitem>
-<para>Specifies the number of elements in <replaceable class="parameter">children</replaceable>.
+<para>Specifies the number of elements in <replaceable class="parameter">tqchildren</replaceable>.
 </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </refsect2></refsynopsisdiv>
 
-<refsect1 id="r1-1007-unmanagechildren-1">
+<refsect1 id="r1-1007-unmanagetqchildren-1">
 <title>Description
 </title>
 <para><function>XtUnmanageChildren()</function> unmaps the specified widgets
-and removes them from their parent's geometry management.
+and removes them from their parent's tqgeometry 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">children</replaceable> array must have
+<para>Each of the widgets in the <replaceable class="parameter">tqchildren</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-unmanagechildren-2">
+<refsect1 id="r1-1007-unmanagetqchildren-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 geometry
+<para>You can unmap a widget, but leave it under tqgeometry
 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-unmanagechildren-3">
+<refsect1 id="r1-1007-unmanagetqchildren-3">
 <title>Algorithm
 </title>
 <para><function>XtUnmanageChildren()</function> performs the following:
@@ -374,11 +374,11 @@ by unmapping it.
 </para>
 </refsect1>
 
-<refsect1 id="r1-1007-unmanagechildren-4">
+<refsect1 id="r1-1007-unmanagetqchildren-4">
 <title>Structures</title>
 <para>The <type>WidgetList</type> type is simply an array of widgets:
 </para>
-<screen id="sc-1007-unmanagechildren-1">typedef Widget *WidgetList;
+<screen id="sc-1007-unmanagetqchildren-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 2e875b75..037b4af0 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 + "/qlayout.h"):
+	if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"):
 		# The user told where to look for and it looks valid
 		print GREEN + "ok " + qtincludes + NORMAL
 	else:
-		if os.path.isfile(qtdir + "/include/qlayout.h"):
+		if os.path.isfile(qtdir + "/include/qtqlayout.h"):
 			# Automatic detection
 			print GREEN + "ok " + qtdir + "/include/ " + NORMAL
 			qtincludes = qtdir + "/include/"
-		elif os.path.isfile("/usr/include/qt3/qlayout.h"):
+		elif os.path.isfile("/usr/include/qt3/qtqlayout.h"):
 			# Debian probably
 			print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL
 			qtincludes = "/usr/include/qt3"
diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp
index d83be6c3..3e946abf 100644
--- a/parts/appwizard/filepropspage.cpp
+++ b/parts/appwizard/filepropspage.cpp
@@ -1,7 +1,7 @@
 #include "filepropspage.h"
 #include <tqlistbox.h>
 #include <klineedit.h>
-#include <textview.h>
+#include <tqtextview.h>
 #include <klocale.h>
 #include <tqlabel.h>
 #include <tqmultilineedit.h>
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 6234d81c..82662921 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -15,11 +15,11 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klineedit.h>
 #include <tqpushbutton.h>
 #include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqtooltip.h>
 #include <tqcheckbox.h>
 #include <kbuttonbox.h>
@@ -151,7 +151,7 @@ void ImportDialog::accept()
     {
         KMessageBox::sorry( 0, i18n("This is not a valid project file.\n"
                 "XML error in line %1, column %2:\n%3")
-                .arg(errorLine).arg(errorCol).arg(errorMsg));
+                .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg));
         return;
     }
 
diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui
index 957bb80d..29687ff9 100644
--- a/parts/appwizard/importdlgbase.ui
+++ b/parts/appwizard/importdlgbase.ui
@@ -127,7 +127,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -208,7 +208,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -276,7 +276,7 @@ will be the author, everything between
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp
index 5e189422..1357c774 100644
--- a/parts/appwizard/kdevlicense.cpp
+++ b/parts/appwizard/kdevlicense.cpp
@@ -70,12 +70,12 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const
 		strFill + " *   $EMAIL$   *\n" +
 		strFill + " *                                                                         *\n";
 	
-//	str = str.arg(TQDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67);
+//	str = str.tqarg(TQDate::tqcurrentDate().year()).tqarg(author.left(45),-45).tqarg(email.left(67),-67);
 	
 	TQStringList::Iterator it;
 	for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it )
 	{
-		str += TQString( "%1 *   %2 *\n").arg( strFill ).arg( *it, -69 );
+		str += TQString( "%1 *   %2 *\n").tqarg( strFill ).tqarg( *it, -69 );
 	}
 	
 	str += strFill + " ***************************************************************************/\n";
diff --git a/parts/appwizard/vcs_form.ui b/parts/appwizard/vcs_form.ui
index 6bb59c93..9ac7dba9 100644
--- a/parts/appwizard/vcs_form.ui
+++ b/parts/appwizard/vcs_form.ui
@@ -58,7 +58,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>110</width>
                     <height>20</height>