summaryrefslogtreecommitdiffstats
path: root/languages/java/JavaStoreWalker.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
commit48d4a26399959121f33d2bc3bfe51c7827b654fc (patch)
tree5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /languages/java/JavaStoreWalker.cpp
parent7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff)
downloadtdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz
tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip
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
Diffstat (limited to 'languages/java/JavaStoreWalker.cpp')
-rw-r--r--languages/java/JavaStoreWalker.cpp26
1 files changed, 13 insertions, 13 deletions
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",