22 files changed, 111 insertions, 111 deletions
diff --git a/languages/ada/AdaAST.hpp b/languages/ada/AdaAST.h
index 1bb2bd07..35b734b4 100644
--- a/languages/ada/AdaAST.hpp
+++ b/languages/ada/AdaAST.h
@@ -1,7 +1,7 @@
 #ifndef ADAAST_HPP
 #define ADAAST_HPP
 
-#include <antlr/CommonAST.hpp>
+#include <antlr/CommonAST.h>
 
 class AdaAST;
 typedef antlr::ASTRefCount<AdaAST> RefAdaAST;
diff --git a/languages/ada/AdaLexer.cpp b/languages/ada/AdaLexer.cpp
index 2ac19416..07e0cdd0 100644
--- a/languages/ada/AdaLexer.cpp
+++ b/languages/ada/AdaLexer.cpp
@@ -1,12 +1,12 @@
 /* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaLexer.cpp"$ */
-#include "AdaLexer.hpp"
-#include <antlr/CharBuffer.hpp>
-#include <antlr/TokenStreamException.hpp>
-#include <antlr/TokenStreamIOException.hpp>
-#include <antlr/TokenStreamRecognitionException.hpp>
-#include <antlr/CharStreamException.hpp>
-#include <antlr/CharStreamIOException.hpp>
-#include <antlr/NoViableAltForCharException.hpp>
+#include "AdaLexer.h"
+#include <antlr/CharBuffer.h>
+#include <antlr/TokenStreamException.h>
+#include <antlr/TokenStreamIOException.h>
+#include <antlr/TokenStreamRecognitionException.h>
+#include <antlr/CharStreamException.h>
+#include <antlr/CharStreamIOException.h>
+#include <antlr/NoViableAltForCharException.h>
 
 #line 1531 "ada.g"
 
diff --git a/languages/ada/AdaLexer.hpp b/languages/ada/AdaLexer.h
index 795c7bba..f004b971 100644
--- a/languages/ada/AdaLexer.hpp
+++ b/languages/ada/AdaLexer.h
@@ -1,20 +1,20 @@
-#ifndef INC_AdaLexer_hpp_
-#define INC_AdaLexer_hpp_
+#ifndef INC_AdaLexer_h_
+#define INC_AdaLexer_h_
 
 #line 29 "ada.g"
 
-#include <antlr/SemanticException.hpp>  // antlr wants this
-#include "AdaAST.hpp"
+#include <antlr/SemanticException.h>  // antlr wants this
+#include "AdaAST.h"
 #include "preambles.h"
 
-#line 11 "AdaLexer.hpp"
-#include <antlr/config.hpp>
-/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaLexer.hpp"$ */
-#include <antlr/CommonToken.hpp>
-#include <antlr/InputBuffer.hpp>
-#include <antlr/BitSet.hpp>
-#include "AdaTokenTypes.hpp"
-#include <antlr/CharScanner.hpp>
+#line 11 "AdaLexer.h"
+#include <antlr/config.h>
+/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaLexer.h"$ */
+#include <antlr/CommonToken.h>
+#include <antlr/InputBuffer.h>
+#include <antlr/BitSet.h>
+#include "AdaTokenTypes.h"
+#include <antlr/CharScanner.h>
 class CUSTOM_API AdaLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public AdaTokenTypes
 {
 #line 1879 "ada.g"
@@ -22,7 +22,7 @@ class CUSTOM_API AdaLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public
   ANTLR_LEXER_PREAMBLE
   private:
     bool lastTokenWasTicCompatible;
-#line 22 "AdaLexer.hpp"
+#line 22 "AdaLexer.h"
 private:
 	void initLiterals();
 public:
@@ -83,4 +83,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_3;
 };
 
-#endif /*INC_AdaLexer_hpp_*/
+#endif /*INC_AdaLexer_h_*/
diff --git a/languages/ada/AdaParser.cpp b/languages/ada/AdaParser.cpp
index e783595e..fed95180 100644
--- a/languages/ada/AdaParser.cpp
+++ b/languages/ada/AdaParser.cpp
@@ -1,8 +1,8 @@
 /* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaParser.cpp"$ */
-#include "AdaParser.hpp"
-#include <antlr/NoViableAltException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/ASTFactory.hpp>
+#include "AdaParser.h"
+#include <antlr/NoViableAltException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/ASTFactory.h>
 #line 1 "ada.g"
 #line 8 "AdaParser.cpp"
 AdaParser::AdaParser(ANTLR_USE_NAMESPACE(antlr)TokenBuffer& tokenBuf, int k)
