feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: remove builtin RefactoringEngine dependency from CppEditor

Browse Source 
Move CppRefactoringEngine to CppTools and builtin member
ownership to model manager.

Change-Id: I3e72308559fd2928229f9f25d4dd09beb3f56c34
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-09-18 11:29:55 +02:00
parent 55a5ffc1ec
commit a959fe59da
13 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -33,6 +33,7 @@
#include "cppindexingsupport.h"
#include "cppmodelmanagersupportinternal.h"
#include "cpprefactoringchanges.h"
#include "cpprefactoringengine.h"
#include "cppsourceprocessor.h"
#include "cpptoolsconstants.h"
#include "cpptoolsplugin.h"
@@ -165,7 +166,8 @@ public:
QTimer m_delayedGcTimer;
// Refactoring
RefactoringEngineInterface *m_refactoringEngine = nullptr;
CppRefactoringEngine m_builtInRefactoringEngine;
RefactoringEngineInterface *m_refactoringEngine { &m_builtInRefactoringEngine };
};
} // namespace Internal
@@ -267,12 +269,15 @@ QString CppModelManager::editorConfigurationFileName()
void CppModelManager::setRefactoringEngine(RefactoringEngineInterface *refactoringEngine)
{
instance()->d->m_refactoringEngine = refactoringEngine;
if (refactoringEngine)
instance()->d->m_refactoringEngine = refactoringEngine;
else
instance()->d->m_refactoringEngine = &instance()->d->m_builtInRefactoringEngine;
}
RefactoringEngineInterface *CppModelManager::refactoringEngine()
RefactoringEngineInterface &CppModelManager::refactoringEngine()
{
return instance()->d->m_refactoringEngine;
return *instance()->d->m_refactoringEngine;
}
FollowSymbolInterface &CppModelManager::followSymbolInterface() const