diff options
Diffstat (limited to 'languages/ada')
25 files changed, 130 insertions, 128 deletions
diff --git a/languages/ada/AdaParser.cpp b/languages/ada/AdaParser.cpp index e783595e..3656446e 100644 --- a/languages/ada/AdaParser.cpp +++ b/languages/ada/AdaParser.cpp @@ -1954,10 +1954,10 @@ void AdaParser::value_s() { returnAST = value_s_AST; } -void AdaParser::parenth_values() { +void AdaParser::tqparenth_values() { returnAST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST; - RefAdaAST parenth_values_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); + RefAdaAST tqparenth_values_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); match(LPAREN); value(); @@ -1981,8 +1981,8 @@ void AdaParser::parenth_values() { _loop46:; } // ( ... )* match(RPAREN); - parenth_values_AST = RefAdaAST(currentAST.root); - returnAST = parenth_values_AST; + tqparenth_values_AST = RefAdaAST(currentAST.root); + returnAST = tqparenth_values_AST; } void AdaParser::value() { @@ -2869,10 +2869,10 @@ RefAdaAST AdaParser::is_operator() { return d; } -void AdaParser::parenthesized_primary() { +void AdaParser::tqparenthesized_primary() { returnAST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST; - RefAdaAST parenthesized_primary_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); + RefAdaAST tqparenthesized_primary_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); ANTLR_USE_NAMESPACE(antlr)RefToken pp = ANTLR_USE_NAMESPACE(antlr)nullToken; RefAdaAST pp_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); @@ -2913,8 +2913,8 @@ void AdaParser::parenthesized_primary() { Set(pp_AST, PARENTHESIZED_PRIMARY); #line 2915 "AdaParser.cpp" } - parenthesized_primary_AST = RefAdaAST(currentAST.root); - returnAST = parenthesized_primary_AST; + tqparenthesized_primary_AST = RefAdaAST(currentAST.root); + returnAST = tqparenthesized_primary_AST; } void AdaParser::extension_opt() { @@ -5643,7 +5643,7 @@ void AdaParser::enumeration_aggregate() { ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST; RefAdaAST enumeration_aggregate_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); - parenth_values(); + tqparenth_values(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } @@ -8484,7 +8484,7 @@ void AdaParser::statements() { case SELECT: case ABORT: case RAISE: - case REQUEUE: + case RETQUEUE: { statement(); if (inputState->guessing==0) { @@ -8601,7 +8601,7 @@ void AdaParser::handled_stmts_opt() { case SELECT: case ABORT: case RAISE: - case REQUEUE: + case RETQUEUE: { statements(); if (inputState->guessing==0) { @@ -8708,7 +8708,7 @@ void AdaParser::statement() { } break; } - case REQUEUE: + case RETQUEUE: { requeue_stmt(); if (inputState->guessing==0) { @@ -8878,7 +8878,7 @@ void AdaParser::def_label_opt() { case SELECT: case ABORT: case RAISE: - case REQUEUE: + case RETQUEUE: { break; } @@ -9207,7 +9207,7 @@ void AdaParser::requeue_stmt() { r_AST = astFactory->create(r); astFactory->makeASTRoot(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(r_AST)); } - match(REQUEUE); + match(RETQUEUE); name(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); @@ -9238,7 +9238,7 @@ void AdaParser::requeue_stmt() { match(SEMI); if ( inputState->guessing==0 ) { #line 1393 "ada.g" - Set (r_AST, REQUEUE_STATEMENT); + Set (r_AST, RETQUEUE_STATEMENT); #line 9243 "AdaParser.cpp" } requeue_stmt_AST = RefAdaAST(currentAST.root); @@ -10517,7 +10517,7 @@ void AdaParser::stmts_opt() { case SELECT: case ABORT: case RAISE: - case REQUEUE: + case RETQUEUE: { statement(); if (inputState->guessing==0) { @@ -11401,7 +11401,7 @@ void AdaParser::primary() { } case LPAREN: { - parenthesized_primary(); + tqparenthesized_primary(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } @@ -11623,7 +11623,7 @@ void AdaParser::name_or_qualified() { switch ( LA(1)) { case LPAREN: { - parenthesized_primary(); + tqparenthesized_primary(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } @@ -12036,7 +12036,7 @@ const char* AdaParser::tokenNames[] = { "RAISE_STATEMENT", "RANGE_ATTRIBUTE_REFERENCE", "RECORD_REPRESENTATION_CLAUSE", - "REQUEUE_STATEMENT", + "RETQUEUE_STATEMENT", "RETURN_STATEMENT", "SELECTIVE_ACCEPT", "SEQUENCE_OF_STATEMENTS", diff --git a/languages/ada/AdaParser.hpp b/languages/ada/AdaParser.hpp index 0074c820..cf9fec9b 100644 --- a/languages/ada/AdaParser.hpp +++ b/languages/ada/AdaParser.hpp @@ -97,7 +97,7 @@ public: public: void function_tail(); public: void generic_inst(); public: void value_s(); - public: void parenth_values(); + public: void tqparenth_values(); public: void value(); public: void ranged_expr_s(); public: void ranged_expr(); @@ -115,7 +115,7 @@ public: public: void name(); public: RefAdaAST definable_operator_symbol(); public: RefAdaAST is_operator(); - public: void parenthesized_primary(); + public: void tqparenthesized_primary(); public: void extension_opt(); public: void separate_or_abstract( RefAdaAST t diff --git a/languages/ada/AdaStoreWalker.cpp b/languages/ada/AdaStoreWalker.cpp index 167d671c..1561277f 100644 --- a/languages/ada/AdaStoreWalker.cpp +++ b/languages/ada/AdaStoreWalker.cpp @@ -3223,8 +3223,8 @@ void AdaStoreWalker::name(RefAdaAST _t) { _retTree = _t; } -void AdaStoreWalker::parenthesized_primary(RefAdaAST _t) { - RefAdaAST parenthesized_primary_AST_in = (_t == RefAdaAST(ASTNULL)) ? RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; +void AdaStoreWalker::tqparenthesized_primary(RefAdaAST _t) { + RefAdaAST tqparenthesized_primary_AST_in = (_t == RefAdaAST(ASTNULL)) ? RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; try { // for error handling RefAdaAST __t129 = _t; @@ -6710,7 +6710,7 @@ void AdaStoreWalker::statement(RefAdaAST _t) { _t = _retTree; break; } - case REQUEUE_STATEMENT: + case RETQUEUE_STATEMENT: { requeue_stmt(_t); _t = _retTree; @@ -7102,7 +7102,7 @@ void AdaStoreWalker::requeue_stmt(RefAdaAST _t) { try { // for error handling RefAdaAST __t470 = _t; RefAdaAST tmp233_AST_in = _t; - match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),REQUEUE_STATEMENT); + match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),RETQUEUE_STATEMENT); _t = _t->getFirstChild(); name(_t); _t = _retTree; @@ -8809,7 +8809,7 @@ void AdaStoreWalker::primary(RefAdaAST _t) { } case PARENTHESIZED_PRIMARY: { - parenthesized_primary(_t); + tqparenthesized_primary(_t); _t = _retTree; break; } @@ -8960,7 +8960,7 @@ void AdaStoreWalker::name_or_qualified(RefAdaAST _t) { switch ( _t->getType()) { case PARENTHESIZED_PRIMARY: { - parenthesized_primary(_t); + tqparenthesized_primary(_t); _t = _retTree; break; } @@ -9271,7 +9271,7 @@ const char* AdaStoreWalker::tokenNames[] = { "RAISE_STATEMENT", "RANGE_ATTRIBUTE_REFERENCE", "RECORD_REPRESENTATION_CLAUSE", - "REQUEUE_STATEMENT", + "RETQUEUE_STATEMENT", "RETURN_STATEMENT", "SELECTIVE_ACCEPT", "SEQUENCE_OF_STATEMENTS", diff --git a/languages/ada/AdaStoreWalker.hpp b/languages/ada/AdaStoreWalker.hpp index c18f5dcd..bf661ea2 100644 --- a/languages/ada/AdaStoreWalker.hpp +++ b/languages/ada/AdaStoreWalker.hpp @@ -185,7 +185,7 @@ public: public: void defining_identifier_list(RefAdaAST _t); public: void init_opt(RefAdaAST _t); public: void name(RefAdaAST _t); - public: void parenthesized_primary(RefAdaAST _t); + public: void tqparenthesized_primary(RefAdaAST _t); public: void extension_opt(RefAdaAST _t); public: void task_type_or_single_decl(RefAdaAST _t); public: void prot_type_or_single_decl(RefAdaAST _t); diff --git a/languages/ada/AdaStoreWalkerTokenTypes.hpp b/languages/ada/AdaStoreWalkerTokenTypes.hpp index daaa4b21..bdaf1d2a 100644 --- a/languages/ada/AdaStoreWalkerTokenTypes.hpp +++ b/languages/ada/AdaStoreWalkerTokenTypes.hpp @@ -92,7 +92,7 @@ struct CUSTOM_API AdaStoreWalkerTokenTypes { OR = 81, TERMINATE = 82, RAISE = 83, - REQUEUE = 84, + RETQUEUE = 84, AND = 85, XOR = 86, NOT = 87, @@ -177,7 +177,7 @@ struct CUSTOM_API AdaStoreWalkerTokenTypes { RAISE_STATEMENT = 166, RANGE_ATTRIBUTE_REFERENCE = 167, RECORD_REPRESENTATION_CLAUSE = 168, - REQUEUE_STATEMENT = 169, + RETQUEUE_STATEMENT = 169, RETURN_STATEMENT = 170, SELECTIVE_ACCEPT = 171, SEQUENCE_OF_STATEMENTS = 172, diff --git a/languages/ada/AdaTokenTypes.hpp b/languages/ada/AdaTokenTypes.hpp index 918b1cfd..8ef62fbf 100644 --- a/languages/ada/AdaTokenTypes.hpp +++ b/languages/ada/AdaTokenTypes.hpp @@ -92,7 +92,7 @@ struct CUSTOM_API AdaTokenTypes { OR = 81, TERMINATE = 82, RAISE = 83, - REQUEUE = 84, + RETQUEUE = 84, AND = 85, XOR = 86, NOT = 87, @@ -177,7 +177,7 @@ struct CUSTOM_API AdaTokenTypes { RAISE_STATEMENT = 166, RANGE_ATTRIBUTE_REFERENCE = 167, RECORD_REPRESENTATION_CLAUSE = 168, - REQUEUE_STATEMENT = 169, + RETQUEUE_STATEMENT = 169, RETURN_STATEMENT = 170, SELECTIVE_ACCEPT = 171, SEQUENCE_OF_STATEMENTS = 172, diff --git a/languages/ada/AdaTreeParserSuper.cpp b/languages/ada/AdaTreeParserSuper.cpp index be5f0623..f6c122b5 100644 --- a/languages/ada/AdaTreeParserSuper.cpp +++ b/languages/ada/AdaTreeParserSuper.cpp @@ -2404,8 +2404,8 @@ void AdaTreeParserSuper::definable_operator_symbol(ANTLR_USE_NAMESPACE(antlr)Ref _retTree = _t; } -void AdaTreeParserSuper::parenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { - ANTLR_USE_NAMESPACE(antlr)RefAST parenthesized_primary_AST_in = (_t == ANTLR_USE_NAMESPACE(antlr)RefAST(ASTNULL)) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t; +void AdaTreeParserSuper::tqparenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { + ANTLR_USE_NAMESPACE(antlr)RefAST tqparenthesized_primary_AST_in = (_t == ANTLR_USE_NAMESPACE(antlr)RefAST(ASTNULL)) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t; try { // for error handling ANTLR_USE_NAMESPACE(antlr)RefAST __t101 = _t; @@ -6298,7 +6298,7 @@ void AdaTreeParserSuper::statement(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { _t = _retTree; break; } - case REQUEUE_STATEMENT: + case RETQUEUE_STATEMENT: { requeue_stmt(_t); _t = _retTree; @@ -6690,7 +6690,7 @@ void AdaTreeParserSuper::requeue_stmt(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { try { // for error handling ANTLR_USE_NAMESPACE(antlr)RefAST __t463 = _t; ANTLR_USE_NAMESPACE(antlr)RefAST tmp231_AST_in = _t; - match(_t,REQUEUE_STATEMENT); + match(_t,RETQUEUE_STATEMENT); _t = _t->getFirstChild(); name(_t); _t = _retTree; @@ -8397,7 +8397,7 @@ void AdaTreeParserSuper::primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { } case PARENTHESIZED_PRIMARY: { - parenthesized_primary(_t); + tqparenthesized_primary(_t); _t = _retTree; break; } @@ -8548,7 +8548,7 @@ void AdaTreeParserSuper::name_or_qualified(ANTLR_USE_NAMESPACE(antlr)RefAST _t) switch ( _t->getType()) { case PARENTHESIZED_PRIMARY: { - parenthesized_primary(_t); + tqparenthesized_primary(_t); _t = _retTree; break; } @@ -8882,7 +8882,7 @@ const char* AdaTreeParserSuper::tokenNames[] = { "RAISE_STATEMENT", "RANGE_ATTRIBUTE_REFERENCE", "RECORD_REPRESENTATION_CLAUSE", - "REQUEUE_STATEMENT", + "RETQUEUE_STATEMENT", "RETURN_STATEMENT", "SELECTIVE_ACCEPT", "SEQUENCE_OF_STATEMENTS", diff --git a/languages/ada/AdaTreeParserSuper.hpp b/languages/ada/AdaTreeParserSuper.hpp index a4d164f0..01833993 100644 --- a/languages/ada/AdaTreeParserSuper.hpp +++ b/languages/ada/AdaTreeParserSuper.hpp @@ -67,7 +67,7 @@ public: public: void init_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void name(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void definable_operator_symbol(ANTLR_USE_NAMESPACE(antlr)RefAST _t); - public: void parenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + public: void tqparenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void extension_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void spec_decl_part(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void basic_declarative_items_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t); diff --git a/languages/ada/AdaTreeParserSuperTokenTypes.hpp b/languages/ada/AdaTreeParserSuperTokenTypes.hpp index 924b7415..46edd24a 100644 --- a/languages/ada/AdaTreeParserSuperTokenTypes.hpp +++ b/languages/ada/AdaTreeParserSuperTokenTypes.hpp @@ -92,7 +92,7 @@ struct CUSTOM_API AdaTreeParserSuperTokenTypes { OR = 81, TERMINATE = 82, RAISE = 83, - REQUEUE = 84, + RETQUEUE = 84, AND = 85, XOR = 86, NOT = 87, @@ -177,7 +177,7 @@ struct CUSTOM_API AdaTreeParserSuperTokenTypes { RAISE_STATEMENT = 166, RANGE_ATTRIBUTE_REFERENCE = 167, RECORD_REPRESENTATION_CLAUSE = 168, - REQUEUE_STATEMENT = 169, + RETQUEUE_STATEMENT = 169, RETURN_STATEMENT = 170, SELECTIVE_ACCEPT = 171, SEQUENCE_OF_STATEMENTS = 172, diff --git a/languages/ada/README.dox b/languages/ada/README.dox index e71e6d45..ccb7f0aa 100644 --- a/languages/ada/README.dox +++ b/languages/ada/README.dox @@ -24,7 +24,7 @@ with the one from <a href="ftp://fara.cs.uni-potsdam.de/incoming/CppCodeGenerato \authors <a href="mailto:roberto AT kdevelop.org">Roberto Raggi</a> \authors <a href="mailto:cloudtemple AT mksat.net">Alexander Dymo</a> -\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. \requirement Ada compiler diff --git a/languages/ada/ada.g b/languages/ada/ada.g index 5f97952b..876255f5 100644 --- a/languages/ada/ada.g +++ b/languages/ada/ada.g @@ -179,7 +179,7 @@ generic_inst : NEW! compound_name ( LPAREN! value_s RPAREN! )? { pop_def_id(); } ; -parenth_values : LPAREN! value ( COMMA! value )* RPAREN! +tqparenth_values : LPAREN! value ( COMMA! value )* RPAREN! ; value : ( OTHERS^ RIGHT_SHAFT! expression @@ -287,7 +287,7 @@ definable_operator_symbol returns [RefAdaAST d] op:CHAR_STRING { #op->setType(OPERATOR_SYMBOL); d=#op; } ; -parenthesized_primary : pp:LPAREN^ +tqparenthesized_primary : pp:LPAREN^ ( NuLL RECORD! | value_s extension_opt ) @@ -851,7 +851,7 @@ abstract_tagged_limited_opt local_enum_name : IDENTIFIER // to be refined: do a symbol table lookup ; -enumeration_aggregate : parenth_values +enumeration_aggregate : tqparenth_values ; aliased_constant_opt : ( ALIASED )? ( CONSTANT )? @@ -1267,7 +1267,7 @@ accept_stmt : a:ACCEPT^ def_id[false] entry_index_opt formal_part_opt ; entry_index_opt : ( (LPAREN expression RPAREN) => LPAREN! expression RPAREN! - // Looks alot like parenthesized_expr_opt, but it's not. + // Looks alot like tqparenthesized_expr_opt, but it's not. // We need the syn pred for the usage context in accept_stmt. // The formal_part_opt that follows the entry_index_opt there // creates ambiguity (due to the opening LPAREN.) @@ -1463,7 +1463,7 @@ factor : ( NOT^ primary ; primary : ( name_or_qualified - | parenthesized_primary + | tqparenthesized_primary | allocator | NuLL | NUMERIC_LIT @@ -1485,7 +1485,7 @@ name_or_qualified { RefAdaAST dummy; } ) | p:LPAREN^ value_s RPAREN! { Set(#p, INDEXED_COMPONENT); } - | TIC^ ( parenthesized_primary | attribute_id ) + | TIC^ ( tqparenthesized_primary | attribute_id ) )* ; @@ -1773,7 +1773,7 @@ tokens { // part 3: Non-RM synthetic tokens. // They exist mainly to normalize the node structure with respect to // optional items. (Without them, the presence or absence of an optional - // item would change the node layout, but we want a fixed layout.) + // item would change the node tqlayout, but we want a fixed tqlayout.) ABSTRACT_FUNCTION_DECLARATION; ABSTRACT_PROCEDURE_DECLARATION; ACCESS_TO_FUNCTION_DECLARATION; diff --git a/languages/ada/ada.store.g b/languages/ada/ada.store.g index dbca7312..a9a6fbde 100644 --- a/languages/ada/ada.store.g +++ b/languages/ada/ada.store.g @@ -582,7 +582,7 @@ name_or_qualified ) | #(INDEXED_COMPONENT name_or_qualified value_s) | #(TIC name_or_qualified - ( parenthesized_primary + ( tqparenthesized_primary | attribute_id ) ) diff --git a/languages/ada/ada.tree.g b/languages/ada/ada.tree.g index df167dcd..6f343f97 100644 --- a/languages/ada/ada.tree.g +++ b/languages/ada/ada.tree.g @@ -189,7 +189,7 @@ name : IDENTIFIER definable_operator_symbol : OPERATOR_SYMBOL ; -parenthesized_primary +tqparenthesized_primary : #(PARENTHESIZED_PRIMARY ( NuLL | value_s extension_opt ) ) ; @@ -901,7 +901,7 @@ factor : #(NOT primary) primary : ( name_or_qualified - | parenthesized_primary + | tqparenthesized_primary | allocator | NuLL | NUMERIC_LIT @@ -926,7 +926,7 @@ name_or_qualified ) | #(INDEXED_COMPONENT name_or_qualified value_s) | #(TIC name_or_qualified - ( parenthesized_primary + ( tqparenthesized_primary | attribute_id ) ) diff --git a/languages/ada/ada_utils.cpp b/languages/ada/ada_utils.cpp index 6e4bea13..516218c8 100644 --- a/languages/ada/ada_utils.cpp +++ b/languages/ada/ada_utils.cpp @@ -16,7 +16,7 @@ TQString qtext (const RefAdaAST& n) { - return TQString::fromLatin1 (text (n).c_str ()); + return TQString::tqfromLatin1 (text (n).c_str ()); } TQStringList qnamelist (const RefAdaAST& n) @@ -30,7 +30,7 @@ TQString ada_spec_filename (const TQString& comp_unit_name) { TQString fn (comp_unit_name.lower ()); - fn.replace (TQRegExp("."), "-"); + fn.tqreplace (TQRegExp("."), "-"); fn += ".ads"; return fn; } @@ -44,7 +44,7 @@ TQString fq_specfilename (const TQString& comp_unit_name) TQString adaincpath = getenv ("ADA_INCLUDE_PATH"); if (adaincpath.isNull ()) - return TQString::null; + return TQString(); TQStringList dirs = TQStringList::split (':', adaincpath); TQString fq_filename; @@ -64,6 +64,6 @@ TQString fq_specfilename (const TQString& comp_unit_name) } else { kdDebug () << "Cannot find file " << fname << endl; } - return TQString::null; + return TQString(); } diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 7c7f4198..35b34c44 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -50,8 +50,8 @@ struct AdaSupportPartData { AdaSupportPartData () : problemReporter (0) {} }; -AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &) - : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) +AdaSupportPart::AdaSupportPart (TQObject *tqparent, const char *name, const TQStringList &) + : KDevLanguageSupport (&data, tqparent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) { setInstance (AdaSupportPartFactory::instance ()); @@ -78,7 +78,7 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri // a small hack (robe) //classStore ()->globalScope ()->setName ("(default packages)"); //classStore ()->addScope (classStore ()->globalScope ()); - //classStore ()->globalScope ()->setName (TQString::null); + //classStore ()->globalScope ()->setName (TQString()); } @@ -143,7 +143,7 @@ void AdaSupportPart::initialParse () TQString fn = project ()->projectDirectory () + "/" + *it; maybeParse (fn); - kapp->processEvents (500); + kapp->tqprocessEvents (500); } emit updatedSourceInfo(); @@ -167,7 +167,7 @@ void AdaSupportPart::maybeParse (const TQString &fileName) { kdDebug () << "AdaSupportPart::maybeParse: " << fileName << endl; - if (!fileExtensions ().contains (TQFileInfo (fileName).extension ())) + if (!fileExtensions ().tqcontains (TQFileInfo (fileName).extension ())) return; // mainWindow ()->statusBar ()->message (i18n ("Parsing file: %1").arg (fileName)); @@ -250,7 +250,7 @@ void AdaSupportPart::parse (const TQString &fileName) } } catch (antlr::ANTLRException& ex) { kdDebug () << "*exception*: " << ex.toString ().c_str () << endl; - d->problemReporter->reportError (TQString::fromLatin1( ex.getMessage ().c_str() ), + d->problemReporter->reportError (TQString::tqfromLatin1( ex.getMessage ().c_str() ), fileName, lexer.getLine (), lexer.getColumn ()); @@ -285,7 +285,7 @@ void AdaSupportPart::parseContents (const TQString& contents, const TQString& fi } catch (antlr::ANTLRException& ex) { kdDebug () << "*exception*: " << ex.toString ().c_str () << endl; - d->problemReporter->reportError (TQString::fromLatin1( ex.getMessage().c_str() ), + d->problemReporter->reportError (TQString::tqfromLatin1( ex.getMessage().c_str() ), fileName, lexer.getLine (), lexer.getColumn ()); @@ -298,7 +298,7 @@ void AdaSupportPart::savedFile (const KURL& fileName) { kdDebug () << "AdaSupportPart::savedFile ()" << endl; - if (project ()->allFiles ().contains (fileName.path().mid (project ()->projectDirectory ().length () + 1))) { + if (project ()->allFiles ().tqcontains (fileName.path().mid (project ()->projectDirectory ().length () + 1))) { maybeParse (fileName.path()); emit updatedSourceInfo(); } @@ -328,7 +328,7 @@ void AdaSupportPart::saveProjectSourceInfo( ) return; TQDataStream stream( &f ); - TQMap<TQString, Q_ULONG> offsets; + TQMap<TQString, TQ_ULONG> offsets; TQString pcs( "PCS" ); stream << pcs << KDEV_PCS_VERSION; @@ -336,13 +336,13 @@ void AdaSupportPart::saveProjectSourceInfo( ) stream << int( fileList.size() ); for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){ const FileDom dom = (*it); -#if QT_VERSION >= 0x030100 +#if [[[TQT_VERSION IS DEPRECATED]]] >= 0x030100 stream << dom->name() << m_timestamp[ dom->name() ].toTime_t(); #else stream << dom->name() << toTime_t(m_timestamp[ dom->name() ]); #endif offsets.insert( dom->name(), stream.device()->at() ); - stream << (Q_ULONG)0; // dummy offset + stream << (TQ_ULONG)0; // dummy offset } for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){ diff --git a/languages/ada/adasupportpart.h b/languages/ada/adasupportpart.h index aefaab76..a2e01a5f 100644 --- a/languages/ada/adasupportpart.h +++ b/languages/ada/adasupportpart.h @@ -13,8 +13,9 @@ class TQStringList; class AdaSupportPart : public KDevLanguageSupport { Q_OBJECT + TQ_OBJECT public: - AdaSupportPart (TQObject *parent, const char *name, const TQStringList &); + AdaSupportPart (TQObject *tqparent, const char *name, const TQStringList &); ~AdaSupportPart (); void parseContents (const TQString& contents, const TQString& fileName); diff --git a/languages/ada/addclass.cpp b/languages/ada/addclass.cpp index ee28ff93..8605e42a 100644 --- a/languages/ada/addclass.cpp +++ b/languages/ada/addclass.cpp @@ -33,7 +33,7 @@ AddClassInfo::AddClassInfo() TQString AddClassInfo::adaFileName() const { TQString dest = className; - dest.replace(TQRegExp("\\."), "/"); + dest.tqreplace(TQRegExp("\\."), "/"); return sourceDir + "/" + dest + ".ada"; } @@ -183,12 +183,12 @@ bool AddClass::generate() " * published by the Free Software Foundation; either version 2 of the\n" " * License, or (at your option) any later version.\n"; } - else if (m_info.license == "QPL") + else if (m_info.license == "TQPL") { code += " * This program may be distributed under the terms of the Q Public\n" " * License as defined by Trolltech AS of Norway and appearing in the\n" - " * file LICENSE.QPL included in the packaging of this file.\n" + " * file LICENSE.TQPL included in the packaging of this file.\n" " *\n" " * This program is distributed in the hope that it will be useful,\n" " * but WITHOUT ANY WARRANTY; without even the implied warranty of\n" @@ -206,7 +206,7 @@ bool AddClass::generate() // find class and package name TQString className, packageName; - int i = m_info.className.findRev('.'); + int i = m_info.className.tqfindRev('.'); if (i == -1) { packageName = ""; @@ -322,7 +322,7 @@ bool AddClass::generate() // create directories TQString dest = packageName; - dest.replace(TQRegExp("\\."), "/"); + dest.tqreplace(TQRegExp("\\."), "/"); dest = m_info.sourceDir + "/" + dest; if (!makeDirs(dest)) diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui index 49900786..80f466be 100644 --- a/languages/ada/addclassdlg.ui +++ b/languages/ada/addclassdlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>AddClassDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>AddClassDlg</cstring> </property> @@ -30,7 +30,7 @@ <string>&Implements</string> </property> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -64,7 +64,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>Abstract</cstring> </property> @@ -72,7 +72,7 @@ <string>&Abstract</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>Interface</cstring> </property> @@ -80,7 +80,7 @@ <string>&Interface</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -91,7 +91,7 @@ <cstring>ClassName</cstring> </property> </widget> - <widget class="QButtonGroup" row="4" column="1" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="4" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -109,7 +109,7 @@ <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Public</cstring> </property> @@ -120,7 +120,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Protected</cstring> </property> @@ -128,7 +128,7 @@ <string>P&rotected</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>Private</cstring> </property> @@ -138,7 +138,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="3" column="3"> + <widget class="TQCheckBox" row="3" column="3"> <property name="name"> <cstring>Final</cstring> </property> @@ -162,7 +162,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -173,7 +173,7 @@ <cstring>Extends</cstring> </property> </widget> - <widget class="QPushButton" row="0" column="5"> + <widget class="TQPushButton" row="0" column="5"> <property name="name"> <cstring>BrowseSourcePath</cstring> </property> @@ -194,7 +194,7 @@ <cstring>SourcePath</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -207,7 +207,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -219,7 +219,7 @@ <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>Constructor</cstring> </property> @@ -230,7 +230,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>Main</cstring> </property> @@ -240,7 +240,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="4"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -252,7 +252,7 @@ <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -286,7 +286,7 @@ <bool>true</bool> </property> </widget> - <widget class="QTextEdit" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQTextEdit" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Documentation</cstring> </property> @@ -318,7 +318,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QPushButton" row="5" column="3"> + <widget class="TQPushButton" row="5" column="3"> <property name="name"> <cstring>PushButton3</cstring> </property> @@ -337,7 +337,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QPushButton" row="5" column="0"> + <widget class="TQPushButton" row="5" column="0"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -348,7 +348,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="5" column="1"> + <widget class="TQPushButton" row="5" column="1"> <property name="name"> <cstring>PushButton2</cstring> </property> @@ -420,15 +420,15 @@ <tabstop>PushButton2</tabstop> <tabstop>PushButton3</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>Public_toggled( bool )</slot> -</slots> +</Q_SLOTS> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/ada/backgroundparser.cpp b/languages/ada/backgroundparser.cpp index 68607851..2ee39af8 100644 --- a/languages/ada/backgroundparser.cpp +++ b/languages/ada/backgroundparser.cpp @@ -25,7 +25,7 @@ BackgroundParser::BackgroundParser( ProblemReporter* reporter, const TQString& source, const TQString& filename ) : m_reporter( reporter ), - m_source( source.unicode(), source.length() ), + m_source( source.tqunicode(), source.length() ), m_fileName( filename ) { } @@ -64,7 +64,7 @@ void BackgroundParser::run() } catch( antlr::ANTLRException& ex ){ kdDebug() << "*exception*: " << ex.toString().c_str() << endl; - m_reporter->reportError( TQString::fromLatin1( ex.getMessage().c_str() ), + m_reporter->reportError( TQString::tqfromLatin1( ex.getMessage().c_str() ), m_fileName, lexer.getLine(), lexer.getColumn() ); diff --git a/languages/ada/backgroundparser.h b/languages/ada/backgroundparser.h index 3c41d450..e07ff55f 100644 --- a/languages/ada/backgroundparser.h +++ b/languages/ada/backgroundparser.h @@ -19,7 +19,7 @@ class ProblemReporter; -class BackgroundParser: public QThread{ +class BackgroundParser: public TQThread{ public: BackgroundParser( ProblemReporter* reporter, const TQString& source, diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui index 75f35b1f..86bb221d 100644 --- a/languages/ada/configproblemreporter.ui +++ b/languages/ada/configproblemreporter.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ConfigureProblemReporter</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigureProblemReporter</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>bgParserCheckbox</cstring> </property> @@ -24,7 +24,7 @@ <string>&Enable background parsing</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>delaySlider</cstring> </property> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>101</height> @@ -78,12 +78,12 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">configproblemreporter.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/ada/configproblemreporter.ui.h b/languages/ada/configproblemreporter.ui.h index a336965c..20932393 100644 --- a/languages/ada/configproblemreporter.ui.h +++ b/languages/ada/configproblemreporter.ui.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ui.h extension file, included from the uic-generated form implementation. ** -** If you wish to add, delete or rename slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ diff --git a/languages/ada/configure.in.in b/languages/ada/configure.in.in index be677e4b..c64a6b76 100644 --- a/languages/ada/configure.in.in +++ b/languages/ada/configure.in.in @@ -1,4 +1,4 @@ AC_LANG_SAVE AC_LANG_CPLUSPLUS -AC_CHECK_HEADERS(sstream) +KDE_CHECK_HEADERS(sstream) AC_LANG_RESTORE diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index 652d5a6b..1b9b5bc4 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -50,15 +50,15 @@ #include <kdialogbase.h> -class ProblemItem: public QListViewItem{ +class ProblemItem: public TQListViewItem{ public: - ProblemItem( TQListView* parent, const TQString& level, const TQString& problem, + ProblemItem( TQListView* tqparent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : TQListViewItem( parent, level, problem, file, line, column ) {} + : TQListViewItem( tqparent, level, problem, file, line, column ) {} - ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, + ProblemItem( TQListViewItem* tqparent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : TQListViewItem( parent, level, problem, file, line, column ) {} + : TQListViewItem( tqparent, level, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 3 || column == 4 ){ @@ -73,8 +73,8 @@ public: }; -ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const char* name ) - : TQListView( parent, name ), +ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* tqparent, const char* name ) + : TQListView( tqparent, name ), m_adaSupport( part ), m_editor( 0 ), m_document( 0 ), @@ -185,7 +185,7 @@ void ProblemReporter::reparse() } /* Temporarily deactivated (crashes)*/ - if (!m_adaSupport->fileExtensions ().contains (TQFileInfo (m_filename).extension ())) + if (!m_adaSupport->fileExtensions ().tqcontains (TQFileInfo (m_filename).extension ())) { m_bgParser = new BackgroundParser( this, m_editor->text(), m_filename ); m_bgParser->start(); @@ -211,7 +211,7 @@ void ProblemReporter::reportError( TQString message, new ProblemItem( this, "error", - message.replace( TQRegExp("\n"), "" ), + message.tqreplace( TQRegExp("\n"), "" ), filename, TQString::number( line ), TQString::number( column ) ); @@ -223,7 +223,7 @@ void ProblemReporter::reportWarning( TQString message, { new ProblemItem( this, "warning", - message.replace( TQRegExp("\n"), "" ), + message.tqreplace( TQRegExp("\n"), "" ), filename, TQString::number( line ), TQString::number( column ) ); @@ -235,7 +235,7 @@ void ProblemReporter::reportMessage( TQString message, { new TQListViewItem( this, "message", - message.replace( TQRegExp("\n"), "" ), + message.tqreplace( TQRegExp("\n"), "" ), filename, TQString::number( line ), TQString::number( column ) ); diff --git a/languages/ada/problemreporter.h b/languages/ada/problemreporter.h index 16fe2181..84c9ce57 100644 --- a/languages/ada/problemreporter.h +++ b/languages/ada/problemreporter.h @@ -37,10 +37,11 @@ namespace KTextEditor{ class Document; } -class ProblemReporter: public QListView{ +class ProblemReporter: public TQListView{ Q_OBJECT + TQ_OBJECT public: - ProblemReporter( AdaSupportPart* part, TQWidget* parent=0, const char* name=0 ); + ProblemReporter( AdaSupportPart* part, TQWidget* tqparent=0, const char* name=0 ); virtual ~ProblemReporter(); virtual void reportError( TQString message, TQString filename, |