diff --git a/languages/ada/AdaParser.hpp b/languages/ada/AdaParser.h
index 0074c820..9ceb8811 100644
--- a/languages/ada/AdaParser.hpp
+++ b/languages/ada/AdaParser.h
@@ -1,19 +1,19 @@
-#ifndef INC_AdaParser_hpp_
-#define INC_AdaParser_hpp_
+#ifndef INC_AdaParser_h_
+#define INC_AdaParser_h_
 
 #line 29 "ada.g"
 
-#include <antlr/SemanticException.hpp>  // antlr wants this
-#include "AdaAST.hpp"
+#include <antlr/SemanticException.h>  // antlr wants this
+#include "AdaAST.h"
 #include "preambles.h"
 
-#line 11 "AdaParser.hpp"
-#include <antlr/config.hpp>
-/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaParser.hpp"$ */
-#include <antlr/TokenStream.hpp>
-#include <antlr/TokenBuffer.hpp>
-#include "AdaTokenTypes.hpp"
-#include <antlr/LLkParser.hpp>
+#line 11 "AdaParser.h"
+#include <antlr/config.h>
+/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaParser.h"$ */
+#include <antlr/TokenStream.h>
+#include <antlr/TokenBuffer.h>
+#include "AdaTokenTypes.h"
+#include <antlr/LLkParser.h>
 
 class CUSTOM_API AdaParser : public ANTLR_USE_NAMESPACE(antlr)LLkParser, public AdaTokenTypes
 {
@@ -28,7 +28,7 @@ public:
   bool end_id_matches_def_id (const RefAdaAST& endid);
   bool definable_operator (const char *string);  // operator_symbol sans "/="
   bool is_operator_symbol (const char *string);
-#line 22 "AdaParser.hpp"
+#line 22 "AdaParser.h"
 public:
 	void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory );
 protected:
@@ -386,4 +386,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_30;
 };
 
-#endif /*INC_AdaParser_hpp_*/
+#endif /*INC_AdaParser_h_*/
diff --git a/languages/ada/AdaStoreWalker.cpp b/languages/ada/AdaStoreWalker.cpp
index 167d671c..51cd0067 100644
--- a/languages/ada/AdaStoreWalker.cpp
+++ b/languages/ada/AdaStoreWalker.cpp
@@ -1,11 +1,11 @@
 /* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalker.cpp"$ */
-#include "AdaStoreWalker.hpp"
-#include <antlr/Token.hpp>
-#include <antlr/AST.hpp>
-#include <antlr/NoViableAltException.hpp>
-#include <antlr/MismatchedTokenException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/BitSet.hpp>
+#include "AdaStoreWalker.h"
+#include <antlr/Token.h>
+#include <antlr/AST.h>
+#include <antlr/NoViableAltException.h>
+#include <antlr/MismatchedTokenException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/BitSet.h>
 #line 1 "expandedada.store.g"
 #line 11 "AdaStoreWalker.cpp"
 AdaStoreWalker::AdaStoreWalker()
diff --git a/languages/ada/AdaStoreWalker.hpp b/languages/ada/AdaStoreWalker.h
index c18f5dcd..79b0ce76 100644
--- a/languages/ada/AdaStoreWalker.hpp
+++ b/languages/ada/AdaStoreWalker.h
@@ -1,5 +1,5 @@
-#ifndef INC_AdaStoreWalker_hpp_
-#define INC_AdaStoreWalker_hpp_
+#ifndef INC_AdaStoreWalker_h_
+#define INC_AdaStoreWalker_h_
 
 #line 1 "expandedada.store.g"
 
@@ -8,21 +8,21 @@
 #include <tqfileinfo.h>
 
 #include <codemodel.h>
-#include "AdaAST.hpp"
-#include "ada_utils.hpp"
+#include "AdaAST.h"
+#include "ada_utils.h"
 
-#line 15 "AdaStoreWalker.hpp"
-#include <antlr/config.hpp>
-#include "AdaStoreWalkerTokenTypes.hpp"
-/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalker.hpp"$ */
-#include <antlr/TreeParser.hpp>
+#line 15 "AdaStoreWalker.h"
+#include <antlr/config.h>
+#include "AdaStoreWalkerTokenTypes.h"
+/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalker.h"$ */
+#include <antlr/TreeParser.h>
 
 #line 10 "expandedada.store.g"
 
 #include <codemodel.h>
 #include <kdebug.h>
 
