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

9
src/plugins/cpptools/cpptoolsplugin.h
View File

@@ -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;
};