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/cpptoolsplugin.h | |
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/cpptoolsplugin.h')
-rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 077fddf56d..25ae97f1c8 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -26,7 +26,6 @@ #pragma once #include "cpptools_global.h" -#include "stringtable.h" #include <projectexplorer/projectexplorer.h> @@ -47,7 +46,7 @@ class CppCodeModelSettings; namespace Internal { struct CppFileSettings; -class CppToolsPluginPluginPrivate; +class CppToolsPluginPrivate; class CppToolsPlugin : public ExtensionSystem::IPlugin { @@ -72,8 +71,6 @@ public: QSharedPointer<CppCodeModelSettings> codeModelSettings() const; - static StringTable &stringTable(); - public slots: void switchHeaderSource(); void switchHeaderSourceInNextSplit(); @@ -180,8 +177,8 @@ private slots: #endif private: - friend class CppToolsPluginPluginPrivate; - CppToolsPluginPluginPrivate *d = nullptr; + friend class CppToolsPluginPrivate; + CppToolsPluginPrivate *d = nullptr; QSharedPointer<CppFileSettings> m_fileSettings; }; |