From dbc788a4185728d45b56530b6b8afaa7d71687a4 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 19 Sep 2023 02:25:35 +0800 Subject: [PATCH] cabana: fix QMenu leak (#29956) fix qmenu leak old-commit-hash: a450eff89f87670aacf7702925a41eedc8b1a234 --- tools/cabana/messageswidget.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/cabana/messageswidget.cc b/tools/cabana/messageswidget.cc index 6a3d11cda1..626f9875da 100644 --- a/tools/cabana/messageswidget.cc +++ b/tools/cabana/messageswidget.cc @@ -424,7 +424,7 @@ void MessageView::updateBytesSectionSize() { } void MessageView::headerContextMenuEvent(const QPoint &pos) { - QMenu *menu = new QMenu(this); + QMenu menu(this); int cur_index = header()->logicalIndexAt(pos); QAction *action; @@ -434,9 +434,9 @@ void MessageView::headerContextMenuEvent(const QPoint &pos) { // Hide show action if (header()->isSectionHidden(logical_index)) { - action = menu->addAction(tr("  %1").arg(column_name), [=]() { header()->showSection(logical_index); }); + action = menu.addAction(tr("  %1").arg(column_name), [=]() { header()->showSection(logical_index); }); } else { - action = menu->addAction(tr("✓ %1").arg(column_name), [=]() { header()->hideSection(logical_index); }); + action = menu.addAction(tr("✓ %1").arg(column_name), [=]() { header()->hideSection(logical_index); }); } // Can't hide the name column @@ -450,7 +450,7 @@ void MessageView::headerContextMenuEvent(const QPoint &pos) { } } - menu->popup(header()->mapToGlobal(pos)); + menu.exec(header()->mapToGlobal(pos)); } MessageViewHeader::MessageViewHeader(QWidget *parent) : QHeaderView(Qt::Horizontal, parent) {