From 99a2774ca6f1cab334de5d43fe36fc44ae889a4c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 12 Jun 2011 01:36:19 +0000 Subject: TQt4 convert kdesdk This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- poxml/antlr/src/ASTFactory.cpp | 6 +++--- poxml/antlr/src/BaseAST.cpp | 10 +++++----- poxml/antlr/src/CharScanner.cpp | 2 +- poxml/antlr/src/Makefile.am | 2 +- poxml/antlr/src/TokenStreamBasicFilter.cpp | 4 ++-- poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'poxml/antlr/src') diff --git a/poxml/antlr/src/ASTFactory.cpp b/poxml/antlr/src/ASTFactory.cpp index e44386f7..66902522 100644 --- a/poxml/antlr/src/ASTFactory.cpp +++ b/poxml/antlr/src/ASTFactory.cpp @@ -144,7 +144,7 @@ RefAST ASTFactory::dupList(RefAST t) RefAST ASTFactory::dupTree(RefAST t) { RefAST result = dup(t); // make copy of root - // copy all children of root. + // copy all tqchildren of root. if (t) { result->setFirstChild( dupList(t->getFirstChild()) ); } @@ -152,7 +152,7 @@ RefAST ASTFactory::dupTree(RefAST t) } /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null children nodes correctly. + * a simple list not a tree. Handles null tqchildren nodes correctly. * For example, build(a, b, null, c) yields tree (a b c). build(null,a,b) * yields tree (nil a b). */ @@ -165,7 +165,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector nodes) if (root) { root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set } - // link in children; + // link in tqchildren; for (unsigned int i=1; iequalsTree(target)) ) { v.push_back(sibling); } - // regardless of match or not, check any children for matches + // regardless of match or not, check any tqchildren for matches if ( sibling->getFirstChild() ) { RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch); } @@ -96,7 +96,7 @@ bool BaseAST::equalsList(RefAST t) const // as a quick optimization, check roots first. if (!sibling->equals(t)) return false; - // if roots match, do full list match test on children. + // if roots match, do full list match test on tqchildren. if (sibling->getFirstChild()) { if (!sibling->getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -129,7 +129,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const // as a quick optimization, check roots first. if (!sibling->equals(sub)) return false; - // if roots match, do partial list match test on children. + // if roots match, do partial list match test on tqchildren. if (sibling->getFirstChild()) if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -151,7 +151,7 @@ bool BaseAST::equalsTree(RefAST t) const // check roots first if (!equals(t)) return false; - // if roots match, do full list match test on children. + // if roots match, do full list match test on tqchildren. if (getFirstChild()) { if (!getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -175,7 +175,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const // check roots first if (!equals(sub)) return false; - // if roots match, do full list partial match test on children. + // if roots match, do full list partial match test on tqchildren. if (getFirstChild()) if (!getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; diff --git a/poxml/antlr/src/CharScanner.cpp b/poxml/antlr/src/CharScanner.cpp index ff40138d..93080338 100644 --- a/poxml/antlr/src/CharScanner.cpp +++ b/poxml/antlr/src/CharScanner.cpp @@ -55,7 +55,7 @@ ANTLR_C_USING(exit) ANTLR_C_USING(tolower) #ifdef ANTLR_REALLY_NO_STRCASECMP -// Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior +// Aptqparently, neither strcasecmp nor stricmp is standard, and Codewarrior // on the mac has neither... inline int strcasecmp(const char *s1, const char *s2) { diff --git a/poxml/antlr/src/Makefile.am b/poxml/antlr/src/Makefile.am index 7a5d2426..99008d3b 100644 --- a/poxml/antlr/src/Makefile.am +++ b/poxml/antlr/src/Makefile.am @@ -1,6 +1,6 @@ # Make #include work.. -INCLUDES=-I$(srcdir)/.. +INCLUDES=-I$(srcdir)/.. $(all_includes) KDE_CXXFLAGS = $(USE_EXCEPTIONS) noinst_LTLIBRARIES = libantlr.la diff --git a/poxml/antlr/src/TokenStreamBasicFilter.cpp b/poxml/antlr/src/TokenStreamBasicFilter.cpp index 71257f46..82922967 100644 --- a/poxml/antlr/src/TokenStreamBasicFilter.cpp +++ b/poxml/antlr/src/TokenStreamBasicFilter.cpp @@ -16,9 +16,9 @@ void TokenStreamBasicFilter::discard(int ttype) discardMask.add(ttype); } -void TokenStreamBasicFilter::discard(const BitSet& mask) +void TokenStreamBasicFilter::discard(const BitSet& tqmask) { - discardMask = mask; + discardMask = tqmask; } RefToken TokenStreamBasicFilter::nextToken() diff --git a/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp b/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp index 827ca382..5325fed2 100644 --- a/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp +++ b/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp @@ -86,9 +86,9 @@ void TokenStreamHiddenTokenFilter::hide(int m) hideMask.add(m); } -void TokenStreamHiddenTokenFilter::hide(const BitSet& mask) +void TokenStreamHiddenTokenFilter::hide(const BitSet& tqmask) { - hideMask = mask; + hideMask = tqmask; } RefToken TokenStreamHiddenTokenFilter::LA(int i) -- cgit v1.2.1