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

6
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -31,7 +31,6 @@
#include "projectinfo.h"
#include "projectpart.h"
#include "projectpartheaderpath.h"
#include "stringtable.h"
#include <cplusplus/cppmodelmanagerbase.h>
#include <coreplugin/find/ifindfilter.h>
@@ -94,8 +93,7 @@ public:
~CppModelManager();
static CppModelManager *instance();
static void createCppModelManager(Internal::CppToolsPlugin *parent,
Internal::StringTable &stringTable);
static void createCppModelManager(Internal::CppToolsPlugin *parent);
// Documented in source file.
enum ProgressNotificationMode {
@@ -273,7 +271,7 @@ private:
ProjectExplorer::Macros internalDefinedMacros() const;
void dumpModelManagerConfiguration(const QString &logFileId);
void initCppTools(Internal::StringTable &stringTable);
void initCppTools();
void resetFilters();
private: