From d6fa4e2079f3b89549a7307cd21d6f2186555fbb Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 25 Nov 2009 12:10:01 +0100
Subject: [PATCH] Get rid off translationUnit
---
src/plugins/cppeditor/cppquickfix.cpp | 6 +++---
src/shared/cplusplus/ASTMatcher.cpp | 5 +----
src/shared/cplusplus/ASTMatcher.h | 7 +------
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
index 5556122f78c..24300c1d182 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 3272f0f70a5..9ded92f8ef9 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 bb99454809f..f299dc51bbd 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
--
GitLab