diff options
Diffstat (limited to 'languages/java')
24 files changed, 153 insertions, 185 deletions
diff --git a/languages/java/JavaLexer.cpp b/languages/java/JavaLexer.cpp index 623e816f..f205ddd3 100644 --- a/languages/java/JavaLexer.cpp +++ b/languages/java/JavaLexer.cpp @@ -275,7 +275,7 @@ ANTLR_USE_NAMESPACE(antlr)RefToken JavaLexer::nextToken() theRetToken=_returnToken; } else if ((LA(1) == 0x3d /* '=' */ ) && (LA(2) == 0x3d /* '=' */ )) { - mEQUAL(true); + mETQUAL(true); theRetToken=_returnToken; } else if ((LA(1) == 0x21 /* '!' */ ) && (LA(2) == 0x3d /* '=' */ )) { @@ -571,9 +571,9 @@ void JavaLexer::mASSIGN(bool _createToken) { _saveIndex=0; } -void JavaLexer::mEQUAL(bool _createToken) { +void JavaLexer::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("=="); diff --git a/languages/java/JavaLexer.hpp b/languages/java/JavaLexer.hpp index 9d185686..85d661be 100644 --- a/languages/java/JavaLexer.hpp +++ b/languages/java/JavaLexer.hpp @@ -68,7 +68,7 @@ public: public: void mCOLON(bool _createToken); public: void mCOMMA(bool _createToken); public: void mASSIGN(bool _createToken); - public: void mEQUAL(bool _createToken); + public: void mETQUAL(bool _createToken); public: void mLNOT(bool _createToken); public: void mBNOT(bool _createToken); public: void mNOT_EQUAL(bool _createToken); diff --git a/languages/java/JavaRecognizer.cpp b/languages/java/JavaRecognizer.cpp index 1021c6a0..eb17df00 100644 --- a/languages/java/JavaRecognizer.cpp +++ b/languages/java/JavaRecognizer.cpp @@ -4181,7 +4181,7 @@ void JavaRecognizer::equalityExpression() { } { // ( ... )* for (;;) { - if ((LA(1) == NOT_EQUAL || LA(1) == EQUAL)) { + if ((LA(1) == NOT_EQUAL || LA(1) == ETQUAL)) { { switch ( LA(1)) { case NOT_EQUAL: @@ -4194,14 +4194,14 @@ void JavaRecognizer::equalityExpression() { match(NOT_EQUAL); break; } - case EQUAL: + case ETQUAL: { RefJavaAST tmp139_AST = RefJavaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); if ( inputState->guessing == 0 ) { tmp139_AST = astFactory->create(LT(1)); astFactory->makeASTRoot(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(tmp139_AST)); } - match(EQUAL); + match(ETQUAL); break; } default: @@ -4272,7 +4272,7 @@ void JavaRecognizer::relationalExpression() { case BXOR: case BAND: case NOT_EQUAL: - case EQUAL: + case ETQUAL: case LT_: case GT: case LE: @@ -4969,7 +4969,7 @@ void JavaRecognizer::postfixExpression() { case BXOR: case BAND: case NOT_EQUAL: - case EQUAL: + case ETQUAL: case LT_: case GT: case LE: @@ -5107,7 +5107,7 @@ void JavaRecognizer::postfixExpression() { case BXOR: case BAND: case NOT_EQUAL: - case EQUAL: + case ETQUAL: case LT_: case GT: case LE: @@ -5235,7 +5235,7 @@ void JavaRecognizer::postfixExpression() { case BXOR: case BAND: case NOT_EQUAL: - case EQUAL: + case ETQUAL: case LT_: case GT: case LE: @@ -5581,7 +5581,7 @@ void JavaRecognizer::newExpression() { case BXOR: case BAND: case NOT_EQUAL: - case EQUAL: + case ETQUAL: case LT_: case GT: case LE: @@ -5651,7 +5651,7 @@ void JavaRecognizer::newExpression() { case BXOR: case BAND: case NOT_EQUAL: - case EQUAL: + case ETQUAL: case LT_: case GT: case LE: @@ -6113,7 +6113,7 @@ const char* JavaRecognizer::tokenNames[] = { "BXOR", "BAND", "NOT_EQUAL", - "EQUAL", + "ETQUAL", "LT_", "GT", "LE", @@ -6173,7 +6173,7 @@ const unsigned long JavaRecognizer::_tokenSet_4_data_[] = { 0UL, 67215360UL, 687 // SEMI LBRACK RBRACK IDENT LCURLY RCURLY COMMA "implements" LPAREN RPAREN // ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN // SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION -// LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_4(_tokenSet_4_data_,8); const unsigned long JavaRecognizer::_tokenSet_5_data_[] = { 0UL, 8192UL, 0UL, 0UL, 0UL, 0UL }; // SEMI @@ -6204,13 +6204,13 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_9(_tokenSet_9_d const unsigned long JavaRecognizer::_tokenSet_10_data_[] = { 0UL, 67182592UL, 674816UL, 4194296UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK IDENT RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_10(_tokenSet_10_data_,8); const unsigned long JavaRecognizer::_tokenSet_11_data_[] = { 0UL, 201433088UL, 683008UL, 4194296UL, 0UL, 0UL, 0UL, 0UL }; // SEMI LBRACK RBRACK IDENT DOT RCURLY COMMA LPAREN RPAREN ASSIGN COLON // PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR -// LAND BOR BXOR BAND NOT_EQUAL EQUAL +// LAND BOR BXOR BAND NOT_EQUAL ETQUAL const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_11(_tokenSet_11_data_,8); const unsigned long JavaRecognizer::_tokenSet_12_data_[] = { 0UL, 32768UL, 8192UL, 0UL, 0UL, 0UL, 0UL, 0UL }; // LBRACK LPAREN @@ -6235,7 +6235,7 @@ const unsigned long JavaRecognizer::_tokenSet_16_data_[] = { 2UL, 4294943616UL, // "super" ASSIGN COLON "if" "else" "for" "while" "do" "break" "continue" // "return" "switch" "throw" "case" "default" "try" PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL // NUM_FLOAT NUM_LONG NUM_DOUBLE @@ -6275,7 +6275,7 @@ const unsigned long JavaRecognizer::_tokenSet_22_data_[] = { 0UL, 4294878080UL, // COLON "if" "for" "while" "do" "break" "continue" "return" "switch" "throw" // "try" PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR -// LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR +// LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR // PLUS MINUS DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" NUM_INT // CHAR_LITERAL STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_22(_tokenSet_22_data_,12); @@ -6323,7 +6323,7 @@ const unsigned long JavaRecognizer::_tokenSet_29_data_[] = { 0UL, 4294878080UL, // COLON "if" "else" "for" "while" "do" "break" "continue" "return" "switch" // "throw" "case" "default" "try" "finally" "catch" PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL // NUM_FLOAT NUM_LONG NUM_DOUBLE @@ -6348,7 +6348,7 @@ const unsigned long JavaRecognizer::_tokenSet_33_data_[] = { 0UL, 536780800UL, 2 // SEMI LBRACK "void" "boolean" "byte" "char" "short" "int" "float" "long" // "double" IDENT DOT STAR LPAREN "this" "super" ASSIGN PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL // NUM_FLOAT NUM_LONG NUM_DOUBLE @@ -6377,7 +6377,7 @@ const unsigned long JavaRecognizer::_tokenSet_39_data_[] = { 0UL, 402759680UL, 6 // SEMI LBRACK RBRACK DOT STAR RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN // MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN // SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR -// BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS +// BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS // DIV MOD INC DEC const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_39(_tokenSet_39_data_,12); const unsigned long JavaRecognizer::_tokenSet_40_data_[] = { 0UL, 73728UL, 543744UL, 0UL, 0UL, 0UL, 0UL, 0UL }; @@ -6395,7 +6395,7 @@ const unsigned long JavaRecognizer::_tokenSet_43_data_[] = { 0UL, 536780800UL, 2 // "double" IDENT DOT STAR COMMA LPAREN "this" "super" ASSIGN PLUS_ASSIGN // MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN // SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR -// BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS +// BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS // DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL // STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_43(_tokenSet_43_data_,12); @@ -6467,18 +6467,18 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_55(_tokenSet_55 const unsigned long JavaRecognizer::_tokenSet_56_data_[] = { 0UL, 73728UL, 674816UL, 4194296UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_56(_tokenSet_56_data_,8); const unsigned long JavaRecognizer::_tokenSet_57_data_[] = { 0UL, 73728UL, 674816UL, 134217720UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL // LT_ GT LE GE "instanceof" const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_57(_tokenSet_57_data_,8); const unsigned long JavaRecognizer::_tokenSet_58_data_[] = { 0UL, 73728UL, 674816UL, 1073741816UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL // LT_ GT LE GE "instanceof" SL SR BSR const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_58(_tokenSet_58_data_,8); const unsigned long JavaRecognizer::_tokenSet_59_data_[] = { 0UL, 268435456UL, 0UL, 0UL, 3UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; @@ -6487,13 +6487,13 @@ const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_59(_tokenSet_59 const unsigned long JavaRecognizer::_tokenSet_60_data_[] = { 0UL, 73728UL, 674816UL, 4294967288UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_60(_tokenSet_60_data_,8); const unsigned long JavaRecognizer::_tokenSet_61_data_[] = { 0UL, 268509184UL, 674816UL, 4294967288UL, 3UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; // SEMI RBRACK STAR RCURLY COMMA RPAREN ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_61(_tokenSet_61_data_,12); const unsigned long JavaRecognizer::_tokenSet_62_data_[] = { 0UL, 134086656UL, 106496UL, 0UL, 65472UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL }; @@ -6506,7 +6506,7 @@ const unsigned long JavaRecognizer::_tokenSet_63_data_[] = { 0UL, 536846336UL, 7 // "long" "double" IDENT DOT STAR RCURLY COMMA LPAREN RPAREN "this" "super" // ASSIGN COLON PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN // SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION -// LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL +// LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL // SR BSR PLUS MINUS DIV MOD INC DEC BNOT LNOT "true" "false" "null" "new" // NUM_INT CHAR_LITERAL STRING_LITERAL NUM_FLOAT NUM_LONG NUM_DOUBLE const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_63(_tokenSet_63_data_,12); @@ -6518,7 +6518,7 @@ const unsigned long JavaRecognizer::_tokenSet_64_data_[] = { 0UL, 4294943616UL, // "super" ASSIGN COLON "if" "else" "for" "while" "do" "break" "continue" // "return" "switch" "throw" "case" "default" "try" PLUS_ASSIGN MINUS_ASSIGN // STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN BSR_ASSIGN SL_ASSIGN BAND_ASSIGN -// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL EQUAL +// BXOR_ASSIGN BOR_ASSIGN QUESTION LOR LAND BOR BXOR BAND NOT_EQUAL ETQUAL // LT_ GT LE GE "instanceof" SL SR BSR PLUS MINUS DIV MOD INC DEC BNOT // LNOT "true" "false" "null" "new" NUM_INT CHAR_LITERAL STRING_LITERAL // NUM_FLOAT NUM_LONG NUM_DOUBLE @@ -6533,7 +6533,7 @@ const unsigned long JavaRecognizer::_tokenSet_66_data_[] = { 0UL, 402759680UL, 6 // SEMI LBRACK RBRACK DOT STAR LCURLY RCURLY COMMA RPAREN ASSIGN COLON // PLUS_ASSIGN MINUS_ASSIGN STAR_ASSIGN DIV_ASSIGN MOD_ASSIGN SR_ASSIGN // BSR_ASSIGN SL_ASSIGN BAND_ASSIGN BXOR_ASSIGN BOR_ASSIGN QUESTION LOR -// LAND BOR BXOR BAND NOT_EQUAL EQUAL LT_ GT LE GE "instanceof" SL SR BSR +// LAND BOR BXOR BAND NOT_EQUAL ETQUAL LT_ GT LE GE "instanceof" SL SR BSR // PLUS MINUS DIV MOD INC DEC const ANTLR_USE_NAMESPACE(antlr)BitSet JavaRecognizer::_tokenSet_66(_tokenSet_66_data_,12); diff --git a/languages/java/JavaRecognizer.hpp b/languages/java/JavaRecognizer.hpp index fab59972..4dafc60e 100644 --- a/languages/java/JavaRecognizer.hpp +++ b/languages/java/JavaRecognizer.hpp @@ -103,7 +103,7 @@ * o supports UNICODE? * Using Unicode charVocabulay makes code file big, but only * in the bitsets at the end. I need to make ANTLR generate - * unicode bitsets more efficiently. + * tqunicode bitsets more efficiently. * Version 1.19 (April 25, 2002) * Terence added in nice fixes by John Pybus concerning floating * constants and problems with super() calls. John did a nice diff --git a/languages/java/JavaStoreWalker.cpp b/languages/java/JavaStoreWalker.cpp index 1bdb9522..ac5cfc5e 100644 --- a/languages/java/JavaStoreWalker.cpp +++ b/languages/java/JavaStoreWalker.cpp @@ -1046,9 +1046,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { #line 264 "java.store.g" meth->setResultType( tp ); - if( m.contains("public") ) + if( m.tqcontains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.contains("protected") ) + else if( m.tqcontains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -1096,14 +1096,14 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { #line 300 "java.store.g" attr->setType( tp ); - if( m.contains("public") ) + if( m.tqcontains("public") ) attr->setAccess( CodeModelItem::Public ); - else if( m.contains("protected") ) + else if( m.tqcontains("protected") ) attr->setAccess( CodeModelItem::Protected ); else attr->setAccess( CodeModelItem::Private ); - attr->setStatic( m.contains("static") ); + attr->setStatic( m.tqcontains("static") ); #line 1109 "JavaStoreWalker.cpp" } @@ -1144,9 +1144,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { _t = _t->getNextSibling(); #line 247 "java.store.g" - if( m.contains("public") ) + if( m.tqcontains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.contains("protected") ) + else if( m.tqcontains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -1212,9 +1212,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { #line 282 "java.store.g" meth->setResultType( tp ); - if( m.contains("public") ) + if( m.tqcontains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.contains("protected") ) + else if( m.tqcontains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -2447,11 +2447,11 @@ void JavaStoreWalker::expr(RefJavaAST _t) { _t = _t->getNextSibling(); break; } - case EQUAL: + case ETQUAL: { RefJavaAST __t145 = _t; RefJavaAST tmp104_AST_in = _t; - match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),EQUAL); + match(ANTLR_USE_NAMESPACE(antlr)RefAST(_t),ETQUAL); _t = _t->getFirstChild(); expr(_t); _t = _retTree; @@ -2830,7 +2830,7 @@ void JavaStoreWalker::primaryExpression(RefJavaAST _t) { case BXOR: case BAND: case NOT_EQUAL: - case EQUAL: + case ETQUAL: case LT_: case GT: case LE: @@ -3389,7 +3389,7 @@ const char* JavaStoreWalker::tokenNames[] = { "BXOR", "BAND", "NOT_EQUAL", - "EQUAL", + "ETQUAL", "LT_", "GT", "LE", diff --git a/languages/java/JavaStoreWalkerTokenTypes.hpp b/languages/java/JavaStoreWalkerTokenTypes.hpp index 44322944..6f20deaf 100644 --- a/languages/java/JavaStoreWalkerTokenTypes.hpp +++ b/languages/java/JavaStoreWalkerTokenTypes.hpp @@ -125,7 +125,7 @@ struct CUSTOM_API JavaStoreWalkerTokenTypes { BXOR = 114, BAND = 115, NOT_EQUAL = 116, - EQUAL = 117, + ETQUAL = 117, LT_ = 118, GT = 119, LE = 120, diff --git a/languages/java/JavaTokenTypes.hpp b/languages/java/JavaTokenTypes.hpp index e36fa54c..64a6486b 100644 --- a/languages/java/JavaTokenTypes.hpp +++ b/languages/java/JavaTokenTypes.hpp @@ -125,7 +125,7 @@ struct CUSTOM_API JavaTokenTypes { BXOR = 114, BAND = 115, NOT_EQUAL = 116, - EQUAL = 117, + ETQUAL = 117, LT_ = 118, GT = 119, LE = 120, diff --git a/languages/java/KDevJavaSupportIface.h b/languages/java/KDevJavaSupportIface.h index ae5ee39f..da8ed9b3 100644 --- a/languages/java/KDevJavaSupportIface.h +++ b/languages/java/KDevJavaSupportIface.h @@ -10,6 +10,7 @@ class JavaSupportPart; class KDevJavaSupportIface : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: KDevJavaSupportIface( JavaSupportPart* javaSupport ); diff --git a/languages/java/README.dox b/languages/java/README.dox index 49af1e43..618ddd50 100644 --- a/languages/java/README.dox +++ b/languages/java/README.dox @@ -13,7 +13,7 @@ and images. \maintainer <a href="mailto:roberto AT kdevelop.org">Roberto Raggi</a> Copyright (C) 2002-2003 \feature Java 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 bugs in <a href="http://bugs.kde.org/buglist.cgi?product=kdevelop&component=javasupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">javasupport component at Bugzilla database</a> \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet. diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java index 1ead5458..0a25ea22 100644 --- a/languages/java/app_templates/kappjava/appview.java +++ b/languages/java/app_templates/kappjava/appview.java @@ -22,10 +22,10 @@ public class %{APPNAME}View extends QWidget QHBoxLayout top_layout; -public %{APPNAME}View(QWidget parent) +public %{APPNAME}View(QWidget tqparent) { - super(parent, null); - // setup our layout manager to automatically add our widgets + super(tqparent, null); + // setup our tqlayout manager to automatically add our widgets top_layout = new QHBoxLayout(this); top_layout.setAutoAdd(true); diff --git a/languages/java/app_templates/kappjava/pref.java b/languages/java/app_templates/kappjava/pref.java index a50fdb31..4ba240f9 100644 --- a/languages/java/app_templates/kappjava/pref.java +++ b/languages/java/app_templates/kappjava/pref.java @@ -28,22 +28,22 @@ public %{APPNAME}Preferences() } public class %{APPNAME}PrefPageOne extends QFrame { -public %{APPNAME}PrefPageOne(QWidget parent) +public %{APPNAME}PrefPageOne(QWidget tqparent) { - super(parent); - QHBoxLayout layout = new QHBoxLayout(this); - layout.setAutoAdd(true); + super(tqparent); + QHBoxLayout tqlayout = new QHBoxLayout(this); + tqlayout.setAutoAdd(true); new QLabel("Add something here", this); } } public class %{APPNAME}PrefPageTwo extends QFrame { -public %{APPNAME}PrefPageTwo(QWidget parent) +public %{APPNAME}PrefPageTwo(QWidget tqparent) { - super(parent); - QHBoxLayout layout = new QHBoxLayout(this); - layout.setAutoAdd(true); + super(tqparent); + QHBoxLayout tqlayout = new QHBoxLayout(this); + tqlayout.setAutoAdd(true); new QLabel("Add something here", this); } diff --git a/languages/java/app_templates/superwaba/src-Makefile b/languages/java/app_templates/superwaba/src-Makefile index 84b55ece..f2a2a1ab 100644 --- a/languages/java/app_templates/superwaba/src-Makefile +++ b/languages/java/app_templates/superwaba/src-Makefile @@ -114,7 +114,7 @@ WABAEXTRADIR = $(WABADIR)/superwaba ################################################################################ # the classpath will have to tell java where to find the waba stuff. # -# the CLASSPATH here is set to let java find +# the CLASSPATH here is set to let java tqfind # - the classes it needs to produce the executable class files # - the waba.applet class, Warp.class, and Exegen.class # @@ -198,7 +198,7 @@ $(PDBFILE): $(MAINCLASS) $(EXTRACLASSES) # $(PDBFILE): $(MAINCLASS) $(EXTRACLASSES) # $(WARP) $(WARPFLAGS) $(PDBBASENAME) $(MAINCLASS) $(EXTRACLASSES) -# Below, we just tell make how to create foo.class if it can find +# Below, we just tell make how to create foo.class if it can tqfind # foo.java %.class: %.java diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 0820b4d1..e1f058c7 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -16,11 +16,7 @@ #include "kdevdeepcopy.h" #include "kdevdriver.h" -#if QT_VERSION < 0x030100 -#include <kdevmutex.h> -#else #include <tqmutex.h> -#endif #include <kparts/part.h> #include <ktexteditor/editinterface.h> @@ -92,7 +88,7 @@ public: return contents; } - return TQString::null; + return TQString(); } virtual bool isModified( const TQString& fileName ) @@ -126,7 +122,7 @@ public: return m_fileList.count(); } - QPair<TQString, bool> front() const + TQPair<TQString, bool> front() const { TQMutexLocker locker( &m_mutex ); return m_fileList.front(); @@ -141,7 +137,7 @@ public: void push_back( const TQString& fileName, bool readFromDisk=false ) { TQMutexLocker locker( &m_mutex ); - m_fileList.append( qMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?! + m_fileList.append( tqMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?! } void pop_front() @@ -150,10 +146,10 @@ public: m_fileList.pop_front(); } - bool contains( const TQString& fileName ) const + bool tqcontains( const TQString& fileName ) const { TQMutexLocker locker( &m_mutex ); - TQValueList< QPair<TQString, bool> >::ConstIterator it = m_fileList.begin(); + TQValueList< TQPair<TQString, bool> >::ConstIterator it = m_fileList.begin(); while( it != m_fileList.end() ){ if( (*it).first == fileName ) return true; @@ -165,7 +161,7 @@ public: void remove( const TQString& fileName ) { TQMutexLocker locker( &m_mutex ); - TQValueList< QPair<TQString, bool> >::Iterator it = m_fileList.begin(); + TQValueList< TQPair<TQString, bool> >::Iterator it = m_fileList.begin(); while( it != m_fileList.end() ){ if( (*it).first == fileName ) m_fileList.remove( it ); @@ -175,7 +171,7 @@ public: private: mutable TQMutex m_mutex; - TQValueList< QPair<TQString, bool> > m_fileList; + TQValueList< TQPair<TQString, bool> > m_fileList; }; BackgroundParser::BackgroundParser( JavaSupportPart* part, TQWaitCondition* consumed ) @@ -203,7 +199,7 @@ void BackgroundParser::addFile( const TQString& fileName, bool readFromDisk ) TQString fn = deepCopy( fileName ); bool added = false; - if( !m_fileList->contains(fn) ){ + if( !m_fileList->tqcontains(fn) ){ m_fileList->push_back( fn, readFromDisk ); added = true; } @@ -261,7 +257,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk ) static_cast<KDevSourceProvider*>( m_driver->sourceProvider() )->setReadFromDisk( false ); - if( m_unitDict.find(fileName) != m_unitDict.end() ){ + if( m_unitDict.tqfind(fileName) != m_unitDict.end() ){ Unit* u = m_unitDict[ fileName ]; m_unitDict.remove( fileName ); delete( u ); @@ -270,13 +266,13 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk ) m_unitDict.insert( fileName, unit ); - if( m_fileList->contains(fileName) ){ - kdDebug(9013) << "========================> FILE: " << fileName << " IN QUEUE <=============" << endl; + if( m_fileList->tqcontains(fileName) ){ + kdDebug(9013) << "========================> FILE: " << fileName << " IN TQUEUE <=============" << endl; } else { KApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) ); } - m_currentFile = TQString::null; + m_currentFile = TQString(); if( m_fileList->isEmpty() ) m_isEmpty.wakeAll(); @@ -286,7 +282,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk ) Unit* BackgroundParser::findUnit( const TQString& fileName ) { - TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName ); + TQMap<TQString, Unit*>::Iterator it = m_unitDict.tqfind( fileName ); return it != m_unitDict.end() ? *it : 0; } @@ -346,7 +342,7 @@ void BackgroundParser::run() break; } - QPair<TQString, bool> entry = m_fileList->front(); + TQPair<TQString, bool> entry = m_fileList->front(); TQString fileName = entry.first; bool readFromDisk = entry.second; m_currentFile = fileName; diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h index 4cc52f33..fee2bc78 100644 --- a/languages/java/backgroundparser.h +++ b/languages/java/backgroundparser.h @@ -40,7 +40,7 @@ protected: void operator = ( const Unit& source ); }; -class BackgroundParser: public QThread +class BackgroundParser: public TQThread { public: BackgroundParser( JavaSupportPart*, TQWaitCondition* consumed ); diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui index 580f60c4..1e6a7f1a 100644 --- a/languages/java/configproblemreporter.ui +++ b/languages/java/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="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -30,15 +30,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>bgParserCheckbox</cstring> </property> @@ -46,7 +46,7 @@ <string>&Enable background parsing</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>delayLabel</cstring> </property> @@ -61,13 +61,13 @@ <property name="text"> <string>msec</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> </hbox> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>delaySlider</cstring> </property> @@ -92,7 +92,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -132,14 +132,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>61</height> </size> </property> </spacer> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>pushButton6</cstring> </property> @@ -150,7 +150,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>pushButton5</cstring> </property> @@ -161,7 +161,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>pushButton3</cstring> </property> @@ -172,7 +172,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>pushButton4</cstring> </property> @@ -238,7 +238,7 @@ <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> @@ -248,9 +248,9 @@ <slot>removeSpecialHeader()</slot> <slot>moveUpSpecialHeader()</slot> <slot>moveDownSpecialHeader()</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"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h index f68a0c80..1da526ca 100644 --- a/languages/java/configproblemreporter.ui.h +++ b/languages/java/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. *****************************************************************************/ @@ -46,7 +46,7 @@ void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b ) void ConfigureProblemReporter::setDelayLabel( int delay ) { - delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) ); + delayLabel->setText( i18n( "delay: %1 msec" ).tqarg( delay ) ); } diff --git a/languages/java/driver.cpp b/languages/java/driver.cpp index f856fc74..9a4bccdf 100644 --- a/languages/java/driver.cpp +++ b/languages/java/driver.cpp @@ -100,7 +100,7 @@ void Driver::remove( const TQString & fileName ) { m_problems.remove( fileName ); - TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( fileName ); + TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( fileName ); if( it != m_parsedUnits.end() ){ RefJavaAST unit = *it; m_parsedUnits.remove( it ); @@ -110,7 +110,7 @@ void Driver::remove( const TQString & fileName ) RefJavaAST Driver::takeTranslationUnit( const TQString& fileName ) { - TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( fileName ); + TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( fileName ); RefJavaAST unit( *it ); //m_parsedUnits.remove( it ); m_parsedUnits[ fileName] = 0; @@ -119,7 +119,7 @@ RefJavaAST Driver::takeTranslationUnit( const TQString& fileName ) RefJavaAST Driver::translationUnit( const TQString& fileName ) const { - TQMap<TQString, RefJavaAST>::ConstIterator it = m_parsedUnits.find( fileName ); + TQMap<TQString, RefJavaAST>::ConstIterator it = m_parsedUnits.tqfind( fileName ); return it != m_parsedUnits.end() ? *it : RefJavaAST(); } @@ -130,7 +130,7 @@ void Driver::addProblem( const TQString & fileName, const Problem & problem ) TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileName ) { - TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.find( fileName ); + TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.tqfind( fileName ); if( it != m_problems.end() ) return it.data(); @@ -141,7 +141,7 @@ TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileN TQValueList < Problem > Driver::problems( const TQString & fileName ) const { - TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.find( fileName ); + TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.tqfind( fileName ); if( it != m_problems.end() ) return it.data(); return TQValueList<Problem>(); @@ -152,7 +152,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc TQFileInfo fileInfo( fileName ); TQString absFilePath = fileInfo.absFilePath(); - TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( absFilePath ); + TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( absFilePath ); if( force && it != m_parsedUnits.end() ){ takeTranslationUnit( absFilePath ); @@ -199,7 +199,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc } - m_currentFileName = TQString::null; + m_currentFileName = TQString(); lexer = 0; fileParsed( fileName ); diff --git a/languages/java/java.g b/languages/java/java.g index 1f825ec5..59f7e0cd 100644 --- a/languages/java/java.g +++ b/languages/java/java.g @@ -97,7 +97,7 @@ options { * o supports UNICODE? * Using Unicode charVocabulay makes code file big, but only * in the bitsets at the end. I need to make ANTLR generate - * unicode bitsets more efficiently. + * tqunicode bitsets more efficiently. * Version 1.19 (April 25, 2002) * Terence added in nice fixes by John Pybus concerning floating * constants and problems with super() calls. John did a nice @@ -698,7 +698,7 @@ handler // ( 2) * / % // ( 1) ++ -- +(unary) -(unary) ~ ! (type) // [] () (method call) . (dot -- identifier qualification) -// new () (explicit parenthesis) +// new () (explicit tqparenthesis) // // the last two are not usually on a precedence chart; I put them in // to point out that new has a higher precedence than '.', so you @@ -1050,7 +1050,7 @@ options { k=4; // four characters of lookahead // charVocabulary='\u0003'..'\uFFFF'; charVocabulary='\u0003'..'\u00FF'; - // without inlining some bitset tests, couldn't do unicode; + // without inlining some bitset tests, couldn't do tqunicode; // I need to make ANTLR generate smaller bitsets; see // bottom of JavaLexer.java codeGenBitsetTestThreshold=20; diff --git a/languages/java/java.store.g b/languages/java/java.store.g index b69b7323..d7e28c22 100644 --- a/languages/java/java.store.g +++ b/languages/java/java.store.g @@ -245,9 +245,9 @@ ctorDef returns [ FunctionDom meth ] { m=modifiers methodHead[meth] slist ) { - if( m.contains("public") ) + if( m.tqcontains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.contains("protected") ) + else if( m.tqcontains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -263,9 +263,9 @@ methodDecl returns [ FunctionDom meth ] { : #(METHOD_DEF m=modifiers tp=typeSpec methodHead[meth]) { meth->setResultType( tp ); - if( m.contains("public") ) + if( m.tqcontains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.contains("protected") ) + else if( m.tqcontains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -281,9 +281,9 @@ methodDef returns [ FunctionDom meth ] { : #(METHOD_DEF m=modifiers tp=typeSpec methodHead[meth] (slist)?) { meth->setResultType( tp ); - if( m.contains("public") ) + if( m.tqcontains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.contains("protected") ) + else if( m.tqcontains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -299,14 +299,14 @@ variableDef returns [ VariableDom attr ] { : #(VARIABLE_DEF m=modifiers tp=typeSpec variableDeclarator[attr] varInitializer) { attr->setType( tp ); - if( m.contains("public") ) + if( m.tqcontains("public") ) attr->setAccess( CodeModelItem::Public ); - else if( m.contains("protected") ) + else if( m.tqcontains("protected") ) attr->setAccess( CodeModelItem::Protected ); else attr->setAccess( CodeModelItem::Private ); - attr->setStatic( m.contains("static") ); + attr->setStatic( m.tqcontains("static") ); } ; diff --git a/languages/java/javasupport_events.h b/languages/java/javasupport_events.h index e325e635..36cda51b 100644 --- a/languages/java/javasupport_events.h +++ b/languages/java/javasupport_events.h @@ -18,18 +18,14 @@ #include <tqevent.h> #include <tqvaluelist.h> -#if QT_VERSION < 0x030100 -#include <kdevmutex.h> -#else #include <tqmutex.h> -#endif enum { Event_FileParsed = TQEvent::User + 1000 }; -class FileParsedEvent: public QCustomEvent +class FileParsedEvent: public TQCustomEvent { public: FileParsedEvent( const TQString& fileName, const TQValueList<Problem>& problems ) diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 62d4811f..e8f62fa1 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -118,8 +118,8 @@ public: } }; -JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : KDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "KDevJavaSupport"), +JavaSupportPart::JavaSupportPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/) + : KDevLanguageSupport(JavaSupportFactory::info(), tqparent, name ? name : "KDevJavaSupport"), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_valid( false ) { @@ -267,13 +267,13 @@ void JavaSupportPart::activePartChanged(KParts::Part *part) m_activeSelection = dynamic_cast<KTextEditor::SelectionInterface*>( part ); m_activeViewCursor = part ? dynamic_cast<KTextEditor::ViewCursorInterface*>( m_activeView ) : 0; - m_activeFileName = TQString::null; + m_activeFileName = TQString(); if (m_activeDocument) { m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() ); TQFileInfo fi( m_activeFileName ); TQString ext = fi.extension(); - if (fileExtensions().contains(ext)) + if (fileExtensions().tqcontains(ext)) enabled = true; } @@ -395,7 +395,7 @@ void JavaSupportPart::savedFile(const KURL &fileName) kdDebug(9013) << "savedFile(): " << fileName.mid ( m_projectDirectory.length() + 1 ) << endl; TQStringList projectFileList = project()->allFiles(); - if (projectFileList.contains(fileName.mid ( m_projectDirectory.length() + 1 ))) { + if (projectFileList.tqcontains(fileName.mid ( m_projectDirectory.length() + 1 ))) { maybeParse( fileName ); emit addedSourceInfo( fileName ); } @@ -481,25 +481,6 @@ void JavaSupportPart::initialParse( ) return; } -#if QT_VERSION < 0x030100 -// Taken from qt-3.2/tools/qdatetime.java/TQDateTime::toTime_t() and modified for normal function -uint toTime_t(TQDateTime t) -{ - tm brokenDown; - brokenDown.tm_sec = t.time().second(); - brokenDown.tm_min = t.time().minute(); - brokenDown.tm_hour = t.time().hour(); - brokenDown.tm_mday = t.date().day(); - brokenDown.tm_mon = t.date().month() - 1; - brokenDown.tm_year = t.date().year() - 1900; - brokenDown.tm_isdst = -1; - int secsSince1Jan1970UTC = (int) mktime( &brokenDown ); - if ( secsSince1Jan1970UTC < -1 ) - secsSince1Jan1970UTC = -1; - return (uint) secsSince1Jan1970UTC; -} -#endif - bool JavaSupportPart::parseProject( ) { @@ -524,7 +505,7 @@ JavaSupportPart::parseProject( ) TQDir d( m_projectDirectory ); TQDataStream stream; - TQMap< TQString, QPair<uint, uint> > pcs; + TQMap< TQString, TQPair<uint, uint> > pcs; if( TQFileInfo( project()->projectDirectory() + "/" + project()->projectName().lower() + ".kdevelop.pcs" ).exists() ) @@ -550,7 +531,7 @@ JavaSupportPart::parseProject( ) uint offset; stream >> fn >> ts >> offset; - pcs[ fn ] = qMakePair( ts, offset ); + pcs[ fn ] = tqMakePair( ts, offset ); } } } @@ -575,15 +556,11 @@ JavaSupportPart::parseProject( ) if( isValidSource(absFilePath) ){ TQDateTime t = fileInfo.lastModified(); - if( m_timestamp.contains(absFilePath) && m_timestamp[absFilePath] == t ) + if( m_timestamp.tqcontains(absFilePath) && m_timestamp[absFilePath] == t ) continue; -#if QT_VERSION >= 0x030100 - if( pcs.contains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){ -#else - if( pcs.contains(absFilePath) && toTime_t(t) == pcs[absFilePath].first ){ -#endif - stream.device()->at( pcs[absFilePath].second ); + if( pcs.tqcontains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){ + stream.tqdevice()->at( pcs[absFilePath].second ); FileDom file = codeModel()->create<FileModel>(); file->read( stream ); codeModel()->addFile( file ); @@ -630,7 +607,7 @@ void JavaSupportPart::maybeParse( const TQString& fileName ) return; } - TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( path ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( path ); if( it != m_timestamp.end() && *it == t ){ return; } @@ -689,12 +666,12 @@ TQStringList JavaSupportPart::modifiedFileList() TQFileInfo fileInfo( m_projectDirectory, fileName ); - if( !fileExtensions().contains(fileInfo.extension()) ) + if( !fileExtensions().tqcontains(fileInfo.extension()) ) continue; TQDateTime t = fileInfo.lastModified(); TQString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); - TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.find( path ); + TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.tqfind( path ); if( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t ) continue; @@ -792,7 +769,7 @@ void JavaSupportPart::setPcsVersion( int version ) TQString JavaSupportPart::formatTag( const Tag & /*inputTag*/ ) { - return TQString::null; + return TQString(); } void JavaSupportPart::removeWithReferences( const TQString & fileName ) @@ -810,7 +787,7 @@ void JavaSupportPart::removeWithReferences( const TQString & fileName ) bool JavaSupportPart::isValidSource( const TQString& fileName ) const { TQFileInfo fileInfo( fileName ); - return fileExtensions().contains( fileInfo.extension() ) && !TQFile::exists(fileInfo.dirPath(true) + "/.kdev_ignore"); + return fileExtensions().tqcontains( fileInfo.extension() ) && !TQFile::exists(fileInfo.dirPath(true) + "/.kdev_ignore"); } TQString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool shortDescription ) @@ -882,26 +859,22 @@ void JavaSupportPart::saveProjectSourceInfo( ) stream << int( fileList.size() ); for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){ const FileDom dom = (*it); -#if QT_VERSION >= 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() ); + offsets.insert( dom->name(), stream.tqdevice()->at() ); stream << (uint)0; // dummy offset } for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){ const FileDom dom = (*it); - int offset = stream.device()->at(); + int offset = stream.tqdevice()->at(); dom->write( stream ); - int end = stream.device()->at(); + int end = stream.tqdevice()->at(); - stream.device()->at( offsets[dom->name()] ); + stream.tqdevice()->at( offsets[dom->name()] ); stream << offset; - stream.device()->at( end ); + stream.tqdevice()->at( end ); } } diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h index 51230ff8..4b624c80 100644 --- a/languages/java/javasupportpart.h +++ b/languages/java/javasupportpart.h @@ -49,9 +49,10 @@ namespace KTextEditor class JavaSupportPart : public KDevLanguageSupport { Q_OBJECT + TQ_OBJECT public: - JavaSupportPart( TQObject *parent, const char *name, const TQStringList &args ); + JavaSupportPart( TQObject *tqparent, const char *name, const TQStringList &args ); virtual ~JavaSupportPart(); bool isValid() const { return m_valid; } diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index a5beaaf2..f287f70d 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -54,13 +54,13 @@ class ProblemItem: public KListViewItem { 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 ) - : KListViewItem( parent, level, problem, file, line, column ) {} + : KListViewItem( 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 ) - : KListViewItem( parent, level, problem, file, line, column ) {} + : KListViewItem( tqparent, level, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 2 || column == 3 ){ @@ -75,8 +75,8 @@ public: }; -ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const char* name ) - : KListView( parent, name ? name : "problemreporter" ), +ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* tqparent, const char* name ) + : KListView( tqparent, name ? name : "problemreporter" ), m_javaSupport( part ), m_document( 0 ), m_markIface( 0 ) @@ -214,7 +214,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p } TQString msg = p.text(); - msg = msg.replace( TQRegExp("\n"), "" ); + msg = msg.tqreplace( TQRegExp("\n"), "" ); new ProblemItem( this, levelToString( p.level() ), @@ -267,15 +267,15 @@ TQString ProblemReporter::levelToString( int level ) const switch( level ) { case Problem::Level_Error: - return TQString::fromLatin1( "Error" ); + return TQString::tqfromLatin1( "Error" ); case Problem::Level_Warning: - return TQString::fromLatin1( "Warning" ); + return TQString::tqfromLatin1( "Warning" ); case Problem::Level_Todo: - return TQString::fromLatin1( "Todo" ); + return TQString::tqfromLatin1( "Todo" ); case Problem::Level_Fixme: - return TQString::fromLatin1( "Fixme" ); + return TQString::tqfromLatin1( "Fixme" ); default: - return TQString::null; + return TQString(); } } diff --git a/languages/java/problemreporter.h b/languages/java/problemreporter.h index b349b371..4ac7876d 100644 --- a/languages/java/problemreporter.h +++ b/languages/java/problemreporter.h @@ -38,8 +38,9 @@ namespace KTextEditor{ class ProblemReporter: public KListView{ Q_OBJECT + TQ_OBJECT public: - ProblemReporter( JavaSupportPart* part, TQWidget* parent=0, const char* name=0 ); + ProblemReporter( JavaSupportPart* part, TQWidget* tqparent=0, const char* name=0 ); virtual ~ProblemReporter(); void removeAllProblems( const TQString& filename ); |