1 files changed, 52 insertions, 52 deletions

diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.h b/umbrello/umbrello/codeimport/kdevcppparser/driver.h
index f6e9f100..6c53a939 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/driver.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.h
@@ -22,10 +22,10 @@
 
 #include "ast.h"
 
-#include <qpair.h>
-#include <qvaluestack.h>
-#include <qstringlist.h>
-#include <qmap.h>
+#include <tqpair.h>
+#include <tqvaluestack.h>
+#include <tqstringlist.h>
+#include <tqmap.h>
 
 class Lexer;
 class Parser;
@@ -46,7 +46,7 @@ public:
     Problem( const Problem& source )
 	: m_text( source.m_text ), m_line( source.m_line ),
 	  m_column( source.m_column ), m_level( source.m_level ) {}
-    Problem( const QString& text, int line, int column, int level=Level_Error )
+    Problem( const TQString& text, int line, int column, int level=Level_Error )
 	: m_text( text ), m_line( line ), m_column( column ), m_level(level) {}
 
     Problem& operator = ( const Problem& source )
@@ -63,13 +63,13 @@ public:
 	return m_text == p.m_text && m_line == p.m_line && m_column == p.m_column && m_level == p.m_level;
     }
 
-    QString text() const { return m_text; }
+    TQString text() const { return m_text; }
     int line() const { return m_line; }
     int column() const { return m_column; }
     int level() const { return m_level; }
 
 private:
-    QString m_text;
+    TQString m_text;
     int m_line;
     int m_column;
     int m_level;
@@ -81,16 +81,16 @@ enum
     Dep_Local
 };
 
-typedef QPair<QString, int> Dependence;
+typedef QPair<TQString, int> Dependence;
 
 class Macro
 {
 public:
-    typedef QString Argument;
+    typedef TQString Argument;
 
 public:
     Macro( bool hasArguments = false ): m_hasArguments( hasArguments ) {}
-    Macro( const QString &n, const QString &b ) : m_name( n ), m_body( b ), m_hasArguments( false ) {}
+    Macro( const TQString &n, const TQString &b ) : m_name( n ), m_body( b ), m_hasArguments( false ) {}
 
     Macro( const Macro& source )
 	: m_name( source.m_name),
@@ -119,29 +119,29 @@ public:
 	    m_argumentList == source.m_argumentList;
     }
 
-    QString name() const { return m_name; }
-    void setName( const QString& name ) { m_name = name; }
+    TQString name() const { return m_name; }
+    void setName( const TQString& name ) { m_name = name; }
 
-    QString fileName() const { return m_fileName; }
-    void setFileName( const QString& fileName ) { m_fileName = fileName; }
+    TQString fileName() const { return m_fileName; }
+    void setFileName( const TQString& fileName ) { m_fileName = fileName; }
 
-    QString body() const { return m_body; }
-    void setBody( const QString& body ) { m_body = body; }
+    TQString body() const { return m_body; }
+    void setBody( const TQString& body ) { m_body = body; }
 
     bool hasArguments() const { return m_hasArguments; }
     void setHasArguments( bool hasArguments ) { m_hasArguments = hasArguments; }
-    QValueList<Argument> argumentList() const { return m_argumentList; }
+    TQValueList<Argument> argumentList() const { return m_argumentList; }
 
     void clearArgumentList() { m_argumentList.clear(); m_hasArguments = false; }
     void addArgument( const Argument& argument ) { m_argumentList << argument; }
-    void addArgumentList( const QValueList<Argument>& arguments ) { m_argumentList += arguments; }
+    void addArgumentList( const TQValueList<Argument>& arguments ) { m_argumentList += arguments; }
 
 private:
-    QString m_name;
-    QString m_fileName;
-    QString m_body;
+    TQString m_name;
+    TQString m_fileName;
+    TQString m_body;
     bool m_hasArguments;
-    QValueList<Argument> m_argumentList;
+    TQValueList<Argument> m_argumentList;
 };
 
 class SourceProvider
@@ -150,8 +150,8 @@ public:
     SourceProvider() {}
     virtual ~SourceProvider() {}
 
-    virtual QString contents( const QString& fileName ) = 0;
-    virtual bool isModified( const QString& fileName ) = 0;
+    virtual TQString contents( const TQString& fileName ) = 0;
+    virtual bool isModified( const TQString& fileName ) = 0;
 
 private:
     SourceProvider( const SourceProvider& source );
