diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-06-24 15:17:25 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-26 06:10:51 +0000 |
| commit | 60cdee9e307c15928a542adc547f27fd752c4837 (patch) | |
| tree | d08558060606dcae8fd10049d3e5f7769678acce /ui/qt/main_window.cpp | |
| parent | 291762d0af8cd49a19c6fc73fce317ee20816a17 (diff) | |
| download | wireshark-60cdee9e307c15928a542adc547f27fd752c4837.tar.gz | |
Qt: Handle unhandled filter actions.
Handle FilterAction::ActionColorize and ::ActionFind. Remove
::ActionConversation since it was unused. Assert when we encounter a
missing FilterAction, similar to what we do in other parts of the code.
Bug: 12363
Change-Id: I5c1ecd488e5bdb9700a80fc70ec7c047311054b6
Reviewed-on: https://code.wireshark.org/review/16131
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/main_window.cpp')
| -rw-r--r-- | ui/qt/main_window.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 2c3853b422..78f062a2b3 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1874,14 +1874,14 @@ void MainWindow::initConversationMenus() conv_action->setColorNumber(i++); submenu->addAction(conv_action); connect(this, SIGNAL(packetInfoChanged(_packet_info*)), conv_action, SLOT(setPacketInfo(_packet_info*))); - connect(conv_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter())); + connect(conv_action, SIGNAL(triggered()), this, SLOT(colorizeActionTriggered())); } conv_action = new ConversationAction(submenu, conv_filter); conv_action->setText(main_ui_->actionViewColorizeNewColoringRule->text()); submenu->addAction(conv_action); connect(this, SIGNAL(packetInfoChanged(_packet_info*)), conv_action, SLOT(setPacketInfo(_packet_info*))); - connect(conv_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter())); + connect(conv_action, SIGNAL(triggered()), this, SLOT(colorizeActionTriggered())); // Proto tree conversation menu is filled in in ProtoTree::contextMenuEvent. // We should probably do that here. @@ -1897,14 +1897,14 @@ void MainWindow::initConversationMenus() colorize_action->setColorNumber(i++); proto_tree_->colorizeMenu()->addAction(colorize_action); connect(this, SIGNAL(fieldFilterChanged(QByteArray)), colorize_action, SLOT(setFieldFilter(QByteArray))); - connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter())); + connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeActionTriggered())); } colorize_action = new ColorizeAction(proto_tree_->colorizeMenu()); colorize_action->setText(main_ui_->actionViewColorizeNewColoringRule->text()); proto_tree_->colorizeMenu()->addAction(colorize_action); connect(this, SIGNAL(fieldFilterChanged(QByteArray)), colorize_action, SLOT(setFieldFilter(QByteArray))); - connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeWithFilter())); + connect(colorize_action, SIGNAL(triggered()), this, SLOT(colorizeActionTriggered())); } // Titlebar |