diff options
| author | hjk <hjk@qt.io> | 2018-02-07 13:18:48 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-02-07 13:32:08 +0000 |
| commit | 87543118d5516dba3d1fc111206db5df8dcc5b37 (patch) | |
| tree | 8bd9755da124ef6af466d6ae4a1f9cb813cd1ee6 /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | d5cd95c702a590ab0ccd9678418e3132cc43e350 (diff) | |
| download | qt-creator-87543118d5516dba3d1fc111206db5df8dcc5b37.tar.gz | |
CppTools: Apply 'static' pattern to StringTable
This also fixes a crash on loading (some?) projects introduced
in 577bf7c08a.
Change-Id: Ie35d466fa3b84b183118fe93f55393a4c59755de
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 5ad004b76c..508bf76be4 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -41,10 +41,11 @@ #include "cpprefactoringchanges.h" #include "cpprefactoringengine.h" #include "cppsourceprocessor.h" -#include "cpptoolsconstants.h" #include "cpptoolsplugin.h" +#include "cpptoolsconstants.h" #include "cpptoolsreuse.h" #include "editordocumenthandle.h" +#include "stringtable.h" #include "symbolfinder.h" #include "symbolsfindfilter.h" #include "followsymbolinterface.h" @@ -442,16 +443,15 @@ void CppModelManager::resetFilters() setCurrentDocumentFilter(); } -void CppModelManager::createCppModelManager(Internal::CppToolsPlugin *parent, - Internal::StringTable &stringTable) +void CppModelManager::createCppModelManager(Internal::CppToolsPlugin *parent) { QTC_ASSERT(!m_instance, return;); m_instance = new CppModelManager(); - m_instance->initCppTools(stringTable); + m_instance->initCppTools(); m_instance->setParent(parent); } -void CppModelManager::initCppTools(Internal::StringTable &stringTable) +void CppModelManager::initCppTools() { // Objects connect(Core::VcsManager::instance(), &Core::VcsManager::repositoryChanged, @@ -477,7 +477,7 @@ void CppModelManager::initCppTools(Internal::StringTable &stringTable) setFunctionsFilter(std::make_unique<CppFunctionsFilter>(&d->m_locatorData)); setSymbolsFindFilter(std::make_unique<SymbolsFindFilter>(this)); setCurrentDocumentFilter( - std::make_unique<Internal::CppCurrentDocumentFilter>(this, stringTable)); + std::make_unique<Internal::CppCurrentDocumentFilter>(this)); } void CppModelManager::initializeBuiltinModelManagerSupport() |