forked from qt-creator/qt-creator
CppEditor: Don't leak CppCodeStylePreferences
Change-Id: I4414c69cebaeb429c5b6dfea6e6fa97b118e353e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -562,7 +562,7 @@ public:
|
|||||||
CppCodeStyleSettingsPageWidget()
|
CppCodeStyleSettingsPageWidget()
|
||||||
{
|
{
|
||||||
CppCodeStylePreferences *originalCodeStylePreferences = CppToolsSettings::cppCodeStyle();
|
CppCodeStylePreferences *originalCodeStylePreferences = CppToolsSettings::cppCodeStyle();
|
||||||
m_pageCppCodeStylePreferences = new CppCodeStylePreferences();
|
m_pageCppCodeStylePreferences.reset(new CppCodeStylePreferences);
|
||||||
m_pageCppCodeStylePreferences->setDelegatingPool(
|
m_pageCppCodeStylePreferences->setDelegatingPool(
|
||||||
originalCodeStylePreferences->delegatingPool());
|
originalCodeStylePreferences->delegatingPool());
|
||||||
m_pageCppCodeStylePreferences->setCodeStyleSettings(
|
m_pageCppCodeStylePreferences->setCodeStyleSettings(
|
||||||
@@ -573,7 +573,7 @@ public:
|
|||||||
m_pageCppCodeStylePreferences->setId(originalCodeStylePreferences->id());
|
m_pageCppCodeStylePreferences->setId(originalCodeStylePreferences->id());
|
||||||
|
|
||||||
m_codeStyleEditor = TextEditorSettings::codeStyleFactory(CppEditor::Constants::CPP_SETTINGS_ID)
|
m_codeStyleEditor = TextEditorSettings::codeStyleFactory(CppEditor::Constants::CPP_SETTINGS_ID)
|
||||||
->createCodeStyleEditor(m_pageCppCodeStylePreferences);
|
->createCodeStyleEditor(m_pageCppCodeStylePreferences.get());
|
||||||
|
|
||||||
auto hbox = new QVBoxLayout(this);
|
auto hbox = new QVBoxLayout(this);
|
||||||
hbox->addWidget(m_codeStyleEditor);
|
hbox->addWidget(m_codeStyleEditor);
|
||||||
@@ -603,7 +603,7 @@ public:
|
|||||||
m_codeStyleEditor->finish();
|
m_codeStyleEditor->finish();
|
||||||
}
|
}
|
||||||
|
|
||||||
CppCodeStylePreferences *m_pageCppCodeStylePreferences = nullptr;
|
std::unique_ptr<CppCodeStylePreferences> m_pageCppCodeStylePreferences;
|
||||||
CodeStyleEditorWidget *m_codeStyleEditor;
|
CodeStyleEditorWidget *m_codeStyleEditor;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user