osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Remove global recent_ctx_menu 

Make recent_ctx_menu local to showRecentContextMenu() to avoid
keeping a global pointer which needs to be cleared every time.

Change-Id: Ic3baae4501e00ee753529b1edd5888de5d1e2167
Reviewed-on: https://code.wireshark.org/review/34142
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Stig Bjørlykke 2019-07-31 08:49:44 +02:00 committed by Roland Knall
parent 927afac570
commit cae3bec14e
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/qt/welcome_page.cpp
View File

@ -69,7 +69,6 @@ WelcomePage::WelcomePage(QWidget *parent) :
welcome_ui_->openFrame->hide();
recent_files_->setTextElideMode(Qt::ElideLeft);
recent_ctx_menu_ = new QMenu(this);
welcome_ui_->recentList->setContextMenuPolicy(Qt::CustomContextMenu);
connect(recent_files_, SIGNAL(customContextMenuRequested(QPoint)),
this, SLOT(showRecentContextMenu(QPoint)));
@ -362,25 +361,25 @@ void WelcomePage::showRecentContextMenu(QPoint pos)
QListWidgetItem *li = recent_files_->itemAt(pos);
if (!li) return;
recent_ctx_menu_->clear();
QMenu recent_ctx_menu;
QString cf_path = li->data(Qt::UserRole).toString();
QAction *show_action = recent_ctx_menu_->addAction(show_in_str_);
QAction *show_action = recent_ctx_menu.addAction(show_in_str_);
show_action->setData(cf_path);
connect(show_action, SIGNAL(triggered(bool)), this, SLOT(showRecentFolder()));
QAction *copy_action = recent_ctx_menu_->addAction(tr("Copy file path"));
QAction *copy_action = recent_ctx_menu.addAction(tr("Copy file path"));
copy_action->setData(cf_path);
connect(copy_action, SIGNAL(triggered(bool)), this, SLOT(copyRecentPath()));
recent_ctx_menu_->addSeparator();
recent_ctx_menu.addSeparator();
QAction *remove_action = recent_ctx_menu_->addAction(tr("Remove from list"));
QAction *remove_action = recent_ctx_menu.addAction(tr("Remove from list"));
remove_action->setData(cf_path);
connect(remove_action, SIGNAL(triggered(bool)), this, SLOT(removeRecentPath()));
recent_ctx_menu_->exec(recent_files_->mapToGlobal(pos));
recent_ctx_menu.exec(recent_files_->mapToGlobal(pos));
}
void WelcomePage::showRecentFolder()

3
ui/qt/welcome_page.h
View File

@ -57,9 +57,6 @@ private:
// QListWidget doesn't activate items when the return or enter keys are pressed on macOS.
// We may want to subclass it at some point.
QListWidget *recent_files_;
// MWOverlay *overlay;
QMenu *recent_ctx_menu_;
signals:
void startCapture();