@@ -169,34 +169,34 @@ public:
 
     virtual void reset();
 
-    virtual void parseFile( const QString& fileName, bool onlyPreProcesss=false, bool force=false );
-    virtual void fileParsed( const QString& fileName );
-    virtual void remove( const QString& fileName );
+    virtual void parseFile( const TQString& fileName, bool onlyPreProcesss=false, bool force=false );
+    virtual void fileParsed( const TQString& fileName );
+    virtual void remove( const TQString& fileName );
 
-    virtual void addDependence( const QString& fileName, const Dependence& dep );
+    virtual void addDependence( const TQString& fileName, const Dependence& dep );
     virtual void addMacro( const Macro& macro );
-    virtual void addProblem( const QString& fileName, const Problem& problem );
+    virtual void addProblem( const TQString& fileName, const Problem& problem );
 
 
-    QString currentFileName() const { return m_currentFileName; }
-    TranslationUnitAST::Node takeTranslationUnit( const QString& fileName );
-    TranslationUnitAST* translationUnit( const QString& fileName ) const;
-    QMap<QString, Dependence> dependences( const QString& fileName ) const;
-    QMap<QString, Macro> macros() const;
-    QValueList<Problem> problems( const QString& fileName ) const;
+    TQString currentFileName() const { return m_currentFileName; }
+    TranslationUnitAST::Node takeTranslationUnit( const TQString& fileName );
+    TranslationUnitAST* translationUnit( const TQString& fileName ) const;
+    TQMap<TQString, Dependence> dependences( const TQString& fileName ) const;
+    TQMap<TQString, Macro> macros() const;
+    TQValueList<Problem> problems( const TQString& fileName ) const;
 
-    bool hasMacro( const QString& name ) const { return m_macros.contains( name ); }
-    const Macro& macro( const QString& name ) const { return m_macros[ name ]; }
-    Macro& macro( const QString& name ) { return m_macros[ name ]; }
+    bool hasMacro( const TQString& name ) const { return m_macros.contains( name ); }
+    const Macro& macro( const TQString& name ) const { return m_macros[ name ]; }
+    Macro& macro( const TQString& name ) { return m_macros[ name ]; }
 
-    virtual void removeMacro( const QString& macroName );
-    virtual void removeAllMacrosInFile( const QString& fileName );
+    virtual void removeMacro( const TQString& macroName );
+    virtual void removeAllMacrosInFile( const TQString& fileName );
 
-    QStringList includePaths() const { return m_includePaths; }
-    virtual void addIncludePath( const QString &path );
+    TQStringList includePaths() const { return m_includePaths; }
+    virtual void addIncludePath( const TQString &path );
 
     /// @todo remove
-    const QMap<QString, TranslationUnitAST*> &parsedUnits() const { return m_parsedUnits; }
+    const TQMap<TQString, TranslationUnitAST*> &parsedUnits() const { return m_parsedUnits; }
 
     virtual void setResolveDependencesEnabled( bool enabled );
     bool isResolveDependencesEnabled() const { return depresolv; }
@@ -207,17 +207,17 @@ protected:
     virtual void setupPreProcessor();
 
 private:
-    QMap<QString, Dependence>& findOrInsertDependenceList( const QString& fileName );
-    QValueList<Problem>& findOrInsertProblemList( const QString& fileName );
-    QString findIncludeFile( const Dependence& dep ) const;
+    TQMap<TQString, Dependence>& findOrInsertDependenceList( const TQString& fileName );
+    TQValueList<Problem>& findOrInsertProblemList( const TQString& fileName );
+    TQString findIncludeFile( const Dependence& dep ) const;
 
 private:
-    QString m_currentFileName;
-    QMap< QString, QMap<QString, Dependence> > m_dependences;
-    QMap<QString, Macro> m_macros;
-    QMap< QString, QValueList<Problem> > m_problems;
-    QMap<QString, TranslationUnitAST*> m_parsedUnits;
-    QStringList m_includePaths;
+    TQString m_currentFileName;
+    TQMap< TQString, TQMap<TQString, Dependence> > m_dependences;
+    TQMap<TQString, Macro> m_macros;
+    TQMap< TQString, TQValueList<Problem> > m_problems;
+    TQMap<TQString, TranslationUnitAST*> m_parsedUnits;
+    TQStringList m_includePaths;
     uint depresolv : 1;
     Lexer *lexer;
     SourceProvider* m_sourceProvider;