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

17 files changed, 65 insertions, 65 deletions

diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp
index 659fe47f..0512be78 100644
--- a/buildtools/lib/parsers/autotools/autotoolsast.cpp
+++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp
@@ -28,7 +28,7 @@ namespace AutoTools {
 
 AST::~AST()
 {
-	for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+	for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
 	{
 		AST *node = *it;
 		delete node;
@@ -37,13 +37,13 @@ AST::~AST()
 
 void AST::addChildAST(AST *node)
 {
-	m_tqchildren.append(node);
+	m_children.append(node);
 }
 
 void AST::writeBack(TQString &buffer)
 {
-	for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin();
-	     it != m_tqchildren.constEnd(); ++it)
+	for (TQValueList<AST*>::const_iterator it = m_children.constBegin();
+	     it != m_children.constEnd(); ++it)
 	{
 		if (*it)
 			(*it)->writeBack(buffer);
@@ -60,12 +60,12 @@ TQString AST::indentation()
 
 bool AST::hasChildren() const
 {
-	return !m_tqchildren.isEmpty();
+	return !m_children.isEmpty();
 }
 
-TQValueList<AST*> AST::tqchildren() const
+TQValueList<AST*> AST::children() const
 {
-	return m_tqchildren;
+	return m_children;
 }
 
 //ProjectAST
diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h
index 0f5dcdc9..adefc640 100644
--- a/buildtools/lib/parsers/autotools/autotoolsast.h
+++ b/buildtools/lib/parsers/autotools/autotoolsast.h
@@ -37,7 +37,7 @@ namespace AutoTools
  * AST node.
  * This is the base class. Objects of this type are not created by the parser.
  *
- * Each AST node holds the list of its tqchildren which are always deleted in the
+ * Each AST node holds the list of its children which are always deleted in the
  * destructor. This way, it's possible call delete for only root AST node and
  * others will be deleted automatically.
  *
@@ -85,20 +85,20 @@ public:
 	/** @return The indentation string based on node depth.*/
 	virtual TQString indentation();
 	
-	//! \return true if this AST has tqchildren
+	//! \return true if this AST has children
 	bool hasChildren() const;
 
 	/**
-	 * Get the tqchildren of this ast
+	 * Get the children of this ast
 	 * \return the list of this ast's childre
 	 */
-	TQValueList<AST*> tqchildren() const;
+	TQValueList<AST*> children() const;
 
 
 	
 protected:
 	NodeType m_nodeType;
-	TQValueList<AST*> m_tqchildren;
+	TQValueList<AST*> m_children;
 	
 private:
 	int m_depth;
diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp
index 2693a68c..48cb4f5d 100644
--- a/buildtools/lib/parsers/autotools/tests/viewer.cpp
+++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp
@@ -23,9 +23,9 @@
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqfiledialog.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqlistview.h>
 #include <tqtabwidget.h>
 
diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
index e319e2b4..7a00a47a 100644
--- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1" rowspan="4" colspan="1">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -128,7 +128,7 @@
             <property name="name">
                 <cstring>allLocation</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
@@ -139,7 +139,7 @@
             <property name="name">
                 <cstring>addAll</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
@@ -153,7 +153,7 @@
             <property name="name">
                 <cstring>choose</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
@@ -175,7 +175,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>150</width>
                     <height>32767</height>
diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp
index 5f55af4b..90306ff1 100644
--- a/buildtools/lib/parsers/qmake/qmakeast.cpp
+++ b/buildtools/lib/parsers/qmake/qmakeast.cpp
@@ -27,28 +27,28 @@ namespace TQMake {
 
 AST::~AST()
 {
-    for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+    for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
     {
         AST *node = *it;
         delete node;
     }
-    m_tqchildren.clear();
+    m_children.clear();
 }
 
 void AST::addChildAST(AST *node)
 {
-    m_tqchildren.append(node);
+    m_children.append(node);
 }
 
 void AST::removeChildAST(AST *node)
 {
-    m_tqchildren.remove(node);
+    m_children.remove(node);
 }
 
 void AST::writeBack(TQString &buffer)
 {
-    for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin();
-        it != m_tqchildren.constEnd(); ++it)
+    for (TQValueList<AST*>::const_iterator it = m_children.constBegin();
+        it != m_children.constEnd(); ++it)
     {
         if (*it)
         {
@@ -70,7 +70,7 @@ TQString AST::indentation()
 void ProjectAST::writeBack(TQString &buffer)
 {
     bool hasActualStatements = false;
-    for (TQValueList<TQMake::AST*>::const_iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+    for (TQValueList<TQMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it)
     {
         if ((*it)->nodeType() != AST::IncludeAST)
         {
@@ -84,7 +84,7 @@ void ProjectAST::writeBack(TQString &buffer)
         if( !buffer.endsWith(": ") )
             buffer += indentation();
         buffer += scopedID;
-	if( m_tqchildren.count() == 1 )
+	if( m_children.count() == 1 )
 	    buffer += " : ";
         else
             buffer += " {";
@@ -94,9 +94,9 @@ void ProjectAST::writeBack(TQString &buffer)
         if( !buffer.endsWith(": ") )
             buffer += indentation();
         buffer += scopedID + "(" + args + ")";
-	if( m_tqchildren.count() == 1 && hasActualStatements )
+	if( m_children.count() == 1 && hasActualStatements )
             buffer += ": ";
-        else if( (m_tqchildren.count() > 0 && hasActualStatements) )
+        else if( (m_children.count() > 0 && hasActualStatements) )
             buffer += "{";
         else
             buffer += "";
@@ -104,10 +104,10 @@ void ProjectAST::writeBack(TQString &buffer)
     else if( !buffer.endsWith(": ") )
         buffer += indentation();
     AST::writeBack(buffer);
-    if (isScope() && m_tqchildren.count() > 1 )
+    if (isScope() && m_children.count() > 1 )
         buffer += indentation() + "}";
 
-    if (isFunctionScope() && (hasActualStatements) && m_tqchildren.count() > 1)
+    if (isFunctionScope() && (hasActualStatements) && m_children.count() > 1)
         buffer += indentation() + "}";
 }
 
diff --git a/buildtools/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h
index a0c5c1de..15929d2d 100644
--- a/buildtools/lib/parsers/qmake/qmakeast.h
+++ b/buildtools/lib/parsers/qmake/qmakeast.h
@@ -33,7 +33,7 @@ namespace TQMake {
 AST node.
 This is the base class. Objects of this type are not created by the parser.
 
-Each AST node holds the list of its tqchildren which are always deleted in the
+Each AST node holds the list of its children which are always deleted in the
 destructor. This way, it's possible call delete for only root AST node and
 others will be deleted automatically.
 
@@ -79,7 +79,7 @@ public:
     virtual TQString indentation();
 
     /**The list of child AST nodes.*/
-    TQValueList<AST*> m_tqchildren;
+    TQValueList<AST*> m_children;
 
 protected:
     NodeType m_nodeType;
diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp
index b733a880..8740f16a 100644
--- a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp
+++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp
@@ -29,8 +29,8 @@ void ASTVisitor::processProject(ProjectAST *project)
         enterScope(project);
     else if (project->isFunctionScope())
         enterFunctionScope(project);
-    for (TQValueList<TQMake::AST*>::const_iterator it = project->m_tqchildren.constBegin();
-         it != project->m_tqchildren.constEnd(); ++it)
+    for (TQValueList<TQMake::AST*>::const_iterator it = project->m_children.constBegin();
+         it != project->m_children.constEnd(); ++it)
     {
         AST *ast = *it;
         if (ast == 0)
diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp
index eef16513..dbcc7db7 100644
--- a/buildtools/lib/parsers/qmake/tests/viewer.cpp
+++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp
@@ -23,9 +23,9 @@
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqfiledialog.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqlistview.h>
 #include <tqtabwidget.h>
 
diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
index 1308cc1d..c76abc20 100644
--- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
@@ -28,7 +28,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout4</cstring>
+                    <cstring>layout4</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -38,7 +38,7 @@
                         <property name="name">
                             <cstring>allLocation</cstring>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -49,7 +49,7 @@
                         <property name="name">
                             <cstring>addAll</cstring>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -63,7 +63,7 @@
                         <property name="name">
                             <cstring>choose</cstring>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -85,7 +85,7 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp
index f66bbe93..80ba96a0 100644
--- a/buildtools/lib/widgets/addenvvardlg.cpp
+++ b/buildtools/lib/widgets/addenvvardlg.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <klocale.h>
@@ -47,10 +47,10 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
     connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
 
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
 
     TQGridLayout *grid = new TQGridLayout(2, 2);
-    tqlayout->addLayout(grid);
+    layout->addLayout(grid);
     grid->addWidget(varname_label, 0, 0);
     grid->addWidget(varname_edit, 0, 1);
     grid->addWidget(value_label, 1, 0);
@@ -58,7 +58,7 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
 
     TQFrame *frame = new TQFrame(this);
     frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    tqlayout->addWidget(frame, 0);
+    layout->addWidget(frame, 0);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     buttonbox->addStretch();
@@ -67,8 +67,8 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
     m_pOk->setDefault(true);
     connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->tqlayout();
-    tqlayout->addWidget(buttonbox, 0);
+    buttonbox->layout();
+    layout->addWidget(buttonbox, 0);
     slotTextChanged();
 }
 
diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
index e19d27a0..5388fe59 100644
--- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui
+++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
@@ -61,7 +61,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -77,7 +77,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>321</width>
                             <height>21</height>
diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui
index c06239f7..e7246de3 100644
--- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui
+++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui
@@ -121,7 +121,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
@@ -146,7 +146,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>171</height>
diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp
index 13b1391a..71c44377 100644
--- a/buildtools/lib/widgets/envvartools.cpp
+++ b/buildtools/lib/widgets/envvartools.cpp
@@ -23,7 +23,7 @@
 TQString EnvVarTools::quote( const TQString & arg )
 {
     TQString res = arg;
-    res.replace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''"));
+    res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''"));
     res.prepend("\"");
     res.append("\"");
     return res;
diff --git a/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui
index 4f0829ae..9caba3ee 100644
--- a/buildtools/lib/widgets/makeoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/makeoptionswidgetbase.ui
@@ -105,7 +105,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>121</width>
                     <height>20</height>
@@ -122,7 +122,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui
index e891ff07..d5206ac6 100644
--- a/buildtools/lib/widgets/removesubprojectdlgbase.ui
+++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui
@@ -23,13 +23,13 @@
             <property name="name">
                 <cstring>fileGroupBox</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>140</height>
@@ -65,7 +65,7 @@
                     <property name="name">
                         <cstring>noticeLabel</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
@@ -98,7 +98,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui
index 40d79634..30f10e48 100644
--- a/buildtools/lib/widgets/runoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/runoptionswidgetbase.ui
@@ -51,7 +51,7 @@
                     <property name="text">
                         <string>Note: These options override target specific settings.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                     <property name="whatsThis" stdset="0">
diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui
index 100100cb..e25d1a5d 100644
--- a/buildtools/lib/widgets/subclassesdlgbase.ui
+++ b/buildtools/lib/widgets/subclassesdlgbase.ui
@@ -53,7 +53,7 @@
             <property name="name">
                 <cstring>subclass_url</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>24</height>
@@ -73,7 +73,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
@@ -95,7 +95,7 @@
             <property name="text">
                 <string>Related subclass &amp;location:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
             <property name="buddy" stdset="0">
@@ -104,7 +104,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -120,7 +120,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>310</width>
                             <height>20</height>