5 files changed, 23 insertions, 23 deletions

diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp
index 66401c2c..293c5817 100644
--- a/buildtools/lib/parsers/autotools/tests/viewer.cpp
+++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp
@@ -46,7 +46,7 @@ Viewer::Viewer(TQWidget *tqparent, const char *name)
             files->insertItem(str.readLine());
     }
     ast->setSorting(-1);
-    tqparentProject.push((TQListViewItem*)0);
+    parentProject.push((TQListViewItem*)0);
 }
 
 void Viewer::addAll_clicked()
@@ -99,12 +99,12 @@ void Viewer::tabWidget2_selected(const TQString& text)
 void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter)
 {
     TQListViewItem *projectIt;
-    if (!tqparentProject.top())
+    if (!parentProject.top())
         projectIt = new TQListViewItem(ast, "Project");
     else
     {
         if ( projectAST->isConditionalScope() || projectAST->isRule() )
-            projectIt = new TQListViewItem(tqparentProject.top(), globAfter, projectAST->scopedID);
+            projectIt = new TQListViewItem(parentProject.top(), globAfter, projectAST->scopedID);
     }
     projectIt->setOpen(true);
     
@@ -150,9 +150,9 @@ void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter)
 		}
 	case AST::ProjectAST: {
 		ProjectAST *projectAST = static_cast<ProjectAST*>(ast);
-		tqparentProject.push(projectIt);
+		parentProject.push(projectIt);
 		processAST(projectAST, after);
-		tqparentProject.pop(); }
+		parentProject.pop(); }
 		break;
 	}
     }
diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h
index c0653020..7665368e 100644
--- a/buildtools/lib/parsers/autotools/tests/viewer.h
+++ b/buildtools/lib/parsers/autotools/tests/viewer.h
@@ -41,7 +41,7 @@ public slots:
     virtual void addAll_clicked();
 private:
     AutoTools::ProjectAST *projectAST;
-    TQValueStack<TQListViewItem *> tqparentProject;
+    TQValueStack<TQListViewItem *> parentProject;
 };
 
 #endif
diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
index 75ed7559..e319e2b4 100644
--- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
@@ -216,5 +216,5 @@
     <slot>files_currentChanged(QListBoxItem*)</slot>
     <slot>tabWidget2_selected(const QString&amp;)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp
index 6f1e5f25..a10df338 100644
--- a/buildtools/lib/parsers/qmake/tests/viewer.cpp
+++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp
@@ -47,7 +47,7 @@ Viewer::Viewer(TQWidget *tqparent, const char *name)
             files->insertItem(str.readLine());
     }
     ast->setSorting(-1);
-//    tqparentProject.push((TQListViewItem*)0);
+//    parentProject.push((TQListViewItem*)0);
 }
 
 void Viewer::addAll_clicked()
@@ -102,7 +102,7 @@ public:
     ViewerVisitor(Viewer *v): ASTVisitor()
     {
         this->v = v;
-        tqparentProject.push((TQListViewItem*)0);
+        parentProject.push((TQListViewItem*)0);
     }
 
     virtual void processProject(ProjectAST *project)
@@ -113,39 +113,39 @@ public:
     virtual void enterRealProject(ProjectAST *project)
     {
         TQListViewItem *projectIt;
-        if (!tqparentProject.top())
+        if (!parentProject.top())
         {
             projectIt = new TQListViewItem(v->ast, "Project");
             projectIt->setOpen(true);
-            tqparentProject.push(projectIt);
+            parentProject.push(projectIt);
         }
 
         ASTVisitor::enterRealProject(project);
     }
     virtual void enterScope(ProjectAST *scope)
     {
-        TQListViewItem *projectIt = new TQListViewItem(tqparentProject.top(), scope->scopedID, "scope");
-        tqparentProject.push(projectIt);
+        TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), scope->scopedID, "scope");
+        parentProject.push(projectIt);
         ASTVisitor::enterScope(scope);
     }
     virtual void leaveScope(ProjectAST *scope)
     {
-        tqparentProject.pop();
+        parentProject.pop();
     }
     virtual void enterFunctionScope(ProjectAST *fscope)
     {
-        TQListViewItem *projectIt = new TQListViewItem(tqparentProject.top(),
+        TQListViewItem *projectIt = new TQListViewItem(parentProject.top(),
             fscope->scopedID + "(" + fscope->args + ")", "function scope");
-        tqparentProject.push(projectIt);
+        parentProject.push(projectIt);
         ASTVisitor::enterFunctionScope(fscope);
     }
     virtual void leaveFunctionScope(ProjectAST *fscope)
     {
-        tqparentProject.pop();
+        parentProject.pop();
     }
     virtual void processAssignment(AssignmentAST *assignment)
     {
-        TQListViewItem *item = new TQListViewItem(tqparentProject.top(),
+        TQListViewItem *item = new TQListViewItem(parentProject.top(),
                 assignment->scopedID, assignment->op, assignment->values.join("|"),
                 "assignment");
         item->setMultiLinesEnabled(true);
@@ -154,22 +154,22 @@ public:
     }
     virtual void processNewLine(NewLineAST *newline)
     {
-        new TQListViewItem(tqparentProject.top(), "<newline>");
+        new TQListViewItem(parentProject.top(), "<newline>");
         ASTVisitor::processNewLine(newline);
     }
     virtual void processComment(CommentAST *comment)
     {
-        new TQListViewItem(tqparentProject.top(), "<comment>");
+        new TQListViewItem(parentProject.top(), "<comment>");
         ASTVisitor::processComment(comment);
     }
     virtual void processInclude(IncludeAST *include)
     {
-        new TQListViewItem(tqparentProject.top(), "<include>", include->projectName);
+        new TQListViewItem(parentProject.top(), "<include>", include->projectName);
         TQMake::ASTVisitor::processInclude(include);
     }
 
     Viewer *v;
-    TQValueStack<TQListViewItem *> tqparentProject;
+    TQValueStack<TQListViewItem *> parentProject;
 };
 
 
diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
index c37f41bf..1308cc1d 100644
--- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
@@ -246,5 +246,5 @@
     <slot>files_currentChanged( QListBoxItem * )</slot>
     <slot>tabWidget2_selected( const QString &amp; )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>