From 2c295905a9e45b0560cc08b2c49c2971aa0fe4d1 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 23 Jan 2020 12:11:59 +0100 Subject: [PATCH] Fix various leaks relating to use of Core::NavigationView Change-Id: I8ba508b279376047bcf7ae17dbdadba70ec13582 Reviewed-by: Christian Stenger --- src/plugins/bookmarks/bookmarkmanager.cpp | 6 +++--- src/plugins/bookmarks/bookmarkmanager.h | 2 +- src/plugins/classview/classviewnavigationwidget.cpp | 2 +- src/plugins/projectexplorer/projecttreewidget.cpp | 4 ++-- src/plugins/texteditor/outlinefactory.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 89bb911de7e..f4147f02a32 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -216,15 +216,15 @@ BookmarkView::~BookmarkView() ICore::removeContextObject(m_bookmarkContext); } -QList BookmarkView::createToolBarWidgets() const +QList BookmarkView::createToolBarWidgets() { Command *prevCmd = ActionManager::command(Constants::BOOKMARKS_PREV_ACTION); Command *nextCmd = ActionManager::command(Constants::BOOKMARKS_NEXT_ACTION); QTC_ASSERT(prevCmd && nextCmd, return {}); - auto prevButton = new QToolButton; + auto prevButton = new QToolButton(this); prevButton->setToolButtonStyle(Qt::ToolButtonIconOnly); prevButton->setDefaultAction(prevCmd->action()); - auto nextButton = new QToolButton; + auto nextButton = new QToolButton(this); nextButton->setToolButtonStyle(Qt::ToolButtonIconOnly); nextButton->setDefaultAction(nextCmd->action()); return {prevButton, nextButton}; diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h index 24ff63742b4..760dcde693c 100644 --- a/src/plugins/bookmarks/bookmarkmanager.h +++ b/src/plugins/bookmarks/bookmarkmanager.h @@ -130,7 +130,7 @@ public: explicit BookmarkView(BookmarkManager *manager); ~BookmarkView() final; - QList createToolBarWidgets() const; + QList createToolBarWidgets(); public slots: void gotoBookmark(const QModelIndex &index); diff --git a/src/plugins/classview/classviewnavigationwidget.cpp b/src/plugins/classview/classviewnavigationwidget.cpp index 49b21162384..a82402f76bf 100644 --- a/src/plugins/classview/classviewnavigationwidget.cpp +++ b/src/plugins/classview/classviewnavigationwidget.cpp @@ -170,7 +170,7 @@ QList NavigationWidget::createToolButtons() // full projects mode if (!fullProjectsModeButton) { // create a button - fullProjectsModeButton = new QToolButton(); + fullProjectsModeButton = new QToolButton(this); fullProjectsModeButton->setIcon( ::Utils::CodeModelIcon::iconForType(::Utils::CodeModelIcon::Class)); fullProjectsModeButton->setCheckable(true); diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index b3ae5756e7a..d1f937d7c60 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -296,7 +296,7 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) : QWidget(parent) connect(m_view, &QTreeView::collapsed, m_model, &FlatModel::onCollapsed); - m_toggleSync = new QToolButton; + m_toggleSync = new QToolButton(this); m_toggleSync->setIcon(Icons::LINK_TOOLBAR.icon()); m_toggleSync->setCheckable(true); m_toggleSync->setChecked(autoSynchronization()); @@ -610,7 +610,7 @@ NavigationView ProjectTreeWidgetFactory::createWidget() auto ptw = new ProjectTreeWidget; n.widget = ptw; - auto filter = new QToolButton; + auto filter = new QToolButton(ptw); filter->setIcon(Icons::FILTER.icon()); filter->setToolTip(tr("Filter Tree")); filter->setPopupMode(QToolButton::InstantPopup); diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp index 038cd58cab4..e09fa0a5ae1 100644 --- a/src/plugins/texteditor/outlinefactory.cpp +++ b/src/plugins/texteditor/outlinefactory.cpp @@ -75,7 +75,7 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) : addWidget(label); - m_toggleSync = new QToolButton; + m_toggleSync = new QToolButton(this); m_toggleSync->setIcon(Utils::Icons::LINK_TOOLBAR.icon()); m_toggleSync->setCheckable(true); m_toggleSync->setChecked(true);