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

ext_menubar: Change action name to remove warning 

on_actionExternalMenu_triggered() triggered a warning, as no menu
 exists on the automatic UI configuration.

Change-Id: Ic3dc4c2c9e4c95ec4bbea01bd53af9a8c831e0d7
Reviewed-on: https://code.wireshark.org/review/8276
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Roland Knall 2015-05-03 18:01:29 +02:00 committed by Pascal Quantin
parent 5c14aecced
commit 812d31122a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/main_window.cpp
View File

@ -1866,7 +1866,7 @@ void MainWindow::externalMenuHelper(ext_menu_t * menu, QMenu * subMenu, gint de
itemAction->setData(QVariant::fromValue((void *)item));
itemAction->setText(item->label);
connect(itemAction, SIGNAL(triggered()),
this, SLOT(on_actionExternalMenuItem_triggered()));
this, SLOT(externalMenuItem_triggered()));
}
/* Iterate Loop */

2
ui/qt/main_window.h
View File

@ -457,7 +457,7 @@ private slots:
void on_actionATT_Server_Attributes_triggered();
void on_actionExternalMenuItem_triggered();
void externalMenuItem_triggered();
void changeEvent(QEvent* event);
};

2
ui/qt/main_window_slots.cpp
View File

@ -2901,7 +2901,7 @@ void MainWindow::on_actionCaptureRefreshInterfaces_triggered()
}
#endif
void MainWindow::on_actionExternalMenuItem_triggered()
void MainWindow::externalMenuItem_triggered()
{
QAction * triggerAction = NULL;
QVariant v;