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

Fix various leaks relating to use of Core::NavigationView

Browse Source 
Change-Id: I8ba508b279376047bcf7ae17dbdadba70ec13582
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-01-23 12:11:59 +01:00
parent 5fc456dd22
commit 2c295905a9
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/bookmarks/bookmarkmanager.cpp
View File

@@ -216,15 +216,15 @@ BookmarkView::~BookmarkView()
ICore::removeContextObject(m_bookmarkContext); ICore::removeContextObject(m_bookmarkContext);
} }
QList<QToolButton *> BookmarkView::createToolBarWidgets() const QList<QToolButton *> BookmarkView::createToolBarWidgets()
{ {
Command *prevCmd = ActionManager::command(Constants::BOOKMARKS_PREV_ACTION); Command *prevCmd = ActionManager::command(Constants::BOOKMARKS_PREV_ACTION);
Command *nextCmd = ActionManager::command(Constants::BOOKMARKS_NEXT_ACTION); Command *nextCmd = ActionManager::command(Constants::BOOKMARKS_NEXT_ACTION);
QTC_ASSERT(prevCmd && nextCmd, return {}); QTC_ASSERT(prevCmd && nextCmd, return {});
auto prevButton = new QToolButton; auto prevButton = new QToolButton(this);
prevButton->setToolButtonStyle(Qt::ToolButtonIconOnly); prevButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
prevButton->setDefaultAction(prevCmd->action()); prevButton->setDefaultAction(prevCmd->action());
auto nextButton = new QToolButton; auto nextButton = new QToolButton(this);
nextButton->setToolButtonStyle(Qt::ToolButtonIconOnly); nextButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
nextButton->setDefaultAction(nextCmd->action()); nextButton->setDefaultAction(nextCmd->action());
return {prevButton, nextButton}; return {prevButton, nextButton};

2
src/plugins/bookmarks/bookmarkmanager.h
View File

@@ -130,7 +130,7 @@ public:
explicit BookmarkView(BookmarkManager *manager); explicit BookmarkView(BookmarkManager *manager);
~BookmarkView() final; ~BookmarkView() final;
QList<QToolButton *> createToolBarWidgets() const; QList<QToolButton *> createToolBarWidgets();
public slots: public slots:
void gotoBookmark(const QModelIndex &index); void gotoBookmark(const QModelIndex &index);

2
src/plugins/classview/classviewnavigationwidget.cpp
View File

@@ -170,7 +170,7 @@ QList<QToolButton *> NavigationWidget::createToolButtons()
// full projects mode // full projects mode
if (!fullProjectsModeButton) { if (!fullProjectsModeButton) {
// create a button // create a button
fullProjectsModeButton = new QToolButton(); fullProjectsModeButton = new QToolButton(this);
fullProjectsModeButton->setIcon( fullProjectsModeButton->setIcon(
::Utils::CodeModelIcon::iconForType(::Utils::CodeModelIcon::Class)); ::Utils::CodeModelIcon::iconForType(::Utils::CodeModelIcon::Class));
fullProjectsModeButton->setCheckable(true); fullProjectsModeButton->setCheckable(true);

4
src/plugins/projectexplorer/projecttreewidget.cpp
View File

@@ -296,7 +296,7 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) : QWidget(parent)
connect(m_view, &QTreeView::collapsed, connect(m_view, &QTreeView::collapsed,
m_model, &FlatModel::onCollapsed); m_model, &FlatModel::onCollapsed);
m_toggleSync = new QToolButton; m_toggleSync = new QToolButton(this);
m_toggleSync->setIcon(Icons::LINK_TOOLBAR.icon()); m_toggleSync->setIcon(Icons::LINK_TOOLBAR.icon());
m_toggleSync->setCheckable(true); m_toggleSync->setCheckable(true);
m_toggleSync->setChecked(autoSynchronization()); m_toggleSync->setChecked(autoSynchronization());
@@ -610,7 +610,7 @@ NavigationView ProjectTreeWidgetFactory::createWidget()
auto ptw = new ProjectTreeWidget; auto ptw = new ProjectTreeWidget;
n.widget = ptw; n.widget = ptw;
auto filter = new QToolButton; auto filter = new QToolButton(ptw);
filter->setIcon(Icons::FILTER.icon()); filter->setIcon(Icons::FILTER.icon());
filter->setToolTip(tr("Filter Tree")); filter->setToolTip(tr("Filter Tree"));
filter->setPopupMode(QToolButton::InstantPopup); filter->setPopupMode(QToolButton::InstantPopup);

2
src/plugins/texteditor/outlinefactory.cpp
View File

@@ -75,7 +75,7 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) :
addWidget(label); addWidget(label);
m_toggleSync = new QToolButton; m_toggleSync = new QToolButton(this);
m_toggleSync->setIcon(Utils::Icons::LINK_TOOLBAR.icon()); m_toggleSync->setIcon(Utils::Icons::LINK_TOOLBAR.icon());
m_toggleSync->setCheckable(true); m_toggleSync->setCheckable(true);
m_toggleSync->setChecked(true); m_toggleSync->setChecked(true);