-#line 26 "AdaStoreWalker.hpp"
+#line 26 "AdaStoreWalker.h"
 class CUSTOM_API AdaStoreWalker : public ANTLR_USE_NAMESPACE(antlr)TreeParser, public AdaStoreWalkerTokenTypes
 {
 #line 25 "expandedada.store.g"
@@ -116,7 +116,7 @@ public:
 //        kdDebug() << "defineScope return" << endl;
        return psc;
     }
-#line 30 "AdaStoreWalker.hpp"
+#line 30 "AdaStoreWalker.h"
 public:
 	AdaStoreWalker();
 	static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory );
@@ -347,4 +347,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4;
 };
 
-#endif /*INC_AdaStoreWalker_hpp_*/
+#endif /*INC_AdaStoreWalker_h_*/
diff --git a/languages/ada/AdaStoreWalkerTokenTypes.hpp b/languages/ada/AdaStoreWalkerTokenTypes.h
index daaa4b21..be52bae2 100644
--- a/languages/ada/AdaStoreWalkerTokenTypes.hpp
+++ b/languages/ada/AdaStoreWalkerTokenTypes.h
@@ -1,7 +1,7 @@
-#ifndef INC_AdaStoreWalkerTokenTypes_hpp_
-#define INC_AdaStoreWalkerTokenTypes_hpp_
+#ifndef INC_AdaStoreWalkerTokenTypes_h_
+#define INC_AdaStoreWalkerTokenTypes_h_
 
-/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalkerTokenTypes.hpp"$ */
+/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalkerTokenTypes.h"$ */
 
 #ifndef CUSTOM_API
 # define CUSTOM_API
@@ -304,4 +304,4 @@ struct CUSTOM_API AdaStoreWalkerTokenTypes {
 #ifdef __cplusplus
 };
 #endif
-#endif /*INC_AdaStoreWalkerTokenTypes_hpp_*/
+#endif /*INC_AdaStoreWalkerTokenTypes_h_*/
diff --git a/languages/ada/AdaTokenTypes.hpp b/languages/ada/AdaTokenTypes.h
index 918b1cfd..becbd205 100644
--- a/languages/ada/AdaTokenTypes.hpp
+++ b/languages/ada/AdaTokenTypes.h
@@ -1,7 +1,7 @@
-#ifndef INC_AdaTokenTypes_hpp_
-#define INC_AdaTokenTypes_hpp_
+#ifndef INC_AdaTokenTypes_h_
+#define INC_AdaTokenTypes_h_
 
-/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaTokenTypes.hpp"$ */
+/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaTokenTypes.h"$ */
 
 #ifndef CUSTOM_API
 # define CUSTOM_API
@@ -303,4 +303,4 @@ struct CUSTOM_API AdaTokenTypes {
 #ifdef __cplusplus
 };
 #endif
-#endif /*INC_AdaTokenTypes_hpp_*/
+#endif /*INC_AdaTokenTypes_h_*/
diff --git a/languages/ada/AdaTreeParserSuper.cpp b/languages/ada/AdaTreeParserSuper.cpp
index be5f0623..16e95182 100644
--- a/languages/ada/AdaTreeParserSuper.cpp
+++ b/languages/ada/AdaTreeParserSuper.cpp
@@ -1,11 +1,11 @@
 /* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuper.cpp"$ */
-#include "AdaTreeParserSuper.hpp"
-#include <antlr/Token.hpp>
-#include <antlr/AST.hpp>
-#include <antlr/NoViableAltException.hpp>
-#include <antlr/MismatchedTokenException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/BitSet.hpp>
+#include "AdaTreeParserSuper.h"
+#include <antlr/Token.h>
+#include <antlr/AST.h>
+#include <antlr/NoViableAltException.h>
+#include <antlr/MismatchedTokenException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/BitSet.h>
 #line 1 "ada.tree.g"
 #line 11 "AdaTreeParserSuper.cpp"
 AdaTreeParserSuper::AdaTreeParserSuper()
diff --git a/languages/ada/AdaTreeParserSuper.hpp b/languages/ada/AdaTreeParserSuper.h
index a4d164f0..cb35ac25 100644
--- a/languages/ada/AdaTreeParserSuper.hpp
+++ b/languages/ada/AdaTreeParserSuper.h
@@ -1,15 +1,15 @@
-#ifndef INC_AdaTreeParserSuper_hpp_
-#define INC_AdaTreeParserSuper_hpp_
+#ifndef INC_AdaTreeParserSuper_h_
+#define INC_AdaTreeParserSuper_h_
 
