diff options
| author | Max Dmitrichenko <dmitrmax@gmail.com> | 2017-04-19 17:11:43 -0400 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-04-20 11:24:20 +0000 |
| commit | ba3fbc5adb1b96aea598bc625b038855f17db316 (patch) | |
| tree | 187217670f8a1586461238ce31c7cf728ca5eda2 /ui | |
| parent | 3e755bb0c1b8ad9e466db1d02d76995ce1d39763 (diff) | |
memory leak: Qt code doesn't pass 'parent' argument to some Qt class constructors
found with valgrind
Change-Id: I2d73bd50a6f0e13b1817c8a518189c0e56558f72
Reviewed-on: https://code.wireshark.org/review/21227
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/capture_filter_edit.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/interface_frame.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/capture_filter_edit.cpp b/ui/qt/capture_filter_edit.cpp index 083b1df119..41bc695865 100644 --- a/ui/qt/capture_filter_edit.cpp +++ b/ui/qt/capture_filter_edit.cpp @@ -131,7 +131,7 @@ CaptureFilterEdit::CaptureFilterEdit(QWidget *parent, bool plain) : if (!plain_) { bookmark_button_ = new StockIconToolButton(this, "x-capture-filter-bookmark"); bookmark_button_->setCursor(Qt::ArrowCursor); - bookmark_button_->setMenu(new QMenu()); + bookmark_button_->setMenu(new QMenu(bookmark_button_)); bookmark_button_->setPopupMode(QToolButton::InstantPopup); bookmark_button_->setToolTip(tr("Manage saved bookmarks.")); bookmark_button_->setIconSize(QSize(14, 14)); diff --git a/ui/qt/interface_frame.cpp b/ui/qt/interface_frame.cpp index f382f19f99..cc5def9489 100644 --- a/ui/qt/interface_frame.cpp +++ b/ui/qt/interface_frame.cpp @@ -113,7 +113,7 @@ InterfaceFrame::~InterfaceFrame() QMenu * InterfaceFrame::getSelectionMenu() { - QMenu * contextMenu = new QMenu(); + QMenu * contextMenu = new QMenu(this); QList<int> typesDisplayed = proxyModel->typesDisplayed(); QMap<int, QString>::const_iterator it = ifTypeDescription.constBegin(); |