From b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:51:21 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 buildtools/lib/parsers/qmake/qmakeast.cpp        | 24 ++++++++++++------------
 buildtools/lib/parsers/qmake/qmakeast.h          |  4 ++--
 buildtools/lib/parsers/qmake/qmakeastvisitor.cpp |  4 ++--
 buildtools/lib/parsers/qmake/tests/viewer.cpp    |  4 ++--
 buildtools/lib/parsers/qmake/tests/viewerbase.ui | 10 +++++-----
 5 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'buildtools/lib/parsers/qmake')

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>
-- 
cgit v1.2.1