-#include <antlr/config.hpp>
-#include "AdaTreeParserSuperTokenTypes.hpp"
-/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuper.hpp"$ */
-#include <antlr/TreeParser.hpp>
+#include <antlr/config.h>
+#include "AdaTreeParserSuperTokenTypes.h"
+/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuper.h"$ */
+#include <antlr/TreeParser.h>
 
 class CUSTOM_API AdaTreeParserSuper : public ANTLR_USE_NAMESPACE(antlr)TreeParser, public AdaTreeParserSuperTokenTypes
 {
 #line 1 "ada.tree.g"
-#line 13 "AdaTreeParserSuper.hpp"
+#line 13 "AdaTreeParserSuper.h"
 public:
 	AdaTreeParserSuper();
 	static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory );
@@ -238,4 +238,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4;
 };
 
-#endif /*INC_AdaTreeParserSuper_hpp_*/
+#endif /*INC_AdaTreeParserSuper_h_*/
diff --git a/languages/ada/AdaTreeParserSuperTokenTypes.hpp b/languages/ada/AdaTreeParserSuperTokenTypes.h
index 924b7415..f6f75893 100644
--- a/languages/ada/AdaTreeParserSuperTokenTypes.hpp
+++ b/languages/ada/AdaTreeParserSuperTokenTypes.h
@@ -1,7 +1,7 @@
-#ifndef INC_AdaTreeParserSuperTokenTypes_hpp_
-#define INC_AdaTreeParserSuperTokenTypes_hpp_
+#ifndef INC_AdaTreeParserSuperTokenTypes_h_
+#define INC_AdaTreeParserSuperTokenTypes_h_
 
-/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuperTokenTypes.hpp"$ */
+/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuperTokenTypes.h"$ */
 
 #ifndef CUSTOM_API
 # define CUSTOM_API
@@ -304,4 +304,4 @@ struct CUSTOM_API AdaTreeParserSuperTokenTypes {
 #ifdef __cplusplus
 };
 #endif
-#endif /*INC_AdaTreeParserSuperTokenTypes_hpp_*/
+#endif /*INC_AdaTreeParserSuperTokenTypes_h_*/
diff --git a/languages/ada/Makefile.am b/languages/ada/Makefile.am
index d45a2add..26fe8c2c 100644
--- a/languages/ada/Makefile.am
+++ b/languages/ada/Makefile.am
@@ -20,13 +20,13 @@ EXTRA_DIST = ada.g ada.tree.g ada.store.g
 ## The following three rules assume that you have Java installed,
 ## ANTLR installed, and you have the antlr jar in your CLASSPATH.
 
-#AdaLexer.hpp AdaLexer.cpp AdaParser.hpp AdaParser.cpp: ada.g
+#AdaLexer.h AdaLexer.cpp AdaParser.h AdaParser.cpp: ada.g
 #	antlr   ada.g
 
-#AdaTreeParserSuper.hpp AdaTreeParserSuper.cpp: ada.tree.g
+#AdaTreeParserSuper.h AdaTreeParserSuper.cpp: ada.tree.g
 #	antlr   ada.tree.g
 
-#AdaStoreWalker.hpp AdaStoreWalker.cpp: ada.store.g
+#AdaStoreWalker.h AdaStoreWalker.cpp: ada.store.g
 #	antlr -glib ada.tree.g  ada.store.g
 
 genparser:
diff --git a/languages/ada/README.dox b/languages/ada/README.dox
index e71e6d45..017b3aed 100644
--- a/languages/ada/README.dox
+++ b/languages/ada/README.dox
@@ -2,10 +2,10 @@
 Ada Language Support
 
 The ANTLR Ada core support files are:
-  - ada.g             -- contains AdaLexer and AdaParser, requires AdaAST.hpp and adasupport.cpp
+  - ada.g             -- contains AdaLexer and AdaParser, requires AdaAST.h and adasupport.cpp
   - ada.tree.g        -- contains the AdaTreeParserSuper
-  - AdaAST.hpp        -- definition of the AST node used by ada.g
-  - adasupport.hpp    -- general purpose utilities
+  - AdaAST.h        -- definition of the AST node used by ada.g
+  - adasupport.h    -- general purpose utilities
   - adasupport.cpp    -- implementation of general purpose utilities and implementation of AdaParser class methods from ada.g
 
 These are ANTLR master files.
