1 files changed, 27 insertions, 27 deletions

diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp
index 03ad5277..db30508d 100644
--- a/buildtools/autotools/makefilehandler.cpp
+++ b/buildtools/autotools/makefilehandler.cpp
@@ -12,12 +12,12 @@
 ***************************************************************************
 */
 
-#include <qdir.h>
-#include <qglobal.h>
-#include <qmap.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqdir.h>
+#include <tqglobal.h>
+#include <tqmap.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
 
 #include <kdebug.h>
 
@@ -26,13 +26,13 @@
 
 #include "makefilehandler.h"
 
-typedef QValueList<AutoTools::AST*> ASTList;
+typedef TQValueList<AutoTools::AST*> ASTList;
 
 class MakefileHandler::Private
 {
 public:
-    QMap<QString, AutoTools::ProjectAST*> projects;
-    QMap<QString, QString> folderToFileMap;
+    TQMap<TQString, AutoTools::ProjectAST*> projects;
+    TQMap<TQString, TQString> folderToFileMap;
 };
 
 MakefileHandler::MakefileHandler()
@@ -45,23 +45,23 @@ MakefileHandler::~MakefileHandler()
     delete d;
 }
 
-void MakefileHandler::parse( const QString& folder, bool recursive )
+void MakefileHandler::parse( const TQString& folder, bool recursive )
 {
     //look for either Makefile.am.in, Makefile.am, or Makefile.in, in that order
     AutoTools::ProjectAST* ast;
     int ret = -1;
-    QString filePath = folder + "/Makefile.am.in";
-    if ( QFile::exists( filePath ) )
+    TQString filePath = folder + "/Makefile.am.in";
+    if ( TQFile::exists( filePath ) )
         ret = AutoTools::Driver::parseFile( filePath, &ast );
     else
     {
         filePath = folder + "/Makefile.am";
-        if ( QFile::exists( filePath ) )
+        if ( TQFile::exists( filePath ) )
             ret = AutoTools::Driver::parseFile( filePath, &ast );
         else
         {
             filePath = folder + "/Makefile.in";
-            if ( QFile::exists( filePath ) )
+            if ( TQFile::exists( filePath ) )
                 ret = AutoTools::Driver::parseFile( filePath, &ast );
             else
                 kdDebug(9020) << k_funcinfo << "no appropriate file to parse in "
@@ -81,8 +81,8 @@ void MakefileHandler::parse( const QString& folder, bool recursive )
 
     if ( recursive && ast && ast->hasChildren() )
     {
-        QValueList<AutoTools::AST*> astChildList = ast->children();
-        QValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end());
+        TQValueList<AutoTools::AST*> astChildList = ast->children();
+        TQValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end());
         for ( ; it != clEnd; ++it )
         {
             if ( (*it)->nodeType() == AutoTools::AST::AssignmentAST )
@@ -90,14 +90,14 @@ void MakefileHandler::parse( const QString& folder, bool recursive )
                 AutoTools::AssignmentAST* assignment = static_cast<AutoTools::AssignmentAST*>( (*it) );
                 if ( assignment->scopedID == "SUBDIRS"  )
                 {
-                    QString list = assignment->values.join( QString::null );
+                    TQString list = assignment->values.join( TQString::null );
                     list.simplifyWhiteSpace();
                     kdDebug(9020) << k_funcinfo << "subdirs is " << list << endl;
-                    QStringList subdirList = QStringList::split( " ",  list );
-                    QStringList::iterator vit = subdirList.begin();
+                    TQStringList subdirList = TQStringList::split( " ",  list );
+                    TQStringList::iterator vit = subdirList.begin();
                     for ( ; vit != subdirList.end(); ++vit )
                     {
-                        QString realDir = ( *vit );
+                        TQString realDir = ( *vit );
                         if ( realDir.startsWith( "\\" ) )
                             realDir.remove( 0, 1 );
 
@@ -120,26 +120,26 @@ void MakefileHandler::parse( const QString& folder, bool recursive )
     }
 }
 
-AutoTools::ProjectAST* MakefileHandler::astForFolder( const QString& folderPath )
+AutoTools::ProjectAST* MakefileHandler::astForFolder( const TQString& folderPath )
 {
     if ( d->folderToFileMap.contains( folderPath ) )
     {
-        QString filePath = d->folderToFileMap[folderPath];
+        TQString filePath = d->folderToFileMap[folderPath];
         return d->projects[filePath];
     }
     else
         return 0;
 }
 
-bool MakefileHandler::isVariable( const QString& item ) const
+bool MakefileHandler::isVariable( const TQString& item ) const
 {
-    if ( item.contains( QRegExp( "(\\$\\([a-zA-Z0-9_-]*\\)|@[a-zA-Z0-9_-]*@)" ) ) )
+    if ( item.contains( TQRegExp( "(\\$\\([a-zA-Z0-9_-]*\\)|@[a-zA-Z0-9_-]*@)" ) ) )
         return true;
     else
         return false;
 }
 
-QString MakefileHandler::resolveVariable( const QString& variable, AutoTools::ProjectAST* ast )
+TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools::ProjectAST* ast )
 {
     if ( !ast )
         return variable;
@@ -155,8 +155,8 @@ QString MakefileHandler::resolveVariable( const QString& variable, AutoTools::Pr
             if ( variable.find( assignment->scopedID ) != -1 )
             {
                 kdDebug(9020) << k_funcinfo << "Resolving variable '" << variable << "' to '"
-                              << assignment->values.join( QString::null ).stripWhiteSpace() << "'" << endl;
-                return assignment->values.join( QString::null ).stripWhiteSpace();
+                              << assignment->values.join( TQString::null ).stripWhiteSpace() << "'" << endl;
+                return assignment->values.join( TQString::null ).stripWhiteSpace();
             }
         }
     }