From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- languages/pascal/PascalLexer.cpp | 6 +- languages/pascal/PascalLexer.hpp | 2 +- languages/pascal/PascalParser.cpp | 72 ++++----- languages/pascal/PascalStoreWalker.cpp | 22 +-- languages/pascal/PascalStoreWalkerTokenTypes.hpp | 6 +- languages/pascal/PascalTokenTypes.hpp | 9 +- languages/pascal/README.dox | 2 +- languages/pascal/backgroundparser.cpp | 2 +- languages/pascal/backgroundparser.h | 2 +- .../compiler/dccoptions/dccoptionsplugin.cpp | 12 +- .../pascal/compiler/dccoptions/dccoptionsplugin.h | 7 +- .../pascal/compiler/dccoptions/optiontabs.cpp | 100 ++++++------ languages/pascal/compiler/dccoptions/optiontabs.h | 25 +-- .../compiler/fpcoptions/fpcoptionsplugin.cpp | 12 +- .../pascal/compiler/fpcoptions/fpcoptionsplugin.h | 7 +- .../pascal/compiler/fpcoptions/optiontabs.cpp | 168 ++++++++++----------- languages/pascal/compiler/fpcoptions/optiontabs.h | 37 ++--- languages/pascal/configproblemreporter.ui | 16 +- languages/pascal/pascal.g | 2 +- languages/pascal/pascalsupport_part.cpp | 16 +- languages/pascal/pascalsupport_part.h | 3 +- languages/pascal/problemreporter.cpp | 20 +-- languages/pascal/problemreporter.h | 5 +- 23 files changed, 281 insertions(+), 272 deletions(-) (limited to 'languages/pascal') diff --git a/languages/pascal/PascalLexer.cpp b/languages/pascal/PascalLexer.cpp index 28f532f8..29475545 100644 --- a/languages/pascal/PascalLexer.cpp +++ b/languages/pascal/PascalLexer.cpp @@ -172,7 +172,7 @@ ANTLR_USE_NAMESPACE(antlr)RefToken PascalLexer::nextToken() } case 0x3d /* '=' */ : { - mEQUAL(true); + mETQUAL(true); theRetToken=_returnToken; break; } @@ -508,9 +508,9 @@ void PascalLexer::mCOLON(bool _createToken) { _saveIndex=0; } -void PascalLexer::mEQUAL(bool _createToken) { +void PascalLexer::mETQUAL(bool _createToken) { int _ttype; ANTLR_USE_NAMESPACE(antlr)RefToken _token; ANTLR_USE_NAMESPACE(std)string::size_type _begin = text.length(); - _ttype = EQUAL; + _ttype = ETQUAL; ANTLR_USE_NAMESPACE(std)string::size_type _saveIndex; match('=' /* charlit */ ); diff --git a/languages/pascal/PascalLexer.hpp b/languages/pascal/PascalLexer.hpp index 99a14959..c2232e65 100644 --- a/languages/pascal/PascalLexer.hpp +++ b/languages/pascal/PascalLexer.hpp @@ -77,7 +77,7 @@ public: public: void mCOMMA(bool _createToken); public: void mSEMI(bool _createToken); public: void mCOLON(bool _createToken); - public: void mEQUAL(bool _createToken); + public: void mETQUAL(bool _createToken); public: void mNOT_EQUAL(bool _createToken); public: void mLTH(bool _createToken); public: void mLE(bool _createToken); diff --git a/languages/pascal/PascalParser.cpp b/languages/pascal/PascalParser.cpp index 172f4a49..80655b41 100644 --- a/languages/pascal/PascalParser.cpp +++ b/languages/pascal/PascalParser.cpp @@ -1193,7 +1193,7 @@ void PascalParser::constantDeclarationPart() { { // ( ... )+ int _cnt47=0; for (;;) { - if ((LA(1) == IDENT) && (LA(2) == EQUAL)) { + if ((LA(1) == IDENT) && (LA(2) == ETQUAL)) { constantDeclaration(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); @@ -1581,7 +1581,7 @@ void PascalParser::constantDeclaration() { if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } - match(EQUAL); + match(ETQUAL); expression(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); @@ -1615,7 +1615,7 @@ void PascalParser::typedConstantDeclaration() { if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } - match(EQUAL); + match(ETQUAL); typedConstant(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); @@ -1644,7 +1644,7 @@ void PascalParser::stringConstantDeclaration() { if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } - match(EQUAL); + match(ETQUAL); string(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); @@ -1697,7 +1697,7 @@ void PascalParser::typeDeclaration() { if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } - match(EQUAL); + match(ETQUAL); type(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); @@ -1771,7 +1771,7 @@ void PascalParser::type() { case BYTE: case WORD: case CARDINAL: - case QWORD: + case TQWORD: case BOOLEAN: case BYTEBOOL: case LONGBOOL: @@ -3234,7 +3234,7 @@ void PascalParser::expression() { } { switch ( LA(1)) { - case EQUAL: + case ETQUAL: case LE: case GE: case LTH: @@ -3717,7 +3717,7 @@ void PascalParser::simpleType() { case BYTE: case WORD: case CARDINAL: - case QWORD: + case TQWORD: case BOOLEAN: case BYTEBOOL: case LONGBOOL: @@ -3783,7 +3783,7 @@ void PascalParser::subrangeTypeOrTypeIdentifier() { } case SEMI: case RPAREN: - case EQUAL: + case ETQUAL: case RBRACK: { break; @@ -3891,7 +3891,7 @@ void PascalParser::stringType() { } case SEMI: case RPAREN: - case EQUAL: + case ETQUAL: case RBRACK: { break; @@ -4154,9 +4154,9 @@ void PascalParser::ordinalType() { ordinalType_AST = RefPascalAST(currentAST.root); break; } - case QWORD: + case TQWORD: { - match(QWORD); + match(TQWORD); ordinalType_AST = RefPascalAST(currentAST.root); break; } @@ -5033,7 +5033,7 @@ void PascalParser::proceduralTypePart1() { } case SEMI: case RPAREN: - case EQUAL: + case ETQUAL: case RBRACK: { break; @@ -6535,9 +6535,9 @@ void PascalParser::expressionSign() { expressionSign_AST = RefPascalAST(currentAST.root); break; } - case EQUAL: + case ETQUAL: { - match(EQUAL); + match(ETQUAL); expressionSign_AST = RefPascalAST(currentAST.root); break; } @@ -8571,7 +8571,7 @@ void PascalParser::operatorDefinition() { } break; } - case EQUAL: + case ETQUAL: case LE: case GE: case LTH: @@ -8707,9 +8707,9 @@ void PascalParser::comparisonOperatorDefinition() { try { // for error handling { switch ( LA(1)) { - case EQUAL: + case ETQUAL: { - match(EQUAL); + match(ETQUAL); break; } case LE: @@ -9283,7 +9283,7 @@ const char* PascalParser::tokenNames[] = { "\"label\"", "\"const\"", "\"resourcestring\"", - "EQUAL", + "ETQUAL", "\"type\"", "\"var\"", "COLON", @@ -9417,7 +9417,7 @@ const char* PascalParser::tokenNames[] = { "\"self\"", "METHOD", "ADDSUBOR", - "ASSIGNEQUAL", + "ASSIGNETQUAL", "SIGN", "FUNC", "NODE_NOT_EMIT", @@ -9450,7 +9450,7 @@ const unsigned long PascalParser::_tokenSet_3_data_[] = { 121634818UL, 177988UL, const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_3(_tokenSet_3_data_,8); const unsigned long PascalParser::_tokenSet_4_data_[] = { 994050050UL, 706736UL, 101056512UL, 4294963649UL, 833972167UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; // EOF DOT SEMI "end" COMMA "index" "name" LPAREN RPAREN "finalization" -// EQUAL COLON "procedure" "function" "of" DOTDOT ASSIGN LBRACK RBRACK +// ETQUAL COLON "procedure" "function" "of" DOTDOT ASSIGN LBRACK RBRACK // POINTER "constructor" "destructor" "class" "property" "read" "write" // "default" "nodefault" LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" // "xor" STAR SLASH "div" "mod" "and" "shl" "shr" AT PLUSEQ MINUSEQ STAREQ @@ -9515,7 +9515,7 @@ const unsigned long PascalParser::_tokenSet_20_data_[] = { 100663296UL, 177988UL const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_20(_tokenSet_20_data_,12); const unsigned long PascalParser::_tokenSet_21_data_[] = { 1061158914UL, 720868UL, 67239936UL, 4294840768UL, 825581575UL, 8UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; // EOF DOT SEMI "end" "exports" COMMA "index" "name" "begin" RPAREN "initialization" -// "finalization" "label" "const" "resourcestring" EQUAL "type" "var" COLON +// "finalization" "label" "const" "resourcestring" ETQUAL "type" "var" COLON // "procedure" "function" "of" DOTDOT RBRACK "constructor" "destructor" // "class" "property" LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" // "xor" STAR SLASH "div" "mod" "and" "shl" "shr" "then" "else" "do" "until" @@ -9525,7 +9525,7 @@ const unsigned long PascalParser::_tokenSet_22_data_[] = { 16777216UL, 0UL, 0UL, // SEMI const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_22(_tokenSet_22_data_,6); const unsigned long PascalParser::_tokenSet_23_data_[] = { 16777216UL, 2080UL, 67108864UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// SEMI RPAREN EQUAL RBRACK +// SEMI RPAREN ETQUAL RBRACK const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_23(_tokenSet_23_data_,8); const unsigned long PascalParser::_tokenSet_24_data_[] = { 0UL, 4UL, 536870920UL, 0UL, 206215168UL, 8UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; // "begin" NUM_INT "case" "goto" "if" "while" "repeat" "for" "with" "raise" @@ -9538,7 +9538,7 @@ const unsigned long PascalParser::_tokenSet_25_data_[] = { 121634818UL, 178116UL const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_25(_tokenSet_25_data_,12); const unsigned long PascalParser::_tokenSet_26_data_[] = { 16777216UL, 1818406UL, 67108864UL, 192UL, 0UL, 0UL, 0UL, 0UL }; // SEMI "implementation" "begin" RPAREN "label" "const" "resourcestring" -// EQUAL "type" "var" "procedure" "forward" "function" "of" "external" +// ETQUAL "type" "var" "procedure" "forward" "function" "of" "external" // RBRACK "constructor" "destructor" const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_26(_tokenSet_26_data_,8); const unsigned long PascalParser::_tokenSet_27_data_[] = { 117440514UL, 177988UL, 0UL, 192UL, 0UL, 0UL, 0UL, 0UL }; @@ -9579,22 +9579,22 @@ const unsigned long PascalParser::_tokenSet_36_data_[] = { 0UL, 16UL, 33554440UL // "chr" "nil" NUM_REAL IDENT const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_36(_tokenSet_36_data_,12); const unsigned long PascalParser::_tokenSet_37_data_[] = { 16777216UL, 2064UL, 100663304UL, 4294836224UL, 2147483775UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// SEMI LPAREN EQUAL NUM_INT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" +// SEMI LPAREN ETQUAL NUM_INT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" // "is" PLUS MINUS "or" "xor" STAR SLASH "div" "mod" "and" "shl" "shr" // "not" "true" "false" AT STRING_LITERAL "chr" "nil" NUM_REAL IDENT const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_37(_tokenSet_37_data_,12); const unsigned long PascalParser::_tokenSet_38_data_[] = { 184549378UL, 182304UL, 67239936UL, 4544UL, 0UL, 0UL, 0UL, 0UL }; -// EOF SEMI "end" COMMA RPAREN EQUAL COLON "procedure" "function" DOTDOT +// EOF SEMI "end" COMMA RPAREN ETQUAL COLON "procedure" "function" DOTDOT // RBRACK "constructor" "destructor" "class" "property" const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_38(_tokenSet_38_data_,8); const unsigned long PascalParser::_tokenSet_39_data_[] = { 150994944UL, 32UL, 0UL, 0UL, 0UL, 0UL }; // SEMI COMMA RPAREN const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_39(_tokenSet_39_data_,6); const unsigned long PascalParser::_tokenSet_40_data_[] = { 150994944UL, 2080UL, 67108864UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// SEMI COMMA RPAREN EQUAL RBRACK +// SEMI COMMA RPAREN ETQUAL RBRACK const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_40(_tokenSet_40_data_,8); const unsigned long PascalParser::_tokenSet_41_data_[] = { 318767104UL, 165936UL, 67108864UL, 127424UL, 0UL, 0UL, 0UL, 0UL }; -// SEMI "end" "index" LPAREN RPAREN EQUAL "procedure" "function" RBRACK +// SEMI "end" "index" LPAREN RPAREN ETQUAL "procedure" "function" RBRACK // "constructor" "destructor" "class" "property" "read" "write" "default" // "nodefault" const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_41(_tokenSet_41_data_,8); @@ -9603,7 +9603,7 @@ const unsigned long PascalParser::_tokenSet_42_data_[] = { 0UL, 32UL, 0UL, 0UL, const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_42(_tokenSet_42_data_,6); const unsigned long PascalParser::_tokenSet_43_data_[] = { 792723458UL, 720868UL, 67239936UL, 4294963648UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; // EOF DOT SEMI "end" "exports" COMMA "name" "begin" RPAREN "initialization" -// "finalization" "label" "const" "resourcestring" EQUAL "type" "var" COLON +// "finalization" "label" "const" "resourcestring" ETQUAL "type" "var" COLON // "procedure" "function" "of" DOTDOT RBRACK "constructor" "destructor" // "class" "property" "read" "write" "default" "nodefault" LE GE LTH GT // NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH "div" "mod" "and" @@ -9611,7 +9611,7 @@ const unsigned long PascalParser::_tokenSet_43_data_[] = { 792723458UL, 720868UL // "finally" const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_43(_tokenSet_43_data_,12); const unsigned long PascalParser::_tokenSet_44_data_[] = { 0UL, 2064UL, 100794376UL, 4294836224UL, 2147483775UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// LPAREN EQUAL NUM_INT DOTDOT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" +// LPAREN ETQUAL NUM_INT DOTDOT LBRACK RBRACK LE GE LTH GT NOT_EQUAL "in" // "is" PLUS MINUS "or" "xor" STAR SLASH "div" "mod" "and" "shl" "shr" // "not" "true" "false" AT STRING_LITERAL "chr" "nil" NUM_REAL IDENT const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_44(_tokenSet_44_data_,12); @@ -9660,23 +9660,23 @@ const unsigned long PascalParser::_tokenSet_57_data_[] = { 33554432UL, 163840UL, // "default" "nodefault" const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_57(_tokenSet_57_data_,8); const unsigned long PascalParser::_tokenSet_58_data_[] = { 188743680UL, 526496UL, 67239936UL, 16646144UL, 825581568UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "of" DOTDOT RBRACK +// DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL "of" DOTDOT RBRACK // LE GE LTH GT NOT_EQUAL "in" "is" "then" "else" "do" "until" "to" "downto" // RBRACK2 "except" "finally" const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_58(_tokenSet_58_data_,12); const unsigned long PascalParser::_tokenSet_59_data_[] = { 188743680UL, 526496UL, 67239936UL, 268304384UL, 825581568UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "of" DOTDOT RBRACK +// DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL "of" DOTDOT RBRACK // LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" "then" "else" // "do" "until" "to" "downto" RBRACK2 "except" "finally" const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_59(_tokenSet_59_data_,12); const unsigned long PascalParser::_tokenSet_60_data_[] = { 188743680UL, 526512UL, 67239936UL, 4294836224UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// DOT SEMI "end" COMMA LPAREN RPAREN "finalization" EQUAL "of" DOTDOT +// DOT SEMI "end" COMMA LPAREN RPAREN "finalization" ETQUAL "of" DOTDOT // RBRACK LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH // "div" "mod" "and" "shl" "shr" "then" "else" "do" "until" "to" "downto" // RBRACK2 "except" "finally" const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_60(_tokenSet_60_data_,12); const unsigned long PascalParser::_tokenSet_61_data_[] = { 188743680UL, 526496UL, 67239936UL, 4294836224UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// DOT SEMI "end" COMMA RPAREN "finalization" EQUAL "of" DOTDOT RBRACK +// DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL "of" DOTDOT RBRACK // LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH "div" // "mod" "and" "shl" "shr" "then" "else" "do" "until" "to" "downto" RBRACK2 // "except" "finally" @@ -9727,14 +9727,14 @@ const unsigned long PascalParser::_tokenSet_74_data_[] = { 0UL, 0UL, 8UL, 0UL, 0 const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_74(_tokenSet_74_data_,12); const unsigned long PascalParser::_tokenSet_75_data_[] = { 1061158914UL, 720868UL, 67239936UL, 4294840768UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; // EOF DOT SEMI "end" "exports" COMMA "index" "name" "begin" RPAREN "initialization" -// "finalization" "label" "const" "resourcestring" EQUAL "type" "var" COLON +// "finalization" "label" "const" "resourcestring" ETQUAL "type" "var" COLON // "procedure" "function" "of" DOTDOT RBRACK "constructor" "destructor" // "class" "property" LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" // "xor" STAR SLASH "div" "mod" "and" "shl" "shr" "then" "else" "do" "until" // "to" "downto" RBRACK2 "except" "finally" const ANTLR_USE_NAMESPACE(antlr)BitSet PascalParser::_tokenSet_75(_tokenSet_75_data_,12); const unsigned long PascalParser::_tokenSet_76_data_[] = { 188743682UL, 706720UL, 67239936UL, 4294840768UL, 825581575UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// EOF DOT SEMI "end" COMMA RPAREN "finalization" EQUAL COLON "procedure" +// EOF DOT SEMI "end" COMMA RPAREN "finalization" ETQUAL COLON "procedure" // "function" "of" DOTDOT RBRACK "constructor" "destructor" "class" "property" // LE GE LTH GT NOT_EQUAL "in" "is" PLUS MINUS "or" "xor" STAR SLASH "div" // "mod" "and" "shl" "shr" "then" "else" "do" "until" "to" "downto" RBRACK2 diff --git a/languages/pascal/PascalStoreWalker.cpp b/languages/pascal/PascalStoreWalker.cpp index 96c69fe4..0a72ccfc 100644 --- a/languages/pascal/PascalStoreWalker.cpp +++ b/languages/pascal/PascalStoreWalker.cpp @@ -252,7 +252,7 @@ void PascalStoreWalker::constantDefinitionPart(RefPascalAST _t) { for (;;) { if (_t == RefPascalAST(ANTLR_USE_NAMESPACE(antlr)nullAST) ) _t = ASTNULL; - if ((_t->getType() == EQUAL)) { + if ((_t->getType() == ETQUAL)) { constantDefinition(_t); _t = _retTree; } @@ -421,7 +421,7 @@ void PascalStoreWalker::constantDefinition(RefPascalAST _t) { try { // for error handling RefPascalAST __t21 = _t; RefPascalAST tmp15_AST_in = _t; - match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),EQUAL); + match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),ETQUAL); _t = _t->getFirstChild(); RefPascalAST tmp16_AST_in = _t; match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),IDENT); @@ -2129,11 +2129,11 @@ void PascalStoreWalker::expression(RefPascalAST _t) { if (_t == RefPascalAST(ANTLR_USE_NAMESPACE(antlr)nullAST) ) _t = ASTNULL; switch ( _t->getType()) { - case EQUAL: + case ETQUAL: { RefPascalAST __t132 = _t; RefPascalAST tmp85_AST_in = _t; - match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),EQUAL); + match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),ETQUAL); _t = _t->getFirstChild(); expression(_t); _t = _retTree; @@ -2241,7 +2241,7 @@ void PascalStoreWalker::expression(RefPascalAST _t) { switch ( _t->getType()) { case FUNC_CALL: case DOT: - case EQUAL: + case ETQUAL: case NUM_INT: case LBRACK: case SET: @@ -2301,7 +2301,7 @@ void PascalStoreWalker::expression(RefPascalAST _t) { switch ( _t->getType()) { case FUNC_CALL: case DOT: - case EQUAL: + case ETQUAL: case NUM_INT: case LBRACK: case SET: @@ -2691,7 +2691,7 @@ void PascalStoreWalker::element(RefPascalAST _t) { } case FUNC_CALL: case DOT: - case EQUAL: + case ETQUAL: case NUM_INT: case LBRACK: case SET: @@ -3228,7 +3228,7 @@ const char* PascalStoreWalker::tokenNames[] = { "\"label\"", "\"const\"", "\"resourcestring\"", - "EQUAL", + "ETQUAL", "\"type\"", "\"var\"", "COLON", @@ -3362,7 +3362,7 @@ const char* PascalStoreWalker::tokenNames[] = { "\"self\"", "METHOD", "ADDSUBOR", - "ASSIGNEQUAL", + "ASSIGNETQUAL", "SIGN", "FUNC", "NODE_NOT_EMIT", @@ -3389,12 +3389,12 @@ const unsigned long PascalStoreWalker::_tokenSet_2_data_[] = { 0UL, 0UL, 8UL, 50 // NUM_INT PLUS MINUS STRING_LITERAL "chr" NUM_REAL IDENT const ANTLR_USE_NAMESPACE(antlr)BitSet PascalStoreWalker::_tokenSet_2(_tokenSet_2_data_,12); const unsigned long PascalStoreWalker::_tokenSet_3_data_[] = { 4194432UL, 2048UL, 1107296264UL, 4152229889UL, 2155872329UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// FUNC_CALL DOT EQUAL NUM_INT LBRACK "set" POINTER LE GE LTH GT NOT_EQUAL +// FUNC_CALL DOT ETQUAL NUM_INT LBRACK "set" POINTER LE GE LTH GT NOT_EQUAL // "in" PLUS MINUS "or" STAR SLASH "div" "mod" "and" "not" AT LBRACK2 STRING_LITERAL // "chr" "nil" NUM_REAL IDENT const ANTLR_USE_NAMESPACE(antlr)BitSet PascalStoreWalker::_tokenSet_3(_tokenSet_3_data_,12); const unsigned long PascalStoreWalker::_tokenSet_4_data_[] = { 4194432UL, 2048UL, 1107427336UL, 4152229889UL, 2155872329UL, 15UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; -// FUNC_CALL DOT EQUAL NUM_INT DOTDOT LBRACK "set" POINTER LE GE LTH GT +// FUNC_CALL DOT ETQUAL NUM_INT DOTDOT LBRACK "set" POINTER LE GE LTH GT // NOT_EQUAL "in" PLUS MINUS "or" STAR SLASH "div" "mod" "and" "not" AT // LBRACK2 STRING_LITERAL "chr" "nil" NUM_REAL IDENT const ANTLR_USE_NAMESPACE(antlr)BitSet PascalStoreWalker::_tokenSet_4(_tokenSet_4_data_,12); diff --git a/languages/pascal/PascalStoreWalkerTokenTypes.hpp b/languages/pascal/PascalStoreWalkerTokenTypes.hpp index e8e19eb9..f86b1d42 100644 --- a/languages/pascal/PascalStoreWalkerTokenTypes.hpp +++ b/languages/pascal/PascalStoreWalkerTokenTypes.hpp @@ -51,7 +51,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes { LABEL = 40, CONST = 41, RESOURCESTRING = 42, - EQUAL = 43, + ETQUAL = 43, TYPE = 44, VAR = 45, COLON = 46, @@ -84,7 +84,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes { BYTE = 73, WORD = 74, CARDINAL = 75, - QWORD = 76, + TQWORD = 76, BOOLEAN = 77, BYTEBOOL = 78, LONGBOOL = 79, @@ -185,7 +185,7 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes { SELF = 174, TQT_METHOD = 175, ADDSUBOR = 176, - ASSIGNEQUAL = 177, + ASSIGNETQUAL = 177, SIGN = 178, FUNC = 179, NODE_NOT_EMIT = 180, diff --git a/languages/pascal/PascalTokenTypes.hpp b/languages/pascal/PascalTokenTypes.hpp index fc8692d3..3bc8950e 100644 --- a/languages/pascal/PascalTokenTypes.hpp +++ b/languages/pascal/PascalTokenTypes.hpp @@ -1,6 +1,9 @@ #ifndef INC_PascalTokenTypes_hpp_ #define INC_PascalTokenTypes_hpp_ +#undef TRUE +#undef FALSE + /* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalTokenTypes.hpp"$ */ #ifndef CUSTOM_API @@ -51,7 +54,7 @@ struct CUSTOM_API PascalTokenTypes { LABEL = 40, CONST = 41, RESOURCESTRING = 42, - EQUAL = 43, + ETQUAL = 43, TYPE = 44, VAR = 45, COLON = 46, @@ -84,7 +87,7 @@ struct CUSTOM_API PascalTokenTypes { BYTE = 73, WORD = 74, CARDINAL = 75, - QWORD = 76, + TQWORD = 76, BOOLEAN = 77, BYTEBOOL = 78, LONGBOOL = 79, @@ -185,7 +188,7 @@ struct CUSTOM_API PascalTokenTypes { SELF = 174, TQT_METHOD = 175, ADDSUBOR = 176, - ASSIGNEQUAL = 177, + ASSIGNETQUAL = 177, SIGN = 178, FUNC = 179, NODE_NOT_EMIT = 180, diff --git a/languages/pascal/README.dox b/languages/pascal/README.dox index 52ef50b1..8360d27c 100644 --- a/languages/pascal/README.dox +++ b/languages/pascal/README.dox @@ -15,7 +15,7 @@ with the one from Alexander Dymo \feature Pascal language support -\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. \bug Language parser can sometimes treat correct lines as errors. Please send sample code to maintainer if you have this problem. diff --git a/languages/pascal/backgroundparser.cpp b/languages/pascal/backgroundparser.cpp index ff202374..be9a1909 100644 --- a/languages/pascal/backgroundparser.cpp +++ b/languages/pascal/backgroundparser.cpp @@ -24,7 +24,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 ) { } diff --git a/languages/pascal/backgroundparser.h b/languages/pascal/backgroundparser.h index 2ad77f83..170b3073 100644 --- a/languages/pascal/backgroundparser.h +++ b/languages/pascal/backgroundparser.h @@ -17,7 +17,7 @@ class ProblemReporter; -class BackgroundParser: public QThread{ +class BackgroundParser: public TQThread{ public: BackgroundParser( ProblemReporter* reporter, const TQString& source, diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp index 2d267519..d1ed9aec 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp @@ -21,8 +21,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevdccoptions, KGenericFactory( "kdevdccoptions" ) ) -DccOptionsPlugin::DccOptionsPlugin(TQObject *parent, const char *name, const QStringList/* &args*/) - : KDevCompilerOptions(parent, name) +DccOptionsPlugin::DccOptionsPlugin(TQObject *tqparent, const char *name, const TQStringList/* &args*/) + : KDevCompilerOptions(tqparent, name) { } @@ -30,9 +30,9 @@ DccOptionsPlugin::~DccOptionsPlugin() { } -TQString DccOptionsPlugin::exec(TQWidget *parent, const TQString &flags) +TQString DccOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags) { - DccOptionsDialog *dlg = new DccOptionsDialog(parent, "dcc options dialog"); + DccOptionsDialog *dlg = new DccOptionsDialog(tqparent, "dcc options dialog"); TQString newFlags = flags; dlg->setFlags(flags); if(dlg->exec() == TQDialog::Accepted) @@ -42,8 +42,8 @@ TQString DccOptionsPlugin::exec(TQWidget *parent, const TQString &flags) } -DccOptionsDialog::DccOptionsDialog( TQWidget * parent, const char * name ) - : KDialogBase(Tabbed, i18n("Delphi Compiler Options"), Ok|Cancel, Ok, parent, name, true) +DccOptionsDialog::DccOptionsDialog( TQWidget * tqparent, const char * name ) + : KDialogBase(Tabbed, i18n("Delphi Compiler Options"), Ok|Cancel, Ok, tqparent, name, true) { TQVBox *vbox; diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h index 04a2392e..e428a73d 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h @@ -18,12 +18,13 @@ class DccOptionsPlugin : public KDevCompilerOptions { Q_OBJECT + TQ_OBJECT public: - DccOptionsPlugin( TQObject *parent, const char *name, const QStringList/* &args */); + DccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList/* &args */); ~DccOptionsPlugin(); - virtual TQString exec(TQWidget *parent, const TQString &flags); + virtual TQString exec(TQWidget *tqparent, const TQString &flags); }; class GeneralTab; @@ -36,7 +37,7 @@ class DebugOptimTab; class DccOptionsDialog : public KDialogBase { public: - DccOptionsDialog( TQWidget *parent=0, const char *name=0 ); + DccOptionsDialog( TQWidget *tqparent=0, const char *name=0 ); ~DccOptionsDialog(); void setFlags(const TQString &flags); diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp index 94c8b35c..facb96f9 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.cpp +++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp @@ -21,13 +21,13 @@ #include "optiontabs.h" -LinkerTab::LinkerTab( TQWidget * parent, const char * name ) - : TQWidget(parent, name), radioController(new FlagRadioButtonController()), +LinkerTab::LinkerTab( TQWidget * tqparent, const char * name ) + : TQWidget(tqparent, name), radioController(new FlagRadioButtonController()), pathController(new FlagPathEditController()), editController(new FlagEditController()) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); TQVButtonGroup *map_group = new TQVButtonGroup(i18n("Map File"), this); TQRadioButton *m_defaultMap = new TQRadioButton(i18n("Off"), map_group); @@ -39,19 +39,19 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name ) new FlagRadioButton(map_group, radioController, "-GD", i18n("Detailed")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); new FlagPathEdit(this, "", pathController, "--dynamicloader=", i18n("Default dynamic loader:"), KFile::File); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); new FlagSpinEdit(this, 0, 2147483647, 1024, 1048576, editController, "-$M", i18n("Reserved address space:")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); - layout->addStretch(); + tqlayout->addStretch(); } LinkerTab::~LinkerTab( ) @@ -77,11 +77,11 @@ void LinkerTab::writeFlags( TQStringList * str ) -LocationsTab::LocationsTab( TQWidget * parent, const char * name ) - :TQWidget(parent, name), pathController(new FlagPathEditController()) +LocationsTab::LocationsTab( TQWidget * tqparent, const char * name ) + :TQWidget(tqparent, name), pathController(new FlagPathEditController()) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); new FlagPathEdit(this, ":", pathController, "-I", i18n("Include search path (delimited by \":\"):")); @@ -92,7 +92,7 @@ LocationsTab::LocationsTab( TQWidget * parent, const char * name ) new FlagPathEdit(this, ":", pathController, "-O", i18n("Object search path (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addStretch(); + tqlayout->addStretch(); } LocationsTab::~LocationsTab( ) @@ -112,11 +112,11 @@ void LocationsTab::writeFlags( TQStringList * str ) -Locations2Tab::Locations2Tab( TQWidget * parent, const char * name ) - :TQWidget(parent, name), pathController(new FlagPathEditController()) +Locations2Tab::Locations2Tab( TQWidget * tqparent, const char * name ) + :TQWidget(tqparent, name), pathController(new FlagPathEditController()) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); new FlagPathEdit(this, "", pathController, "-E", i18n("Executable output directory:")); @@ -127,7 +127,7 @@ Locations2Tab::Locations2Tab( TQWidget * parent, const char * name ) new FlagPathEdit(this, "", pathController, "-LN", i18n("Package source code directory:")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addStretch(); + tqlayout->addStretch(); } Locations2Tab::~Locations2Tab( ) @@ -147,12 +147,12 @@ void Locations2Tab::writeFlags( TQStringList * str ) -GeneralTab::GeneralTab( TQWidget * parent, const char * name ) - :TQWidget(parent, name), controller(new FlagCheckBoxController()), +GeneralTab::GeneralTab( TQWidget * tqparent, const char * name ) + :TQWidget(tqparent, name), controller(new FlagCheckBoxController()), editController(new FlagEditController()) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); TQVButtonGroup *build_group = new TQVButtonGroup(i18n("Build"), this); new FlagCheckBox(build_group, controller, @@ -165,7 +165,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name ) "-Z", i18n("Disable implicit package compilation")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); new FlagListEdit(this, ":", editController, "-D", i18n("Conditional defines (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); @@ -173,7 +173,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name ) new FlagListEdit(this, ":", editController, "-A", i18n("Unit aliases in form unit=alias (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); TQVButtonGroup *message_group = new TQVButtonGroup(i18n("Messages"), this); new FlagCheckBox(message_group, controller, @@ -182,12 +182,12 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name ) "-W", i18n("Output warning messages")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); TQVButtonGroup *package_group = new TQVButtonGroup(i18n("Packages"), this); new FlagListEdit(package_group, ":", editController, "-LU", i18n("Build with packages (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addStretch(); + tqlayout->addStretch(); } GeneralTab::~GeneralTab( ) @@ -210,15 +210,15 @@ void GeneralTab::writeFlags( TQStringList * str ) -CodegenTab::CodegenTab( TQWidget * parent, const char * name ) - :TQWidget(parent, name), controller(new FlagCheckBoxController()), +CodegenTab::CodegenTab( TQWidget * tqparent, const char * name ) + :TQWidget(tqparent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()), radioController(new FlagRadioButtonController()) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); -// layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); +// tqlayout->setAutoAdd(true); - TQGridLayout *layout2 = new TQGridLayout(layout, 2, 2, KDialog::spacingHint()); + TQGridLayout *tqlayout2 = new TQGridLayout(tqlayout, 2, 2, KDialog::spacingHint()); TQVButtonGroup *align_group = new TQVButtonGroup(i18n("Code Alignment && Stack Frames"), this); TQRadioButton *align_def = new TQRadioButton(i18n("Default (-$A8)"), align_group); @@ -234,7 +234,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagCheckBox(align_group, controller, "'-$W+'", i18n("Generate stack frames"), "'-$W-'"); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout2->addWidget(align_group, 0, 0); + tqlayout2->addWidget(align_group, 0, 0); TQVButtonGroup *enum_group = new TQVButtonGroup(i18n("Enumeration Size"), this); TQRadioButton *enum_def = new TQRadioButton(i18n("Default (-$Z1)"), enum_group); @@ -246,7 +246,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagRadioButton(enum_group, radioController, "'-$Z4'", i18n("Unsigned double word (4096M values)")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout2->addWidget(enum_group, 0, 1); + tqlayout2->addWidget(enum_group, 0, 1); TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this); new FlagCheckBox(compile_group, controller, @@ -266,7 +266,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagCheckBox(compile_group, controller, "'-$J+'", i18n("Writable typed constants"), "'-$J-'"); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout2->addWidget(compile_group, 1, 0); + tqlayout2->addWidget(compile_group, 1, 0); TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this); new FlagCheckBox(run_group, controller, @@ -280,9 +280,9 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagCheckBox(run_group, controller, "'-$R+'", i18n("Range checking"), "'-$R-'"); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout2->addWidget(run_group, 1, 1); + tqlayout2->addWidget(run_group, 1, 1); - layout->addStretch(); + tqlayout->addStretch(); } CodegenTab::~CodegenTab( ) @@ -308,21 +308,21 @@ void CodegenTab::writeFlags( TQStringList * str ) -DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) - : TQWidget(parent, name), controller(new FlagCheckBoxController()), +DebugOptimTab::DebugOptimTab( TQWidget * tqparent, const char * name ) + : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), radioController(new FlagRadioButtonController) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); -// layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); +// tqlayout->setAutoAdd(true); TQVButtonGroup *optim_group = new TQVButtonGroup(i18n("Optimization"), this); new FlagCheckBox(optim_group, controller, "'-$O+'", i18n("Enable optimizations"), "'-$O-'", "'-$O+'"); - layout->addWidget(optim_group); + tqlayout->addWidget(optim_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); - TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); + TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this); new FlagCheckBox(debug_group, controller, @@ -335,7 +335,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-VN", i18n("Namespace debug info")); symboldb = new FlagCheckBox(debug_group, controller, "-VR", i18n("Write symbol info in an .rsm file")); - layout2->addWidget(debug_group); + tqlayout2->addWidget(debug_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); TQVButtonGroup *debug_add = new TQVButtonGroup(i18n("Symbol Reference Information"), this); @@ -347,20 +347,20 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "'-$YD'", i18n("Definition information")); new FlagRadioButton(debug_add, radioController, "'-$Y+'", i18n("Full reference information")); - layout2->addWidget(debug_add); + tqlayout2->addWidget(debug_add); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); - TQHBoxLayout *layout3 = new TQHBoxLayout(layout, KDialog::spacingHint()); + TQHBoxLayout *tqlayout3 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); TQPushButton *release = new TQPushButton(i18n("Release"), this); TQPushButton *debug = new TQPushButton(i18n("Debug"), this); - layout3->addWidget(release); - layout3->addWidget(debug); + tqlayout3->addWidget(release); + tqlayout3->addWidget(debug); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); - layout->addStretch(); + tqlayout->addStretch(); } DebugOptimTab::~ DebugOptimTab( ) diff --git a/languages/pascal/compiler/dccoptions/optiontabs.h b/languages/pascal/compiler/dccoptions/optiontabs.h index 69343bf0..d96ec71d 100644 --- a/languages/pascal/compiler/dccoptions/optiontabs.h +++ b/languages/pascal/compiler/dccoptions/optiontabs.h @@ -20,10 +20,10 @@ class TQRadioButton; class FlagRadioButton; class FlagCheckBox; -class LinkerTab : public QWidget +class LinkerTab : public TQWidget { public: - LinkerTab( TQWidget *parent=0, const char *name=0 ); + LinkerTab( TQWidget *tqparent=0, const char *name=0 ); ~LinkerTab(); void readFlags(TQStringList *str); @@ -35,10 +35,10 @@ private: FlagEditController *editController; }; -class LocationsTab : public QWidget +class LocationsTab : public TQWidget { public: - LocationsTab( TQWidget *parent=0, const char *name=0 ); + LocationsTab( TQWidget *tqparent=0, const char *name=0 ); ~LocationsTab(); void readFlags(TQStringList *str); @@ -48,10 +48,10 @@ private: FlagPathEditController *pathController; }; -class Locations2Tab : public QWidget +class Locations2Tab : public TQWidget { public: - Locations2Tab( TQWidget *parent=0, const char *name=0 ); + Locations2Tab( TQWidget *tqparent=0, const char *name=0 ); ~Locations2Tab(); void readFlags(TQStringList *str); @@ -61,10 +61,10 @@ private: FlagPathEditController *pathController; }; -class GeneralTab: public QWidget +class GeneralTab: public TQWidget { public: - GeneralTab( TQWidget *parent=0, const char *name=0 ); + GeneralTab( TQWidget *tqparent=0, const char *name=0 ); ~GeneralTab(); void readFlags(TQStringList *str); @@ -75,10 +75,10 @@ private: FlagEditController *editController; }; -class CodegenTab : public QWidget +class CodegenTab : public TQWidget { public: - CodegenTab( TQWidget *parent=0, const char *name=0 ); + CodegenTab( TQWidget *tqparent=0, const char *name=0 ); ~CodegenTab(); void readFlags(TQStringList *str); @@ -90,11 +90,12 @@ private: FlagRadioButtonController *radioController; }; -class DebugOptimTab : public QWidget +class DebugOptimTab : public TQWidget { Q_OBJECT + TQ_OBJECT public: - DebugOptimTab( TQWidget *parent=0, const char *name=0 ); + DebugOptimTab( TQWidget *tqparent=0, const char *name=0 ); ~DebugOptimTab(); void readFlags(TQStringList *str); diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp index 567d5c86..edcadaee 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp @@ -18,8 +18,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfpcoptions, KGenericFactory( "kdevfpcoptions" ) ) -FpcOptionsPlugin::FpcOptionsPlugin(TQObject *parent, const char *name, const TQStringList& /*args*/) - : KDevCompilerOptions(parent, name) +FpcOptionsPlugin::FpcOptionsPlugin(TQObject *tqparent, const char *name, const TQStringList& /*args*/) + : KDevCompilerOptions(tqparent, name) { } @@ -27,9 +27,9 @@ FpcOptionsPlugin::~FpcOptionsPlugin() { } -TQString FpcOptionsPlugin::exec(TQWidget *parent, const TQString &flags) +TQString FpcOptionsPlugin::exec(TQWidget *tqparent, const TQString &flags) { - FpcOptionsDialog *dlg = new FpcOptionsDialog(parent, "fpc options dialog"); + FpcOptionsDialog *dlg = new FpcOptionsDialog(tqparent, "fpc options dialog"); TQString newFlags = flags; dlg->setFlags(flags); if (dlg->exec() == TQDialog::Accepted) @@ -40,8 +40,8 @@ TQString FpcOptionsPlugin::exec(TQWidget *parent, const TQString &flags) -FpcOptionsDialog::FpcOptionsDialog( TQWidget *parent, const char *name ) - : KDialogBase(Tabbed, i18n("Free Pascal Compiler Options"), Ok|Cancel, Ok, parent, name, true) +FpcOptionsDialog::FpcOptionsDialog( TQWidget *tqparent, const char *name ) + : KDialogBase(Tabbed, i18n("Free Pascal Compiler Options"), Ok|Cancel, Ok, tqparent, name, true) { TQVBox *vbox; diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h index 55e65321..6d450569 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h @@ -18,12 +18,13 @@ class FpcOptionsPlugin : public KDevCompilerOptions { Q_OBJECT + TQ_OBJECT public: - FpcOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ); + FpcOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~FpcOptionsPlugin(); - virtual TQString exec(TQWidget *parent, const TQString &flags); + virtual TQString exec(TQWidget *tqparent, const TQString &flags); }; @@ -35,7 +36,7 @@ class CodegenTab; class FpcOptionsDialog : public KDialogBase { public: - FpcOptionsDialog( TQWidget *parent=0, const char *name=0 ); + FpcOptionsDialog( TQWidget *tqparent=0, const char *name=0 ); ~FpcOptionsDialog(); void setFlags(const TQString &flags); diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp index 445ab826..5c46ac24 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp +++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp @@ -23,17 +23,17 @@ #include "optiontabs.h" -FeedbackTab::FeedbackTab(TQWidget *parent, const char *name) - : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) +FeedbackTab::FeedbackTab(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); TQVButtonGroup *output_group = new TQVButtonGroup(i18n("Output"), this); new FlagCheckBox(output_group, controller, "-vr", i18n("Format errors like GCC does")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); TQVButtonGroup *verbose_group = new TQVButtonGroup(i18n("Verbose"), this); new FlagCheckBox(verbose_group, controller, @@ -54,7 +54,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name) "-vd", i18n("Write other debugging info")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); TQVButtonGroup *other_group = new TQVButtonGroup(i18n("Other Information"), this); new FlagCheckBox(other_group, controller, @@ -74,7 +74,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name) TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addStretch(); + tqlayout->addStretch(); } FeedbackTab::~FeedbackTab() @@ -94,12 +94,12 @@ void FeedbackTab::writeFlags(TQStringList *list) -FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char * name ) - :TQWidget(parent, name), controller(new FlagCheckBoxController()), +FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * tqparent, const char * name ) + :TQWidget(tqparent, name), controller(new FlagCheckBoxController()), pathController(new FlagPathEditController()) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); new FlagPathEdit(this, ":", pathController, "-Fu", i18n("Unit search path (delimited by \":\"):")); @@ -110,7 +110,7 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char * new FlagPathEdit(this, ":", pathController, "-Fl", i18n("Library search path (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addStretch(); + tqlayout->addStretch(); } FilesAndDirectoriesTab::~FilesAndDirectoriesTab( ) @@ -131,12 +131,12 @@ void FilesAndDirectoriesTab::writeFlags( TQStringList * str ) pathController->writeFlags(str); } -FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char * name ) - :TQWidget(parent, name), controller(new FlagCheckBoxController()), +FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * tqparent, const char * name ) + :TQWidget(tqparent, name), controller(new FlagCheckBoxController()), pathController(new FlagPathEditController()) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); new FlagPathEdit(this, "", pathController, "-FE", i18n("Write executables and units in:")); @@ -145,14 +145,14 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char new FlagPathEdit(this, "", pathController, "-o", i18n("Executable name:"), KFile::File); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(20); + tqlayout->addSpacing(20); new FlagPathEdit(this, "", pathController, "-e", i18n("Location of as and ld programs:")); new FlagPathEdit(this, "", pathController, "-FL", i18n("Dynamic linker executable:"), KFile::File); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(20); + tqlayout->addSpacing(20); new FlagPathEdit(this, "", pathController, "-Fr", i18n("Compiler messages file:"), KFile::File); @@ -160,7 +160,7 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char "-Fe", i18n("Write compiler messages to file:"), KFile::File); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addStretch(); + tqlayout->addStretch(); } FilesAndDirectoriesTab2::~FilesAndDirectoriesTab2( ) @@ -182,11 +182,11 @@ void FilesAndDirectoriesTab2::writeFlags( TQStringList * str ) } -LanguageTab::LanguageTab( TQWidget * parent, const char * name ) - : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) +LanguageTab::LanguageTab( TQWidget * tqparent, const char * name ) + : TQWidget(tqparent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v"))) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); TQVButtonGroup *compat_group = new TQVButtonGroup(i18n("Pascal Compatibility"), this); new FlagCheckBox(compat_group, controller, @@ -198,7 +198,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name ) new FlagCheckBox(compat_group, controller, "-Sp", i18n("GNU Pascal compatibility mode")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); TQVButtonGroup *ccompat_group = new TQVButtonGroup(i18n("C/C++ Compatibility"), this); new FlagCheckBox(ccompat_group, controller, @@ -208,7 +208,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name ) new FlagCheckBox(ccompat_group, controller, "-Sm", i18n("Support C style macros")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); TQVButtonGroup *lang_group = new TQVButtonGroup(i18n("Language"), this); new FlagCheckBox(lang_group, controller, @@ -221,7 +221,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name ) "-St", i18n("Allow the static keyword in objects")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addStretch(); + tqlayout->addStretch(); } LanguageTab::~ LanguageTab( ) @@ -239,14 +239,14 @@ void LanguageTab::writeFlags( TQStringList * str ) controller->writeFlags(str); } -AssemblerTab::AssemblerTab( TQWidget * parent, const char * name ) - : TQWidget(parent, name), controller(new FlagCheckBoxController()), +AssemblerTab::AssemblerTab( TQWidget * tqparent, const char * name ) + : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), asmController(new FlagRadioButtonController) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); -// layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); +// tqlayout->setAutoAdd(true); - TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); + TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); TQVButtonGroup *info_group = new TQVButtonGroup(i18n("Assembler Info"), this); new FlagCheckBox(info_group, controller, @@ -257,9 +257,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name ) "-ar", i18n("List register allocation and release info")); new FlagCheckBox(info_group, controller, "-at", i18n("List temporary allocations and deallocations")); - layout2->addWidget(info_group); + tqlayout2->addWidget(info_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - //layout->addSpacing(10); + //tqlayout->addSpacing(10); TQVButtonGroup *asmkind_group = new TQVButtonGroup(i18n("Assembler Reader"), this); TQRadioButton *m_defaultkind = new TQRadioButton(i18n("Use default reader"), asmkind_group); @@ -270,9 +270,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name ) "-Rintel", i18n("Intel style assembler")); new FlagRadioButton(asmkind_group, asmController, "-Rdirect", i18n("Direct assembler")); - layout2->addWidget(asmkind_group); + tqlayout2->addWidget(asmkind_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); TQVButtonGroup *asm_group = new TQVButtonGroup(i18n("Assembler Output"), this); @@ -298,10 +298,10 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name ) "-Acoff", i18n("Use coff")); new FlagRadioButton(asm_group, asmController, "-Apecoff", i18n("Use pecoff")); - layout->addWidget(asm_group); + tqlayout->addWidget(asm_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addStretch(); + tqlayout->addStretch(); } AssemblerTab::~ AssemblerTab( ) @@ -324,16 +324,16 @@ void AssemblerTab::writeFlags( TQStringList * str ) -DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) - : TQWidget(parent, name), controller(new FlagCheckBoxController()), +DebugOptimTab::DebugOptimTab( TQWidget * tqparent, const char * name ) + : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), optimController(new FlagRadioButtonController) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); -// layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); +// tqlayout->setAutoAdd(true); - TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); + TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); - TQBoxLayout *layout3 = new TQVBoxLayout(layout2, KDialog::spacingHint()); + TQBoxLayout *tqlayout3 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint()); TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this); new FlagCheckBox(debug_group, controller, @@ -346,18 +346,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-gh", i18n("Use heaptrc unit"), "-!gh"); new FlagCheckBox(debug_group, controller, "-gc", i18n("Generate checks for pointers"), "-!gc"); - layout3->addWidget(debug_group); + tqlayout3->addWidget(debug_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout3->addSpacing(10); + tqlayout3->addSpacing(10); TQVButtonGroup *profile_group = new TQVButtonGroup(i18n("Profiling"), this); new FlagCheckBox(profile_group, controller, "-pg", i18n("Generate profiler code for gprof"), "-!pg"); - layout3->addWidget(profile_group); + tqlayout3->addWidget(profile_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout3->addSpacing(10); + tqlayout3->addSpacing(10); - TQBoxLayout *layout4 = new TQVBoxLayout(layout2, KDialog::spacingHint()); + TQBoxLayout *tqlayout4 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint()); TQVButtonGroup *optim_group1 = new TQVButtonGroup(i18n("General Optimization"), this); m_default = new TQRadioButton(i18n("Default"), optim_group1); @@ -366,9 +366,9 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-Og", i18n("Generate smaller code")); optim1 = new FlagRadioButton(optim_group1, optimController, "-OG", i18n("Generate faster code")); - layout4->addWidget(optim_group1); + tqlayout4->addWidget(optim_group1); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout4->addSpacing(10); + tqlayout4->addSpacing(10); TQVButtonGroup *optim_group2 = new TQVButtonGroup(i18n("Optimization Levels"), this); m_default2 = new TQRadioButton(i18n("Default"), optim_group2); @@ -379,11 +379,11 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-O2", i18n("Level 2")); optim2 = new FlagRadioButton(optim_group2, optimController, "-O3", i18n("Level 3")); - layout4->addWidget(optim_group2); + tqlayout4->addWidget(optim_group2); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout4->addSpacing(10); + tqlayout4->addSpacing(10); - TQHBoxLayout *layout5 = new TQHBoxLayout(layout, KDialog::spacingHint()); + TQHBoxLayout *tqlayout5 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); TQVButtonGroup *optim_group3 = new TQVButtonGroup(i18n("Architecture"), this); m_default3 = new TQRadioButton(i18n("Default"), optim_group3); @@ -394,7 +394,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-Op2", i18n("Pentium/PentiumMMX")); new FlagRadioButton(optim_group3, optimController, "-Op2", i18n("PentiumPro/PII/Cyrix 6x86/K6")); - layout5->addWidget(optim_group3); + tqlayout5->addWidget(optim_group3); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); TQVButtonGroup *optim_group4 = new TQVButtonGroup(i18n("Another Optimization"), this); @@ -402,18 +402,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name ) "-Or", i18n("Use register variables"), "-!Or"); new FlagCheckBox(optim_group4, controller, "-Ou", i18n("Uncertain optimizations"), "-!Ou"); - layout5->addWidget(optim_group4); + tqlayout5->addWidget(optim_group4); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - TQHBoxLayout *layout6 = new TQHBoxLayout(layout, KDialog::spacingHint()); + TQHBoxLayout *tqlayout6 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); TQPushButton *release = new TQPushButton(i18n("Release"), this); TQPushButton *debug = new TQPushButton(i18n("Debug"), this); - layout6->addWidget(release); - layout6->addWidget(debug); + tqlayout6->addWidget(release); + tqlayout6->addWidget(debug); connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions())); connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions())); - layout->addStretch(); + tqlayout->addStretch(); } DebugOptimTab::~ DebugOptimTab( ) @@ -454,12 +454,12 @@ void DebugOptimTab::setDebugOptions() // m_default3->setChecked(true); } -CodegenTab::CodegenTab( TQWidget * parent, const char * name ) - : TQWidget(parent, name), controller(new FlagCheckBoxController()), +CodegenTab::CodegenTab( TQWidget * tqparent, const char * name ) + : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this); new FlagCheckBox(compile_group, controller, @@ -467,7 +467,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagCheckBox(compile_group, controller, "-Un", i18n("Do not check the unit name for being the same as the file name")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this); new FlagCheckBox(run_group, controller, @@ -479,14 +479,14 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) new FlagCheckBox(run_group, controller, "-Co", i18n("Integer overflow checking")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); new FlagListEdit(this, ":", listController, "-d", i18n("Conditional defines (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); new FlagListEdit(this, ":", listController, "-u", i18n("Undefine conditional defines (delimited by \":\"):")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); new FlagSpinEdit(this, 1024, 67107840, 1, 131072, listController, "-Cs", i18n("Stack size:")); @@ -494,7 +494,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name ) "-Ch", i18n("Heap size:")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addStretch(); + tqlayout->addStretch(); } CodegenTab::~ CodegenTab( ) @@ -515,13 +515,13 @@ void CodegenTab::writeFlags( TQStringList * str ) listController->writeFlags(str); } -LinkerTab::LinkerTab( TQWidget * parent, const char * name ) - : TQWidget(parent, name), controller(new FlagCheckBoxController()), +LinkerTab::LinkerTab( TQWidget * tqparent, const char * name ) + : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), listController(new FlagEditController()) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint()); + TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); TQVButtonGroup *link_group = new TQVButtonGroup(i18n("Linking Stage"), this); new FlagCheckBox(link_group, controller, @@ -534,7 +534,7 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name ) "-Cn", i18n("Omit the linking stage")); new FlagCheckBox(link_group, controller, "-s", i18n("Create assembling and linking script")); - layout2->addWidget(link_group); + tqlayout2->addWidget(link_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); TQVButtonGroup *exec_group = new TQVButtonGroup(i18n("Executable Generation"), this); @@ -548,15 +548,15 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name ) "-XD", i18n("Link with dynamic libraries")); new FlagCheckBox(exec_group, controller, "-Xc", i18n("Link with the C library")); - layout2->addWidget(exec_group); + tqlayout2->addWidget(exec_group); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); FlagListEdit *led = new FlagListEdit(this, ":", listController, "-k", i18n("Options passed to the linker (delimited by \":\"):")); - layout->addWidget(led); + tqlayout->addWidget(led); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addStretch(); + tqlayout->addStretch(); } LinkerTab::~LinkerTab( ) @@ -577,14 +577,14 @@ void LinkerTab::writeFlags( TQStringList * str ) listController->writeFlags(str); } -MiscTab::MiscTab( TQWidget * parent, const char * name ) - : TQWidget(parent, name), controller(new FlagCheckBoxController()), +MiscTab::MiscTab( TQWidget * tqparent, const char * name ) + : TQWidget(tqparent, name), controller(new FlagCheckBoxController()), radioController(new FlagRadioButtonController()), pathController(new FlagPathEditController()), editController(new FlagEditController()) { - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); new FlagCheckBox(this, controller, "-B", i18n("Recompile all used units")); @@ -595,7 +595,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name ) new FlagSpinEdit(this, 1, 1000, 1, 50, editController, "-Se", i18n("Stop after the error:")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); TQVButtonGroup *browser_group = new TQVButtonGroup(i18n("Browser Info"), this); TQRadioButton *m_defaultBrowser = new TQRadioButton(i18n("No browser info"), browser_group); @@ -605,7 +605,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name ) new FlagRadioButton(browser_group, radioController, "-bl", i18n("Global and local browser info")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); TQVButtonGroup *target_group = new TQVButtonGroup(i18n("Target OS"), this); TQRadioButton *m_defaultTarget = new TQRadioButton(i18n("Default"), target_group); @@ -625,9 +625,9 @@ MiscTab::MiscTab( TQWidget * parent, const char * name ) new FlagRadioButton(target_group, radioController, "-TBEOS", i18n("BeOS")); TQApplication::sendPostedEvents(this, TQEvent::ChildInserted); - layout->addSpacing(10); + tqlayout->addSpacing(10); - layout->addStretch(); + tqlayout->addStretch(); } MiscTab::~ MiscTab( ) diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.h b/languages/pascal/compiler/fpcoptions/optiontabs.h index acb446b3..9d0e0f07 100644 --- a/languages/pascal/compiler/fpcoptions/optiontabs.h +++ b/languages/pascal/compiler/fpcoptions/optiontabs.h @@ -21,10 +21,10 @@ class FlagRadioButtonController; class FlagPathEditController; class FlagEditController; -class FeedbackTab : public QWidget +class FeedbackTab : public TQWidget { public: - FeedbackTab( TQWidget *parent=0, const char *name=0 ); + FeedbackTab( TQWidget *tqparent=0, const char *name=0 ); ~FeedbackTab(); void readFlags(TQStringList *str); @@ -34,10 +34,10 @@ private: FlagCheckBoxController *controller; }; -class FilesAndDirectoriesTab: public QWidget +class FilesAndDirectoriesTab: public TQWidget { public: - FilesAndDirectoriesTab( TQWidget *parent = 0, const char *name = 0); + FilesAndDirectoriesTab( TQWidget *tqparent = 0, const char *name = 0); ~FilesAndDirectoriesTab(); void readFlags(TQStringList *str); @@ -48,10 +48,10 @@ private: FlagPathEditController *pathController; }; -class FilesAndDirectoriesTab2: public QWidget +class FilesAndDirectoriesTab2: public TQWidget { public: - FilesAndDirectoriesTab2( TQWidget *parent = 0, const char *name = 0); + FilesAndDirectoriesTab2( TQWidget *tqparent = 0, const char *name = 0); ~FilesAndDirectoriesTab2(); void readFlags(TQStringList *str); @@ -62,10 +62,10 @@ private: FlagPathEditController *pathController; }; -class LanguageTab : public QWidget +class LanguageTab : public TQWidget { public: - LanguageTab( TQWidget *parent=0, const char *name=0 ); + LanguageTab( TQWidget *tqparent=0, const char *name=0 ); ~LanguageTab(); void readFlags(TQStringList *str); @@ -75,10 +75,10 @@ private: FlagCheckBoxController *controller; }; -class AssemblerTab : public QWidget +class AssemblerTab : public TQWidget { public: - AssemblerTab( TQWidget *parent=0, const char *name=0 ); + AssemblerTab( TQWidget *tqparent=0, const char *name=0 ); ~AssemblerTab(); void readFlags(TQStringList *str); @@ -89,11 +89,12 @@ private: FlagRadioButtonController *asmController; }; -class DebugOptimTab : public QWidget +class DebugOptimTab : public TQWidget { Q_OBJECT + TQ_OBJECT public: - DebugOptimTab( TQWidget *parent=0, const char *name=0 ); + DebugOptimTab( TQWidget *tqparent=0, const char *name=0 ); ~DebugOptimTab(); void readFlags(TQStringList *str); @@ -114,10 +115,10 @@ private slots: void setDebugOptions(); }; -class CodegenTab : public QWidget +class CodegenTab : public TQWidget { public: - CodegenTab( TQWidget *parent=0, const char *name=0 ); + CodegenTab( TQWidget *tqparent=0, const char *name=0 ); ~CodegenTab(); void readFlags(TQStringList *str); @@ -128,10 +129,10 @@ private: FlagEditController *listController; }; -class LinkerTab : public QWidget +class LinkerTab : public TQWidget { public: - LinkerTab( TQWidget *parent=0, const char *name=0 ); + LinkerTab( TQWidget *tqparent=0, const char *name=0 ); ~LinkerTab(); void readFlags(TQStringList *str); @@ -142,10 +143,10 @@ private: FlagEditController *listController; }; -class MiscTab : public QWidget +class MiscTab : public TQWidget { public: - MiscTab( TQWidget *parent=0, const char *name=0 ); + MiscTab( TQWidget *tqparent=0, const char *name=0 ); ~MiscTab(); void readFlags(TQStringList *str); diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui index a215f7a8..7fd5275e 100644 --- a/languages/pascal/configproblemreporter.ui +++ b/languages/pascal/configproblemreporter.ui @@ -1,6 +1,6 @@ ConfigureProblemReporter - + ConfigureProblemReporter @@ -16,7 +16,7 @@ unnamed - + bgParserCheckbox @@ -24,7 +24,7 @@ &Enable background parsing - + delaySlider @@ -57,7 +57,7 @@ Expanding - + 0 101 @@ -77,12 +77,12 @@ kdialog.h - + init() destroy() accept() bgParserCheckbox_toggled( bool b ) - - - + + + diff --git a/languages/pascal/pascal.g b/languages/pascal/pascal.g index fde5dcb8..1c1209b5 100644 --- a/languages/pascal/pascal.g +++ b/languages/pascal/pascal.g @@ -59,7 +59,7 @@ options { * * One of the principles here is that any time you have a list of * stuff, you usually want to treat it like one thing (a list) a some - * point in the grammar. You want trees to have a fixed number of children + * point in the grammar. You want trees to have a fixed number of tqchildren * as much as possible. For example, the definition of a procedure should * be something like #(PROCEDURE ID #(ARGDECLS ARG1 ARG2...)) not * #(PROCEDURE ID ARG1 ARG2 ... ) since this is harder to parse and diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 0d8c049b..57ef642d 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -47,8 +47,8 @@ typedef KDevGenericFactory PascalSupportFactory; static const KDevPluginInfo data("kdevpascalsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) ) -PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &) - : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ), +PascalSupportPart::PascalSupportPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevLanguageSupport(&data, tqparent, name ? name : "KDevPascalSupport" ), d( new PascalSupportPartData() ) { setInstance(PascalSupportFactory::instance()); @@ -138,7 +138,7 @@ void PascalSupportPart::addedFilesToProject(const TQStringList &fileList) { TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); - kapp->processEvents( 500 ); + kapp->tqprocessEvents( 500 ); emit addedSourceInfo(fn); } } @@ -173,7 +173,7 @@ void PascalSupportPart::initialParse( ) for (TQStringList::Iterator it = files.begin(); it != files.end() ;++it){ TQString fn = project()->projectDirectory() + "/" + *it; maybeParse( fn ); - kapp->processEvents( 500 ); + kapp->tqprocessEvents( 500 ); } emit updatedSourceInfo(); @@ -191,7 +191,7 @@ void PascalSupportPart::maybeParse( const TQString & fileName ) if( !mime || mime->name() != "text/x-pascal" ) return; - mainWindow()->statusBar()->message( i18n("Parsing file: %1").arg(fileName) ); + mainWindow()->statusBar()->message( i18n("Parsing file: %1").tqarg(fileName) ); parse( fileName ); } @@ -256,10 +256,10 @@ TQString PascalSupportPart::formatTag( const Tag & inputTag ) switch( tag.kind() ) { case Tag::Kind_Namespace: - return TQString::fromLatin1("unit ") + tag.name(); + return TQString::tqfromLatin1("unit ") + tag.name(); case Tag::Kind_Class: - return TQString::fromLatin1("class ") + tag.name(); + return TQString::tqfromLatin1("class ") + tag.name(); case Tag::Kind_Function: case Tag::Kind_FunctionDeclaration: @@ -271,7 +271,7 @@ TQString PascalSupportPart::formatTag( const Tag & inputTag ) case Tag::Kind_Variable: case Tag::Kind_VariableDeclaration: { - return TQString::fromLatin1("var ") + tag.name(); + return TQString::tqfromLatin1("var ") + tag.name(); } break; } diff --git a/languages/pascal/pascalsupport_part.h b/languages/pascal/pascalsupport_part.h index 4b9e2a69..3ad9ee39 100644 --- a/languages/pascal/pascalsupport_part.h +++ b/languages/pascal/pascalsupport_part.h @@ -22,8 +22,9 @@ class PascalSupportPartData; class PascalSupportPart : public KDevLanguageSupport { Q_OBJECT + TQ_OBJECT public: - PascalSupportPart(TQObject *parent, const char *name, const TQStringList &); + PascalSupportPart(TQObject *tqparent, const char *name, const TQStringList &); ~PascalSupportPart(); virtual Features features(); diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index 30a65739..4b74164a 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -46,15 +46,15 @@ #include -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 ){ @@ -69,8 +69,8 @@ public: }; -ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* parent, const char* name ) - : TQListView( parent, name ), +ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* tqparent, const char* name ) + : TQListView( tqparent, name ), m_pascalSupport( part ), m_editor( 0 ), m_document( 0 ), @@ -217,7 +217,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 ) ); @@ -229,7 +229,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 ) ); @@ -241,7 +241,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/pascal/problemreporter.h b/languages/pascal/problemreporter.h index c00b629c..196d0b74 100644 --- a/languages/pascal/problemreporter.h +++ b/languages/pascal/problemreporter.h @@ -36,10 +36,11 @@ namespace KTextEditor{ class Document; } -class ProblemReporter: public QListView{ +class ProblemReporter: public TQListView{ Q_OBJECT + TQ_OBJECT public: - ProblemReporter( PascalSupportPart* part, TQWidget* parent=0, const char* name=0 ); + ProblemReporter( PascalSupportPart* part, TQWidget* tqparent=0, const char* name=0 ); virtual ~ProblemReporter(); virtual void reportError( TQString message, TQString filename, -- cgit v1.2.3