diff --git a/languages/ada/ada.g b/languages/ada/ada.g
index 5f97952b..164c2187 100644
--- a/languages/ada/ada.g
+++ b/languages/ada/ada.g
@@ -27,8 +27,8 @@
 
 
 header "pre_include_hpp" {
-#include <antlr/SemanticException.hpp>  // antlr wants this
-#include "AdaAST.hpp"
+#include <antlr/SemanticException.h>  // antlr wants this
+#include "AdaAST.h"
 #include "preambles.h"
 }
 
diff --git a/languages/ada/ada.store.g b/languages/ada/ada.store.g
index 31dccf99..658bfcfa 100644
--- a/languages/ada/ada.store.g
+++ b/languages/ada/ada.store.g
@@ -9,8 +9,8 @@ header "pre_include_hpp" {
 #include <qfileinfo.h>
 
 #include <codemodel.h>
-#include "AdaAST.hpp"
-#include "ada_utils.hpp"
+#include "AdaAST.h"
+#include "ada_utils.h"
 }
 
 header "post_include_hpp" {
diff --git a/languages/ada/ada_utils.cpp b/languages/ada/ada_utils.cpp
index d7b8bbf7..e12306ea 100644
--- a/languages/ada/ada_utils.cpp
+++ b/languages/ada/ada_utils.cpp
@@ -11,8 +11,8 @@
 
 #include <kdebug.h>
 
-#include "ada_utils.hpp"
-#include "adasupport.hpp"
+#include "ada_utils.h"
+#include "adasupport.h"
 
 TQString qtext (const RefAdaAST& n)
 {
diff --git a/languages/ada/ada_utils.hpp b/languages/ada/ada_utils.h
index 25c9fabd..ae4f9011 100644
--- a/languages/ada/ada_utils.hpp
+++ b/languages/ada/ada_utils.h
@@ -4,7 +4,7 @@
 #define ADA_UTILS_H
 
 #include <tqstring.h>
-#include "AdaAST.hpp"
+#include "AdaAST.h"
 
 TQString qtext (const RefAdaAST& n);
 TQStringList qnamelist (const RefAdaAST& n);
diff --git a/languages/ada/adasupport.cpp b/languages/ada/adasupport.cpp
index 6b877b7b..69baa66d 100644
--- a/languages/ada/adasupport.cpp
+++ b/languages/ada/adasupport.cpp
@@ -4,10 +4,10 @@
 #include <stdlib.h>
 #include <stack>
 #include <string>
-#include <antlr/AST.hpp>
-#include "AdaParser.hpp"
-#include "AdaTokenTypes.hpp"
-#include "adasupport.hpp"
+#include <antlr/AST.h>
+#include "AdaParser.h"
+#include "AdaTokenTypes.h"
+#include "adasupport.h"
 
 #define eq !strcmp
 
diff --git a/languages/ada/adasupport.hpp b/languages/ada/adasupport.h
index 9d65e0e5..f6bfddee 100644
--- a/languages/ada/adasupport.hpp
+++ b/languages/ada/adasupport.h
@@ -4,7 +4,7 @@
 #define ADASUPPORT_H
 
 #include <string>
-#include "AdaAST.hpp"
+#include "AdaAST.h"
 
 std::string text (const RefAdaAST& n);
 int txteq (RefAdaAST n1, RefAdaAST n2);
diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
index e08ef9a3..0d87f0a7 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -28,10 +28,10 @@
 #include "problemreporter.h"
 #include "backgroundparser.h"
 
-#include "AdaLexer.hpp"
-#include "AdaParser.hpp"
-#include "AdaStoreWalker.hpp"
-#include "AdaAST.hpp"
+#include "AdaLexer.h"
+#include "AdaParser.h"
+#include "AdaStoreWalker.h"
+#include "AdaAST.h"
 
 #include <kdevplugininfo.h>
 
diff --git a/languages/ada/backgroundparser.cpp b/languages/ada/backgroundparser.cpp
index 68607851..4b77abcd 100644
--- a/languages/ada/backgroundparser.cpp
+++ b/languages/ada/backgroundparser.cpp
@@ -11,9 +11,9 @@
 
 #include "backgroundparser.h"
 #include "problemreporter.h"
-#include "AdaLexer.hpp"
-#include "AdaParser.hpp"
-#include "AdaAST.hpp"
+#include "AdaLexer.h"
+#include "AdaParser.h"
+#include "AdaAST.h"
 #include <kdebug.h>
 #include <tqfile.h>