aboutsummaryrefslogtreecommitdiffstats
path: root/ui/Makefile.common
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-08-06 10:07:42 -0700
committerGerald Combs <gerald@wireshark.org>2014-09-05 01:06:53 +0000
commit30f3d524411445c26418c757ac9deb0940afc409 (patch)
treed60cadae8fdfb0612ee6e00bc5f17b550534af29 /ui/Makefile.common
parent382815d6bdd9a66421ae2e07c734df4c8a4ac398 (diff)
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 <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/Makefile.common')
-rw-r--r--ui/Makefile.common4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/Makefile.common b/ui/Makefile.common
index e36980afc2..bcfb54e9f1 100644
--- a/ui/Makefile.common
+++ b/ui/Makefile.common
@@ -45,7 +45,6 @@ WIRESHARK_UI_SRC = \
alert_box.c \
capture.c \
capture_ui_utils.c \
- conversation_ui.c \
decode_as_utils.c \
export_object.c \
export_object_dicom.c \
@@ -73,6 +72,7 @@ WIRESHARK_UI_SRC = \
tap-tcp-stream.c \
text_import.c \
time_shift.c \
+ traffic_table_ui.c \
util.c
noinst_HEADERS = \
@@ -80,7 +80,6 @@ noinst_HEADERS = \
capture.h \
capture_globals.h \
capture_ui_utils.h \
- conversation_ui.h \
decode_as_utils.h \
export_object.h \
last_open_dir.h \
@@ -113,6 +112,7 @@ noinst_HEADERS = \
text_import.h \
text_import_scanner.h \
time_shift.h \
+ traffic_table_ui.h \
ui_util.h \
utf8_entities.h \
util.h