diff options
author | hjk <hjk@qt.io> | 2020-02-03 11:13:27 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-02-04 07:55:01 +0000 |
commit | 36f23df6c32330ecaf2b82002a3a14fb7fb55cc5 (patch) | |
tree | 0ae17c6b82ed045745e42268c8fddd84cb30fe66 /src/plugins/cpptools/cppcodemodelsettingspage.cpp | |
parent | 85d9756c006dd5020fce07194b58157cd35626a2 (diff) | |
download | qt-creator-36f23df6c32330ecaf2b82002a3a14fb7fb55cc5.tar.gz |
CppTools: Use unshared object for CppCodeModelSettings
There's nothing shared here, only ever one copy. Ideally, this
should be const outside CppToolsPlugin, but some settings
are modified directly.
Change-Id: I775b9151a244b3cc44d28bc992a041c42d234a18
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppcodemodelsettingspage.cpp')
-rw-r--r-- | src/plugins/cpptools/cppcodemodelsettingspage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp index cca9f76a64..5b259d7ab5 100644 --- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp +++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp @@ -44,7 +44,7 @@ class CppCodeModelSettingsWidget final : public Core::IOptionsPageWidget Q_DECLARE_TR_FUNCTIONS(CppTools::Internal::CppCodeModelSettingsWidget) public: - CppCodeModelSettingsWidget(const QSharedPointer<CppCodeModelSettings> &s); + CppCodeModelSettingsWidget(CppCodeModelSettings *s); ~CppCodeModelSettingsWidget() override; private: @@ -57,10 +57,10 @@ private: bool applyClangCodeModelWidgetsToSettings() const; Ui::CppCodeModelSettingsPage *m_ui = nullptr; - QSharedPointer<CppCodeModelSettings> m_settings; + CppCodeModelSettings *m_settings = nullptr; }; -CppCodeModelSettingsWidget::CppCodeModelSettingsWidget(const QSharedPointer<CppCodeModelSettings> &s) +CppCodeModelSettingsWidget::CppCodeModelSettingsWidget(CppCodeModelSettings *s) : m_ui(new Ui::CppCodeModelSettingsPage) { m_ui->setupUi(this); @@ -177,7 +177,7 @@ bool CppCodeModelSettingsWidget::applyGeneralWidgetsToSettings() const return settingsChanged; } -CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSettings> &settings) +CppCodeModelSettingsPage::CppCodeModelSettingsPage(CppCodeModelSettings *settings) { setId(Constants::CPP_CODE_MODEL_SETTINGS_ID); setDisplayName(CppCodeModelSettingsWidget::tr("Code Model")); |