diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp index 5556122f78c367f464c5a8fc829e3298f050a95a..24300c1d182e2f9372365ac2f4064e99b71b5e37 100644 --- a/src/plugins/cppeditor/cppquickfix.cpp +++ b/src/plugins/cppeditor/cppquickfix.cpp @@ -99,7 +99,7 @@ class RewriteLogicalAndOp: public QuickFixOperation { public: RewriteLogicalAndOp(Document::Ptr doc, const Snapshot &snapshot, CPPEditor *editor) - : QuickFixOperation(doc, snapshot, editor), matcher(doc->translationUnit()), + : QuickFixOperation(doc, snapshot, editor), left(0), right(0), pattern(0) {} @@ -324,7 +324,7 @@ class MoveDeclarationOutOfIfOp: public QuickFixOperation { public: MoveDeclarationOutOfIfOp(Document::Ptr doc, const Snapshot &snapshot, CPPEditor *editor) - : QuickFixOperation(doc, snapshot, editor), matcher(doc->translationUnit()), + : QuickFixOperation(doc, snapshot, editor), condition(0), pattern(0), core(0) {} @@ -389,7 +389,7 @@ class MoveDeclarationOutOfWhileOp: public QuickFixOperation { public: MoveDeclarationOutOfWhileOp(Document::Ptr doc, const Snapshot &snapshot, CPPEditor *editor) - : QuickFixOperation(doc, snapshot, editor), matcher(doc->translationUnit()), + : QuickFixOperation(doc, snapshot, editor), condition(0), pattern(0), core(0) {} diff --git a/src/shared/cplusplus/ASTMatcher.cpp b/src/shared/cplusplus/ASTMatcher.cpp index 3272f0f70a5eba0f21e5d671389885c724146c21..9ded92f8ef98f8d77597c09e49eead70974da247 100644 --- a/src/shared/cplusplus/ASTMatcher.cpp +++ b/src/shared/cplusplus/ASTMatcher.cpp @@ -33,15 +33,12 @@ using namespace CPlusPlus; -ASTMatcher::ASTMatcher(TranslationUnit *translationUnit) : _translationUnit(translationUnit) +ASTMatcher::ASTMatcher() { } ASTMatcher::~ASTMatcher() { } -TranslationUnit *ASTMatcher::translationUnit() const -{ return _translationUnit; } - bool ASTMatcher::match(SimpleSpecifierAST *node, SimpleSpecifierAST *pattern) { (void) node; diff --git a/src/shared/cplusplus/ASTMatcher.h b/src/shared/cplusplus/ASTMatcher.h index bb99454809fadaa5d8857f65373fd4da8a2b0356..f299dc51bbddb88c7c6fb8ff7749ff6fe3858797 100644 --- a/src/shared/cplusplus/ASTMatcher.h +++ b/src/shared/cplusplus/ASTMatcher.h @@ -36,11 +36,9 @@ namespace CPlusPlus { class CPLUSPLUS_EXPORT ASTMatcher { public: - ASTMatcher(TranslationUnit *translationUnit); + ASTMatcher(); virtual ~ASTMatcher(); - TranslationUnit *translationUnit() const; - virtual bool match(AccessDeclarationAST *node, AccessDeclarationAST *pattern); virtual bool match(ArrayAccessAST *node, ArrayAccessAST *pattern); virtual bool match(ArrayDeclaratorAST *node, ArrayDeclaratorAST *pattern); @@ -163,9 +161,6 @@ public: virtual bool match(ObjCDynamicPropertiesDeclarationAST *node, ObjCDynamicPropertiesDeclarationAST *pattern); virtual bool match(ObjCFastEnumerationAST *node, ObjCFastEnumerationAST *pattern); virtual bool match(ObjCSynchronizedStatementAST *node, ObjCSynchronizedStatementAST *pattern); - -private: - TranslationUnit *_translationUnit; }; } // end of namespace CPlusPlus