13 files changed, 46 insertions, 54 deletions
diff --git a/buildtools/lib/parsers/qmake/FlexLexer.h b/buildtools/lib/parsers/qmake/FlexLexer.h
index 1db844da..edea96ca 100644
--- a/buildtools/lib/parsers/qmake/FlexLexer.h
+++ b/buildtools/lib/parsers/qmake/FlexLexer.h
@@ -1,5 +1,3 @@
-
-// -*-C++-*-
 // FlexLexer.h -- define interfaces for lexical analyzer classes generated
 // by flex
 
diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.h
index d6247645..f97af783 100644
--- a/buildtools/lib/parsers/qmake/location.hh
+++ b/buildtools/lib/parsers/qmake/location.h
@@ -33,16 +33,16 @@
    version 2.2 of Bison.  */
 
 /**
- ** \file location.hh
+ ** \file location.h
  ** Define the TQMake::location class.
  */
 
-#ifndef BISON_LOCATION_HH
-# define BISON_LOCATION_HH
+#ifndef BISON_LOCATION_H
+# define BISON_LOCATION_H
 
 # include <iostream>
 # include <string>
-# include "position.hh"
+# include "position.h"
 
 namespace TQMake
 {
@@ -142,4 +142,4 @@ namespace TQMake
 
 }
 
-#endif // not BISON_LOCATION_HH
+#endif // not BISON_LOCATION_H
diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.h
index 6e95eb95..9f5951f0 100644
--- a/buildtools/lib/parsers/qmake/position.hh
+++ b/buildtools/lib/parsers/qmake/position.h
@@ -33,12 +33,12 @@
    version 2.2 of Bison.  */
 
 /**
- ** \file position.hh
+ ** \file position.h
  ** Define the TQMake::position class.
  */
 
-#ifndef BISON_POSITION_HH
-# define BISON_POSITION_HH
+#ifndef BISON_POSITION_H
+# define BISON_POSITION_H
 
 # include <iostream>
 # include <string>
@@ -139,4 +139,4 @@ namespace TQMake
   }
 
 }
-#endif // not BISON_POSITION_HH
+#endif // not BISON_POSITION_H
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 3cc0b79d..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
@@ -109,7 +109,7 @@ Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp.
 */
 %}
 
-%skeleton "lalr1.cc"
+%skeleton "lalr1.cpp"
 %define "parser_class_name" "Parser"
 %name-prefix="QMake"
 %parse-param { QMake::Lexer* lexer }
@@ -310,8 +310,8 @@ listws: LIST_WS
         }
     |
         {
-            $<value>$ = QString();
-            $<indent>$ = QString();
+            $<value>$ = TQString();
+            $<indent>$ = TQString();
         }
     ;
 operator : EQ
diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h
index fe133946..4bed35dd 100644
--- a/buildtools/lib/parsers/qmake/qmake_lex.h
+++ b/buildtools/lib/parsers/qmake/qmake_lex.h
@@ -20,7 +20,7 @@
 #ifndef TQMAKE_LEX_H
 #define TQMAKE_LEX_H
 
-#include "qmake_yacc.hpp"
+#include "qmake_yacc.h"
 #include <iostream>
 
 #ifndef DONT_INCLUDE_FLEXLEXER
@@ -45,5 +45,3 @@ namespace TQMake
 }
 
 #endif
-
-// kate: space-indent on; indent-width 4; tab-width: 4; replace-tabs on; auto-insert-doxygen on
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
index f9dea804..25ae0e85 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
@@ -35,12 +35,12 @@
 // Take the name prefix into account.
 #define yylex   TQMakelex
 
-#include "qmake_yacc.hpp"
+#include "qmake_yacc.h"
 
 /* User implementation prologue.  */
 
 
-/* Line 317 of lalr1.cc.  */
+/* Line 317 of lalr1.cpp.  */
 #line 45 "tqmake_yacc.cpp"
 
 #ifndef YY_
@@ -751,7 +751,7 @@ namespace TQMake
     break;
 
 
-    /* Line 675 of lalr1.cc.  */
+    /* Line 675 of lalr1.cpp.  */
 #line 756 "tqmake_yacc.cpp"
 	default: break;
       }
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.h
index fd130e65..4c4e3042 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.h
@@ -39,7 +39,7 @@
 
 #include <string>
 #include <iostream>
-#include "stack.hh"
+#include "stack.h"
 
 namespace TQMake
 {
@@ -160,10 +160,10 @@ Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp.
 */
 
 
-/* Line 35 of lalr1.cc.  */
-#line 165 "qmake_yacc.hpp"
+/* Line 35 of lalr1.cpp.  */
+#line 165 "qmake_yacc.h"
 
-#include "location.hh"
+#include "location.h"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp
index 504303b5..1b4bcb87 100644
--- a/buildtools/lib/parsers/qmake/qmakeast.cpp
+++ b/buildtools/lib/parsers/qmake/qmakeast.cpp
@@ -164,7 +164,3 @@ void IncludeAST::writeBack(TQString &/*buffer*/)
 }
 
 }
-
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
-
-
diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp
index 40fd9bd9..8b9b722a 100644
--- a/buildtools/lib/parsers/qmake/qmakedriver.cpp
+++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp
@@ -28,7 +28,7 @@
 #include <sstream>
 
 #include "qmake_lex.h"
-#include "qmake_yacc.hpp"
+#include "qmake_yacc.h"
 
 namespace TQMake {
 
diff --git a/buildtools/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.h
index dfc6c67e..1c18d4d0 100644
--- a/buildtools/lib/parsers/qmake/stack.hh
+++ b/buildtools/lib/parsers/qmake/stack.h
@@ -32,8 +32,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef BISON_STACK_HH
-# define BISON_STACK_HH
+#ifndef BISON_STACK_H
+# define BISON_STACK_H
 
 #include <deque>
 
@@ -126,4 +126,4 @@ namespace TQMake
   };
 }
 
-#endif // not BISON_STACK_HH
+#endif // not BISON_STACK_H
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>