summaryrefslogtreecommitdiffstats
path: root/buildtools/lib
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/lib')
-rw-r--r--buildtools/lib/parsers/autotools/autotoolsast.cpp14
-rw-r--r--buildtools/lib/parsers/autotools/autotoolsast.h10
-rw-r--r--buildtools/lib/parsers/qmake/qmakeast.cpp24
-rw-r--r--buildtools/lib/parsers/qmake/qmakeast.h4
-rw-r--r--buildtools/lib/parsers/qmake/qmakeastvisitor.cpp4
-rw-r--r--buildtools/lib/widgets/runoptionswidgetbase.ui2
-rw-r--r--buildtools/lib/widgets/subclassesdlgbase.ui2
7 files changed, 30 insertions, 30 deletions
diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp
index f6ac032f..ddcbddc3 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 e690baa4..768e3e07 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/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp
index 2c1e5a53..504303b5 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 e2abba70..898cd8f3 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 b9470bd9..c6fcd73d 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/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui
index 8134aead..4da77fe2 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 6df8ca17..51d0e5b3 100644
--- a/buildtools/lib/widgets/subclassesdlgbase.ui
+++ b/buildtools/lib/widgets/subclassesdlgbase.ui
@@ -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">