Fixup tap listener registration.

Make sure we run make-tap-reg.py on files that register tap
listeners.  Make sure Qt-specific registration routines start with
register_tap_listener_qt_.

Change-Id: Idca382180f475db71e4d1965a70ae4cc2fa4f9d5
Reviewed-on: https://code.wireshark.org/review/10074
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

ui/qt/CMakeLists.txt

@@ -180,13 +180,14 @@ set(WIRESHARK_QT_SRC
 	column_preferences_frame.cpp
 	column_editor_frame.cpp
 	compiled_filter_output.cpp
+	conversation_dialog.cpp
 	decode_as_dialog.cpp
 	display_filter_combo.cpp
 	display_filter_edit.cpp
 	display_filter_expression_dialog.cpp
 	elided_label.cpp
 	enabled_protocols_dialog.cpp
-	expert_info_dialog.cpp
+	endpoint_dialog.cpp
 	export_dissection_dialog.cpp
 	export_object_dialog.cpp
 	export_pdu_dialog.cpp
@@ -238,9 +239,6 @@ set(WIRESHARK_QT_SRC
 	response_time_delay_dialog.cpp
 	rpc_service_response_time_dialog.cpp
 	rtp_analysis_dialog.cpp
-	rtp_stream_dialog.cpp
-	sctp_all_assocs_dialog.cpp
-	sctp_assoc_analyse_dialog.cpp
 	sctp_chunk_statistics_dialog.cpp
 	sctp_graph_dialog.cpp
 	sctp_graph_arwnd_dialog.cpp
@@ -284,11 +282,13 @@ if(ENABLE_EXTCAP)
 endif()
 
 set(WIRESHARK_QT_TAP_SRC
-	conversation_dialog.cpp
-	endpoint_dialog.cpp
+	expert_info_dialog.cpp
 	funnel_statistics.cpp
 	gsm_map_summary_dialog.cpp
 	io_graph_dialog.cpp
+	rtp_stream_dialog.cpp
+	sctp_all_assocs_dialog.cpp
+	sctp_assoc_analyse_dialog.cpp
 	stats_tree_dialog.cpp
 )
 

ui/qt/Makefile.am

@@ -67,7 +67,7 @@ RUNLEX=$(top_srcdir)/tools/runlex.sh
 
 libqtui_a_SOURCES = \
 	$(WIRESHARK_QT_SRC) \
-	$(WIRESHARK_TAP_SRC) \
+	$(WIRESHARK_QT_TAP_SRC) \
 	$(GENERATED_C_FILES) \
 	$(GENERATED_CPP_FILES) \
 	$(noinst_HEADERS) \

ui/qt/Makefile.common

@@ -405,7 +405,6 @@ WIRESHARK_QT_SRC =	\
 	elided_label.cpp	\
 	enabled_protocols_dialog.cpp	\
 	endpoint_dialog.cpp	\
-	expert_info_dialog.cpp	\
 	export_dissection_dialog.cpp	\
 	export_object_dialog.cpp	\
 	export_pdu_dialog.cpp	\
@@ -421,11 +420,8 @@ WIRESHARK_QT_SRC =	\
 	font_color_preferences_frame.cpp	\
 	funnel_string_dialog.cpp	\
 	funnel_text_dialog.cpp	\
-	funnel_statistics.cpp	\
-	gsm_map_summary_dialog.cpp	\
 	import_text_dialog.cpp	\
 	interface_tree.cpp	\
-	io_graph_dialog.cpp	\
 	label_stack.cpp	\
 	layout_preferences_frame.cpp	\
 	lbm_lbtrm_transport_dialog.cpp	\
@@ -465,9 +461,6 @@ WIRESHARK_QT_SRC =	\
 	response_time_delay_dialog.cpp	\
 	rpc_service_response_time_dialog.cpp	\
 	rtp_analysis_dialog.cpp	\
-	rtp_stream_dialog.cpp	\
-	sctp_all_assocs_dialog.cpp	\
-	sctp_assoc_analyse_dialog.cpp	\
 	sctp_chunk_statistics_dialog.cpp	\
 	sctp_graph_dialog.cpp	\
 	sctp_graph_arwnd_dialog.cpp	\
@@ -480,7 +473,6 @@ WIRESHARK_QT_SRC =	\
 	simple_statistics_dialog.cpp	\
 	sparkline_delegate.cpp	\
 	splash_overlay.cpp	\
-	stats_tree_dialog.cpp	\
 	stock_icon.cpp		\
 	syntax_line_edit.cpp	\
 	tap_parameter_dialog.cpp	\
@@ -494,6 +486,13 @@ WIRESHARK_QT_SRC =	\
 	wireshark_dialog.cpp
 
 WIRESHARK_QT_TAP_SRC =	\
+	expert_info_dialog.cpp	\
+	funnel_statistics.cpp	\
+	gsm_map_summary_dialog.cpp	\
+	io_graph_dialog.cpp	\
+	rtp_stream_dialog.cpp	\
+	sctp_all_assocs_dialog.cpp	\
+	sctp_assoc_analyse_dialog.cpp	\
 	stats_tree_dialog.cpp
 
 noinst_HEADERS =	\

ui/qt/expert_info_dialog.cpp

@@ -575,7 +575,7 @@ static stat_tap_ui expert_info_stat_ui = {
 
 extern "C" {
 void
-register_tap_listener_expert_info(void)
+register_tap_listener_qt_expert_info(void)
 {
     register_stat_tap_ui(&expert_info_stat_ui, NULL);
 }

ui/qt/gsm_map_summary_dialog.cpp

@@ -56,8 +56,6 @@ typedef struct _gsm_map_stat_t {
 
 gsm_map_stat_t gsm_map_stat;
 
-void register_tap_listener_qt_gsm_map_summary(void);
-
 GsmMapSummaryDialog::GsmMapSummaryDialog(QWidget &parent, CaptureFile &capture_file) :
     WiresharkDialog(parent, capture_file),
     ui(new Ui::GsmMapSummaryDialog)
@@ -371,7 +369,7 @@ gsm_map_summary_packet(void *tapdata, packet_info *, epan_dissect_t *, const voi
 }
 
 void
-register_tap_listener_gtk_gsm_map_summary(void)
+register_tap_listener_qt_gsm_map_summary(void)
 {
     GString     *err_p;
 

ui/qt/stats_tree_dialog.cpp

@@ -210,7 +210,7 @@ QByteArray StatsTreeDialog::getTreeAsString(st_format_type format)
 
 extern "C" {
 void
-register_tap_listener_stats_tree_stat(void)
+register_tap_listener_qt_stats_tree_stat(void)
 {
     stats_tree_presentation(NULL,
                 StatsTreeDialog::setupNode,