From 30f3d524411445c26418c757ac9deb0940afc409 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 6 Aug 2014 10:07:42 -0700 Subject: Qt: Refactor ConversationDialog for endpoints. Create a TrafficTableDialog (for lack of a better name) parent class from the general parts of ConversationDialog. Use it to create EndpointsDialog. Move the contents of conversation_tree_widget.{cpp,h} to conversation_dialog.{cpp,h} to match endpoint_dialog and traffic_table_dialog. Fill in GeoIP columns dynamically instead of using a hard-coded limit. Use "endp_" and "ENDP_" prefixes for a lot of endpoint variables and defines. Try to make geoip_db_lookup_ipv4 and geoip_db_lookup_ipv6 more robust. Clean up some includes. Fix a shadowed variable. Change-Id: I23054816ac7f8c6edb3b1f01c8536db37ba4122d Reviewed-on: https://code.wireshark.org/review/3462 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- ui/qt/filter_action.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ui/qt/filter_action.h') diff --git a/ui/qt/filter_action.h b/ui/qt/filter_action.h index b1ccff0ec6..ae7afd2341 100644 --- a/ui/qt/filter_action.h +++ b/ui/qt/filter_action.h @@ -65,7 +65,8 @@ public: ActionDirectionAnyFromB }; - explicit FilterAction(QObject *parent = 0, Action action = ActionApply, ActionType type = ActionTypePlain, ActionDirection direction = ActionDirectionAToFromB); + explicit FilterAction(QObject *parent, Action action, ActionType type, ActionDirection direction); + explicit FilterAction(QObject *parent, Action action, ActionType type); Action action() { return action_; } static const QList actions(); -- cgit v1.2.3