From 87543118d5516dba3d1fc111206db5df8dcc5b37 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 7 Feb 2018 13:18:48 +0100
Subject: 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>
---
 src/plugins/cpptools/cppmodelmanager.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/plugins/cpptools/cppmodelmanager.cpp')

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()
-- 
cgit v1.2.1