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

CppTools: Apply 'static' pattern to StringTable

Browse Source 
This also fixes a crash on loading (some?) projects introduced
in 577bf7c08a.

Change-Id: Ie35d466fa3b84b183118fe93f55393a4c59755de
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
hjk
2018-02-07 13:18:48 +01:00
parent d5cd95c702
commit 87543118d5
13 changed files with 97 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()