feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove unnecessary removeContextObject calls

Browse Source 
They are removed on deletion now.

Change-Id: I08461ea4938e24ab450df013a0f8f820032381da
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-05-26 14:48:38 +02:00
parent 7b5481f75c
commit e5bb7d1ffe
24 changed files with 46 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -77,16 +77,12 @@ class DescriptionEditorWidget : public TextEditorWidget
Q_OBJECT
public:
DescriptionEditorWidget(QWidget *parent = nullptr);
~DescriptionEditorWidget() override;
QSize sizeHint() const override;
protected:
void setDisplaySettings(const DisplaySettings &ds) override;
void setMarginSettings(const MarginSettings &ms) override;
private:
Core::IContext *m_context;
};
DescriptionEditorWidget::DescriptionEditorWidget(QWidget *parent)
@@ -107,19 +103,14 @@ DescriptionEditorWidget::DescriptionEditorWidget(QWidget *parent)
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
m_context = new Core::IContext(this);
m_context->setWidget(this);
m_context->setContext(Core::Context(Constants::C_DIFF_EDITOR_DESCRIPTION));
Core::ICore::addContextObject(m_context);
auto context = new Core::IContext(this);
context->setWidget(this);
context->setContext(Core::Context(Constants::C_DIFF_EDITOR_DESCRIPTION));
Core::ICore::addContextObject(context);
textDocument()->setSyntaxHighlighter(new SyntaxHighlighter);
}
DescriptionEditorWidget::~DescriptionEditorWidget()
{
Core::ICore::removeContextObject(m_context);
}
QSize DescriptionEditorWidget::sizeHint() const
{
QSize size = TextEditorWidget::sizeHint();