From 1623fe64102c18ab098b79656b80f28cef840756 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04. --- buildtools/lib/parsers/autotools/autotoolsast.cpp | 14 ++++++------- buildtools/lib/parsers/autotools/autotoolsast.h | 10 ++++----- buildtools/lib/parsers/autotools/tests/viewer.cpp | 4 ++-- .../lib/parsers/autotools/tests/viewerbase.ui | 10 ++++----- 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 ++++----- 9 files changed, 42 insertions(+), 42 deletions(-) (limited to 'buildtools/lib/parsers') diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp index 0512be78..659fe47f 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::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { AST *node = *it; delete node; @@ -37,13 +37,13 @@ AST::~AST() void AST::addChildAST(AST *node) { - m_children.append(node); + m_tqchildren.append(node); } void AST::writeBack(TQString &buffer) { - for (TQValueList::const_iterator it = m_children.constBegin(); - it != m_children.constEnd(); ++it) + for (TQValueList::const_iterator it = m_tqchildren.constBegin(); + it != m_tqchildren.constEnd(); ++it) { if (*it) (*it)->writeBack(buffer); @@ -60,12 +60,12 @@ TQString AST::indentation() bool AST::hasChildren() const { - return !m_children.isEmpty(); + return !m_tqchildren.isEmpty(); } -TQValueList AST::children() const +TQValueList AST::tqchildren() const { - return m_children; + return m_tqchildren; } //ProjectAST diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h index adefc640..0f5dcdc9 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 children which are always deleted in the + * Each AST node holds the list of its tqchildren 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 children + //! \return true if this AST has tqchildren bool hasChildren() const; /** - * Get the children of this ast + * Get the tqchildren of this ast * \return the list of this ast's childre */ - TQValueList children() const; + TQValueList tqchildren() const; protected: NodeType m_nodeType; - TQValueList m_children; + TQValueList m_tqchildren; private: int m_depth; diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp index 48cb4f5d..2693a68c 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp @@ -23,9 +23,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui index 7a00a47a..e319e2b4 100644 --- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui +++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui @@ -21,7 +21,7 @@ - layout2 + tqlayout2 @@ -128,7 +128,7 @@ allLocation - + 150 32767 @@ -139,7 +139,7 @@ addAll - + 150 32767 @@ -153,7 +153,7 @@ choose - + 150 32767 @@ -175,7 +175,7 @@ 0 - + 150 32767 diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index 90306ff1..5f55af4b 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::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { AST *node = *it; delete node; } - m_children.clear(); + m_tqchildren.clear(); } void AST::addChildAST(AST *node) { - m_children.append(node); + m_tqchildren.append(node); } void AST::removeChildAST(AST *node) { - m_children.remove(node); + m_tqchildren.remove(node); } void AST::writeBack(TQString &buffer) { - for (TQValueList::const_iterator it = m_children.constBegin(); - it != m_children.constEnd(); ++it) + for (TQValueList::const_iterator it = m_tqchildren.constBegin(); + it != m_tqchildren.constEnd(); ++it) { if (*it) { @@ -70,7 +70,7 @@ TQString AST::indentation() void ProjectAST::writeBack(TQString &buffer) { bool hasActualStatements = false; - for (TQValueList::const_iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList::const_iterator it = m_tqchildren.begin(); it != m_tqchildren.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_children.count() == 1 ) + if( m_tqchildren.count() == 1 ) buffer += " : "; else buffer += " {"; @@ -94,9 +94,9 @@ void ProjectAST::writeBack(TQString &buffer) if( !buffer.endsWith(": ") ) buffer += indentation(); buffer += scopedID + "(" + args + ")"; - if( m_children.count() == 1 && hasActualStatements ) + if( m_tqchildren.count() == 1 && hasActualStatements ) buffer += ": "; - else if( (m_children.count() > 0 && hasActualStatements) ) + else if( (m_tqchildren.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_children.count() > 1 ) + if (isScope() && m_tqchildren.count() > 1 ) buffer += indentation() + "}"; - if (isFunctionScope() && (hasActualStatements) && m_children.count() > 1) + if (isFunctionScope() && (hasActualStatements) && m_tqchildren.count() > 1) buffer += indentation() + "}"; } diff --git a/buildtools/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h index 15929d2d..a0c5c1de 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 children which are always deleted in the +Each AST node holds the list of its tqchildren 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 m_children; + TQValueList m_tqchildren; protected: NodeType m_nodeType; diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp index 8740f16a..b733a880 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::const_iterator it = project->m_children.constBegin(); - it != project->m_children.constEnd(); ++it) + for (TQValueList::const_iterator it = project->m_tqchildren.constBegin(); + it != project->m_tqchildren.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 dbcc7db7..eef16513 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp @@ -23,9 +23,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui index c76abc20..1308cc1d 100644 --- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui +++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui @@ -28,7 +28,7 @@ - layout4 + tqlayout4 @@ -38,7 +38,7 @@ allLocation - + 32767 32767 @@ -49,7 +49,7 @@ addAll - + 32767 32767 @@ -63,7 +63,7 @@ choose - + 32767 32767 @@ -85,7 +85,7 @@ 0 - + 32767 32767 -- cgit v1.2.1