summaryrefslogtreecommitdiffstats
path: root/languages/ada
diff options
context:
space:
mode:
Diffstat (limited to 'languages/ada')
-rw-r--r--languages/ada/AdaAST.h (renamed from languages/ada/AdaAST.hpp)2
-rw-r--r--languages/ada/AdaLexer.cpp16
-rw-r--r--languages/ada/AdaLexer.h (renamed from languages/ada/AdaLexer.hpp)28
-rw-r--r--languages/ada/AdaParser.cpp8
-rw-r--r--languages/ada/AdaParser.h (renamed from languages/ada/AdaParser.hpp)26
-rw-r--r--languages/ada/AdaStoreWalker.cpp14
-rw-r--r--languages/ada/AdaStoreWalker.h (renamed from languages/ada/AdaStoreWalker.hpp)24
-rw-r--r--languages/ada/AdaStoreWalkerTokenTypes.h (renamed from languages/ada/AdaStoreWalkerTokenTypes.hpp)8
-rw-r--r--languages/ada/AdaTokenTypes.h (renamed from languages/ada/AdaTokenTypes.hpp)8
-rw-r--r--languages/ada/AdaTreeParserSuper.cpp14
-rw-r--r--languages/ada/AdaTreeParserSuper.h (renamed from languages/ada/AdaTreeParserSuper.hpp)16
-rw-r--r--languages/ada/AdaTreeParserSuperTokenTypes.h (renamed from languages/ada/AdaTreeParserSuperTokenTypes.hpp)8
-rw-r--r--languages/ada/Makefile.am6
-rw-r--r--languages/ada/README.dox6
-rw-r--r--languages/ada/ada.g4
-rw-r--r--languages/ada/ada.store.g18
-rw-r--r--languages/ada/ada_utils.cpp4
-rw-r--r--languages/ada/ada_utils.h (renamed from languages/ada/ada_utils.hpp)2
-rw-r--r--languages/ada/adasupport.cpp8
-rw-r--r--languages/ada/adasupport.h (renamed from languages/ada/adasupport.hpp)2
-rw-r--r--languages/ada/adasupportpart.cpp48
-rw-r--r--languages/ada/adasupportpart.h2
-rw-r--r--languages/ada/addclassdlg.ui4
-rw-r--r--languages/ada/backgroundparser.cpp6
-rw-r--r--languages/ada/configproblemreporter.ui4
-rw-r--r--languages/ada/problemreporter.cpp28
-rw-r--r--languages/ada/problemreporter.h2
27 files changed, 158 insertions, 158 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..b15e5f3e 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" {
@@ -30,7 +30,7 @@ options {
{
private:
- QString m_fileName;
+ TQString m_fileName;
QValueList<NamespaceDom> m_scopeStack;
CodeModel* m_model;
QValueList<QStringList> m_imports;
@@ -46,8 +46,8 @@ public:
CodeModel* codeModel () { return m_model; }
const CodeModel* codeModel () const { return m_model; }
- 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; }
void init () {
m_scopeStack.clear ();
@@ -66,13 +66,13 @@ public:
void wipeout () { m_model->wipeout (); }
// void out () { m_store->out (); }
- void removeWithReferences (const QString& fileName) {
+ void removeWithReferences (const TQString& fileName) {
m_model->removeFile (m_model->fileByName(fileName));
}
NamespaceDom insertScopeContainer
(NamespaceDom scope, const QStringList & scopes ) {
QStringList::ConstIterator it = scopes.begin();
- QString prefix( *it );
+ TQString prefix( *it );
NamespaceDom ns = scope->namespaceByName( prefix );
// kdDebug() << "insertScopeContainer begin with prefix " << prefix << endl;
if (!ns.data()) {
@@ -89,7 +89,7 @@ public:
}
// kdDebug() << "insertScopeContainer: while" << endl;
while ( ++it != scopes.end() ) {
- QString nameSegment( *it );
+ TQString nameSegment( *it );
prefix += "." + nameSegment;
// kdDebug() << "insertScopeContainer: while prefix = " << prefix << endl;
NamespaceDom inner = scope->namespaceByName( prefix );
@@ -592,7 +592,7 @@ name_or_qualified
package_body
: #(PACKAGE_BODY id:def_id
/* TBD
- { QString name (qtext (id));
+ { TQString name (qtext (id));
}
*/
pkg_body_part)
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..ab1eac5e 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>
@@ -40,8 +40,8 @@ enum { KDEV_PCS_VERSION = 6 };
typedef KDevGenericFactory<AdaSupportPart> AdaSupportPartFactory;
-static const KDevPluginInfo data("kdevadasupport");
-K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data))
+static const KDevPluginInfo pluginData("kdevadasupport");
+K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (pluginData))
struct AdaSupportPartData {
@@ -51,13 +51,13 @@ struct AdaSupportPartData {
};
AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &)
- : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
+ : KDevLanguageSupport (&pluginData, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData())
{
setInstance (AdaSupportPartFactory::instance ());
d->problemReporter = new ProblemReporter (this);
-// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)),
-// d->problemReporter, TQT_SLOT (configWidget (KDialogBase*)));
+// connect (core (), TQ_SIGNAL (configWidget (KDialogBase*)),
+// d->problemReporter, TQ_SLOT (configWidget (KDialogBase*)));
d->problemReporter->setIcon( SmallIcon("application-vnd.tde.info") );
mainWindow( )->embedOutputView( d->problemReporter, i18n("Problems"), i18n("Problem reporter"));
TQWhatsThis::add(d->problemReporter, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. "
@@ -65,15 +65,15 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri
setXMLFile ("adasupportpart.rc");
- connect (core (), TQT_SIGNAL (projectOpened ()), this, TQT_SLOT (projectOpened ()));
- connect (core (), TQT_SIGNAL (projectClosed ()), this, TQT_SLOT (projectClosed ()));
+ connect (core (), TQ_SIGNAL (projectOpened ()), this, TQ_SLOT (projectOpened ()));
+ connect (core (), TQ_SIGNAL (projectClosed ()), this, TQ_SLOT (projectClosed ()));
- connect (partController (), TQT_SIGNAL (savedFile (const KURL&)),
- this, TQT_SLOT (savedFile (const KURL&)));
+ connect (partController (), TQ_SIGNAL (savedFile (const KURL&)),
+ this, TQ_SLOT (savedFile (const KURL&)));
-// connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)), this, TQT_SLOT (configWidget (KDialogBase*)));
- connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)),
- d->problemReporter, TQT_SLOT(configWidget(KDialogBase*)) );
+// connect (core (), TQ_SIGNAL (configWidget (KDialogBase*)), this, TQ_SLOT (configWidget (KDialogBase*)));
+ connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)),
+ d->problemReporter, TQ_SLOT(configWidget(KDialogBase*)) );
// a small hack (robe)
//classStore ()->globalScope ()->setName ("(default packages)");
@@ -102,14 +102,14 @@ KDevLanguageSupport::Features AdaSupportPart::features ()
void AdaSupportPart::projectOpened ()
{
- connect (project (), TQT_SIGNAL (addedFilesToProject (const TQStringList &)),
- this, TQT_SLOT (addedFilesToProject (const TQStringList &)));
- connect (project (), TQT_SIGNAL (removedFilesFromProject (const TQStringList &)),
- this, TQT_SLOT (removedFilesFromProject (const TQStringList &)));
- connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ),
- this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) );
-
- TQTimer::singleShot (0, this, TQT_SLOT (initialParse ()));
+ connect (project (), TQ_SIGNAL (addedFilesToProject (const TQStringList &)),
+ this, TQ_SLOT (addedFilesToProject (const TQStringList &)));
+ connect (project (), TQ_SIGNAL (removedFilesFromProject (const TQStringList &)),
+ this, TQ_SLOT (removedFilesFromProject (const TQStringList &)));
+ connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ),
+ this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) );
+
+ TQTimer::singleShot (0, this, TQ_SLOT (initialParse ()));
}
diff --git a/languages/ada/adasupportpart.h b/languages/ada/adasupportpart.h
index eb9e2630..22d66fd8 100644
--- a/languages/ada/adasupportpart.h
+++ b/languages/ada/adasupportpart.h
@@ -12,7 +12,7 @@ class TQStringList;
class AdaSupportPart : public KDevLanguageSupport
{
- Q_OBJECT
+ TQ_OBJECT
public:
AdaSupportPart (TQObject *parent, const char *name, const TQStringList &);
diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui
index 046b06ab..94006be8 100644
--- a/languages/ada/addclassdlg.ui
+++ b/languages/ada/addclassdlg.ui
@@ -420,9 +420,9 @@
<tabstop>PushButton2</tabstop>
<tabstop>PushButton3</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>Public_toggled( bool )</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">keditlistbox.h</include>
<include location="global" impldecl="in implementation">kcombobox.h</include>
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>
diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui
index f2e03383..32a9b13d 100644
--- a/languages/ada/configproblemreporter.ui
+++ b/languages/ada/configproblemreporter.ui
@@ -78,12 +78,12 @@
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">configproblemreporter.ui.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>init()</slot>
<slot>destroy()</slot>
<slot>accept()</slot>
<slot>bgParserCheckbox_toggled( bool b )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index 12090860..66966f33 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -92,19 +92,19 @@ ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const
m_timer = new TQTimer( this );
- connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
- this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) );
- connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)),
- this, TQT_SLOT(slotPartAdded(KParts::Part*)) );
- connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)),
- this, TQT_SLOT(slotPartRemoved(KParts::Part*)) );
+ connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)),
+ this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) );
+ connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)),
+ this, TQ_SLOT(slotPartAdded(KParts::Part*)) );
+ connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)),
+ this, TQ_SLOT(slotPartRemoved(KParts::Part*)) );
- connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) );
+ connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) );
- connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
- this, TQT_SLOT(slotSelected(TQListViewItem*)) );
- connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)),
- this, TQT_SLOT(slotSelected(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+ this, TQ_SLOT(slotSelected(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+ this, TQ_SLOT(slotSelected(TQListViewItem*)) );
configure();
}
@@ -134,7 +134,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part )
m_editor = dynamic_cast<KTextEditor::EditInterface*>( part );
if( m_editor )
- connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) );
+ connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) );
m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part );
@@ -255,8 +255,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg )
kdDebug() << "ProblemReporter::configWidget()" << endl;
TQVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"), BarIcon( "text-x-src", TDEIcon::SizeMedium ));
ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox );
- connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
- connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure()));
+ connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()));
+ connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure()));
}
void ProblemReporter::slotPartAdded( KParts::Part* part )
diff --git a/languages/ada/problemreporter.h b/languages/ada/problemreporter.h
index 3f23cbfd..4b497a1a 100644
--- a/languages/ada/problemreporter.h
+++ b/languages/ada/problemreporter.h
@@ -38,7 +38,7 @@ namespace KTextEditor{
}
class ProblemReporter: public TQListView{
- Q_OBJECT
+ TQ_OBJECT
public:
ProblemReporter( AdaSupportPart* part, TQWidget* parent=0, const char* name=0 );
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 16:34:57 +0000