9 files changed, 23 insertions, 23 deletions
diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am
index 340d0e38..950d6571 100644
--- a/buildtools/lib/parsers/autotools/Makefile.am
+++ b/buildtools/lib/parsers/autotools/Makefile.am
@@ -13,7 +13,7 @@ libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotoo
 parser:
 	cd $(srcdir) ; \
 	bison -d autotools.yy -o autotools_yacc.cpp ; \
-	mv -f autotools_yacc.hpp autotools_yacc.h ; \
+	mv -f autotools_yacc.h autotools_yacc.h ; \
 	flex -oautotools_lex.cpp autotools.ll
 
 EXTRA_DIST = autotools.yy autotools.ll
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.yy b/buildtools/lib/parsers/qmake/qmake.yy
index 3cc0b79d..2c3e866d 100644
--- a/buildtools/lib/parsers/qmake/qmake.yy
+++ b/buildtools/lib/parsers/qmake/qmake.yy
@@ -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 }
diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h
index 25aa402d..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
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/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