4 files changed, 24 insertions, 24 deletions

diff --git a/buildtools/lib/parsers/qmake/qmake.ll b/buildtools/lib/parsers/qmake/qmake.ll
index a0289f6e..14d5e777 100644
--- a/buildtools/lib/parsers/qmake/qmake.ll
+++ b/buildtools/lib/parsers/qmake/qmake.ll
@@ -81,29 +81,29 @@ cont              \\{ws}*{newline}
 <INITIAL>{ws} {}
 
 <vallist>{ws} {
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::LIST_WS;
 }
 
 <vallist,INITIAL>{cont} {
     BEGIN(vallist);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::CONT;
 }
 
 <vallist,INITIAL>{comment_cont} {
     BEGIN(vallist);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::COMMENT_CONT;
 }
 
 {id_simple} {
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return (Parser::token::token::ID_SIMPLE);
 }
 
 <funcargs>{id_args} {
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     mylval->value = mylval->value.mid(0, mylval->value.length()-1);
     unput(')');
     BEGIN(INITIAL);
@@ -112,43 +112,43 @@ cont              \\{ws}*{newline}
 
 <vallist>{var_value} {
     BEGIN(vallist);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::VARIABLE_VALUE;
 }
 
 <vallist>{quoted_var_value} {
     BEGIN(vallist);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::QUOTED_VARIABLE_VALUE;
 }
 
 "=" {
     BEGIN(vallist);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::EQ;
 }
 
 "+=" {
     BEGIN(vallist);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::PLUSEQ;
 }
 
 "-=" {
     BEGIN(vallist);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::MINUSEQ;
 }
 
 "*=" {
     BEGIN(vallist);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::STAREQ;
 }
 
 "~=" {
     BEGIN(vallist);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::TILDEEQ;
 }
 
@@ -175,28 +175,28 @@ cont              \\{ws}*{newline}
 }
 
 ":" {
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return Parser::token::token::COLON;
 }
 
 
 <vallist>{ws}{newline} {
     BEGIN(INITIAL);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     setLineEndingFromString( mylval->value );
     return Parser::token::token::NEWLINE;
 }
 
 <vallist,INITIAL>{newline} {
     BEGIN(INITIAL);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     setLineEndingFromString( mylval->value );
     return Parser::token::token::NEWLINE;
 }
 
 <vallist,INITIAL>{comment} {
     BEGIN(INITIAL);
-    mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+    mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
     return (Parser::token::token::COMMENT);
 }
 
@@ -214,7 +214,7 @@ namespace QMake
         return yylex();
     }
 
-    void Lexer::setLineEndingFromString( const QString& str )
+    void Lexer::setLineEndingFromString( const TQString& str )
     {
         if( str.endsWith("\r\n") && m_lineEnding == None )
             m_lineEnding = Windows;
diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy
index 2c3e866d..83cb60c8 100644
--- a/buildtools/lib/parsers/qmake/qmake.yy
+++ b/buildtools/lib/parsers/qmake/qmake.yy
@@ -51,7 +51,7 @@ struct Result {
     Result(): node(0) {}
 
     /**Type of semantic value for simple grammar rules.*/
-    QString value;
+    TQString value;
     /**Type of semantic value for grammar rules which are parts of AST.*/
     AST *node;
     /**Type of semantic value for "multiline_values" grammar rule.
@@ -71,7 +71,7 @@ struct Result {
     </pre>
     */
     QStringList values;
-    QString indent;
+    TQString indent;
 };
 
 #define YYSTYPE Result
@@ -310,8 +310,8 @@ listws: LIST_WS
         }
     |
         {
-            $<value>$ = QString();
-            $<indent>$ = QString();
+            $<value>$ = TQString();
+            $<indent>$ = TQString();
         }
     ;
 operator : EQ
diff --git a/buildtools/lib/parsers/qmake/tests/viewer.h b/buildtools/lib/parsers/qmake/tests/viewer.h
index 86fe70fe..996b8f46 100644
--- a/buildtools/lib/parsers/qmake/tests/viewer.h
+++ b/buildtools/lib/parsers/qmake/tests/viewer.h
@@ -31,7 +31,7 @@ class ProjectAST;
 class TQListViewItem;
 
 class Viewer: public ViewerBase {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     Viewer(TQWidget *parent = 0, const char *name = 0);
diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
index ad580b4c..970f6ee8 100644
--- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
@@ -240,11 +240,11 @@
         <slot>tabWidget2_selected(const TQString&amp;)</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>addAll_clicked()</slot>
     <slot>choose_clicked()</slot>
     <slot>files_currentChanged( TQListBoxItem * )</slot>
     <slot>tabWidget2_selected( const TQString &amp; )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>