diff options
| author | Mikael Kanstrup <mikael.kanstrup@gmail.com> | 2017-09-17 23:48:12 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-09-20 05:48:06 +0000 |
| commit | a17bbc184170cf2faf4752f63f4dce0bba9e0dd5 (patch) | |
| tree | c7767db8e7e7dff8378a4527c98cad97541ba70e /ui/qt/packet_list.cpp | |
| parent | 3ce30eb1fd395251696c4cbf42b52cfd5b150404 (diff) | |
qt: Fix some leaked menu objects
Calling QPushButton.setMenu and QMenu.addMenu does not transfer ownership
of the menu. Fix some leaks by letting "receiving" object act parent
for the menu object.
Bug: 14071
Change-Id: Id4edaf895503ef5dd4597eac99c2cdd6ad09b2ff
Reviewed-on: https://code.wireshark.org/review/23600
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/packet_list.cpp')
| -rw-r--r-- | ui/qt/packet_list.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index a05fe67b18..f3a60a40d4 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -281,7 +281,7 @@ PacketList::PacketList(QWidget *parent) : ctx_menu_.addSeparator(); main_menu_item = window()->findChild<QMenu *>("menuApplyAsFilter"); - submenu = new QMenu(main_menu_item->title()); + submenu = new QMenu(main_menu_item->title(), &ctx_menu_); ctx_menu_.addMenu(submenu); submenu->addAction(window()->findChild<QAction *>("actionAnalyzeAAFSelected")); submenu->addAction(window()->findChild<QAction *>("actionAnalyzeAAFNotSelected")); @@ -291,7 +291,7 @@ PacketList::PacketList(QWidget *parent) : submenu->addAction(window()->findChild<QAction *>("actionAnalyzeAAFOrNotSelected")); main_menu_item = window()->findChild<QMenu *>("menuPrepareAFilter"); - submenu = new QMenu(main_menu_item->title()); + submenu = new QMenu(main_menu_item->title(), &ctx_menu_); ctx_menu_.addMenu(submenu); submenu->addAction(window()->findChild<QAction *>("actionAnalyzePAFSelected")); submenu->addAction(window()->findChild<QAction *>("actionAnalyzePAFNotSelected")); @@ -313,14 +313,14 @@ PacketList::PacketList(QWidget *parent) : ctx_menu_.addMenu(&colorize_menu_); main_menu_item = window()->findChild<QMenu *>("menuSCTP"); - submenu = new QMenu(main_menu_item->title()); + submenu = new QMenu(main_menu_item->title(), &ctx_menu_); ctx_menu_.addMenu(submenu); submenu->addAction(window()->findChild<QAction *>("actionSCTPAnalyseThisAssociation")); submenu->addAction(window()->findChild<QAction *>("actionSCTPShowAllAssociations")); submenu->addAction(window()->findChild<QAction *>("actionSCTPFilterThisAssociation")); main_menu_item = window()->findChild<QMenu *>("menuFollow"); - submenu = new QMenu(main_menu_item->title()); + submenu = new QMenu(main_menu_item->title(), &ctx_menu_); ctx_menu_.addMenu(submenu); submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTCPStream")); submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowUDPStream")); @@ -330,7 +330,7 @@ PacketList::PacketList(QWidget *parent) : ctx_menu_.addSeparator(); main_menu_item = window()->findChild<QMenu *>("menuEditCopy"); - submenu = new QMenu(main_menu_item->title()); + submenu = new QMenu(main_menu_item->title(), &ctx_menu_); ctx_menu_.addMenu(submenu); action = submenu->addAction(tr("Summary as Text")); |