Move capture_ui_utils.[ch] to libui.

Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a
Reviewed-on: https://code.wireshark.org/review/2708
Reviewed-by: Guy Harris <guy@alum.mit.edu>

27 files changed, 39 insertions, 29 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e2cabf322..2fdb51e4e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -924,7 +924,6 @@ set(SHARK_COMMON_SRC
 # sources common for wireshark and tshark, but not rawshark;
 # these are for programs that capture traffic by running dumpcap
 set(SHARK_COMMON_CAPTURE_SRC
-	capture_ui_utils.c
 )
 
 set(TSHARK_TAP_SRC
diff --git a/Makefile.common b/Makefile.common
index 97e3cef31a..9f97930338 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -64,13 +64,11 @@ SHARK_COMMON_INCLUDES =	\
 
 # sources common for wireshark and tshark, but not rawshark;
 # these are for programs that capture traffic by running dumpcap
-SHARK_COMMON_CAPTURE_SRC =	\
-	capture_ui_utils.c
+SHARK_COMMON_CAPTURE_SRC =
 
 # corresponding headers
 SHARK_COMMON_CAPTURE_INCLUDES =	\
-	capture_session.h	\
-	capture_ui_utils.h
+	capture_session.h
 
 # wireshark specifics
 WIRESHARK_COMMON_SRC =	\
diff --git a/airpcap_loader.c b/airpcap_loader.c
index 9ea83395d1..69acffe094 100644
--- a/airpcap_loader.c
+++ b/airpcap_loader.c
@@ -44,9 +44,9 @@
 #include <epan/crypt/airpdcap_ws.h>
 #include <epan/strutil.h>
 #include <epan/frequency-utils.h>
-#include "capture_ui_utils.h"
 #include <wsutil/file_util.h>
 
+#include "ui/capture_ui_utils.h"
 #include "ui/simple_dialog.h"
 
 #include <airpcap.h>
diff --git a/capture.c b/capture.c
index ada780b177..cfac3f3845 100644
--- a/capture.c
+++ b/capture.c
@@ -41,7 +41,7 @@
 #include <capchild/capture_ifinfo.h>
 #include <capchild/capture_sync.h>
 #include "capture_info.h"
-#include "capture_ui_utils.h"
+#include "ui/capture_ui_utils.h"
 #include "ui/util.h"
 #include "capture-pcap-util.h"
 #include <epan/prefs.h>
diff --git a/capture_opts.c b/capture_opts.c
index d9ec2d3e93..0f2f1f8037 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -38,7 +38,6 @@
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include "capture_ui_utils.h"
 
 #include "capture_opts.h"
 #include "ringbuffer.h"
diff --git a/rawshark.c b/rawshark.c
index 13d8d24b78..0f860b4157 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -84,12 +84,14 @@
 #include <epan/column.h>
 #include <epan/print.h>
 #include <epan/addr_resolv.h>
+#ifdef HAVE_LIBPCAP
+#include "ui/capture_ui_utils.h"
+#endif
 #include "ui/util.h"
 #include "version_info.h"
 #include "register.h"
 #include "conditions.h"
 #include "capture_stop_conditions.h"
-#include "capture_ui_utils.h"
 #include <epan/epan_dissect.h>
 #include <epan/stat_cmd_args.h>
 #include <epan/timestamp.h>
diff --git a/summary.c b/summary.c
index ec9999896e..dd492d62e0 100644
--- a/summary.c
+++ b/summary.c
@@ -27,8 +27,8 @@
 #include <epan/packet.h>
 #include "cfile.h"
 #include "summary.h"
-#ifdef HAVE_LIBPCAP
-#include "capture_ui_utils.h"
+#if 0
+#include "ui/capture_ui_utils.h"
 #endif
 
 
diff --git a/tshark.c b/tshark.c
index 2be3e8b81b..4ad15a57a7 100644
--- a/tshark.c
+++ b/tshark.c
@@ -89,6 +89,9 @@
 #include <epan/column.h>
 #include <epan/print.h>
 #include <epan/addr_resolv.h>
+#ifdef HAVE_LIBPCAP
+#include "ui/capture_ui_utils.h"
+#endif
 #include "ui/util.h"
 #include "ui/ui_util.h"
 #include "version_info.h"
@@ -102,7 +105,6 @@
 #include "capture_opts.h"
 
 #ifdef HAVE_LIBPCAP
-#include "capture_ui_utils.h"
 #include <capchild/capture_ifinfo.h>
 #include "capture-pcap-util.h"
 #ifdef _WIN32
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 79b093b55a..58a7cd8e2e 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -22,6 +22,7 @@
 
 set(COMMON_UI_SRC
 	alert_box.c
+	capture_ui_utils.c
 	decode_as_utils.c
 	export_object.c
 	export_object_dicom.c
diff --git a/ui/Makefile.common b/ui/Makefile.common
index 3e1f209a33..a8c2e3026e 100644
--- a/ui/Makefile.common
+++ b/ui/Makefile.common
@@ -43,6 +43,7 @@ GENERATOR_FILES = \
 
 WIRESHARK_UI_SRC = \
 	alert_box.c		\
+	capture_ui_utils.c	\
 	decode_as_utils.c	\
 	export_object.c		\
 	export_object_dicom.c	\
@@ -73,6 +74,7 @@ WIRESHARK_UI_SRC = \
 noinst_HEADERS = \
 	alert_box.h		\
 	capture_globals.h	\
+	capture_ui_utils.h	\
 	decode_as_utils.h	\
 	export_object.h		\
 	last_open_dir.h		\
diff --git a/capture_ui_utils.c b/ui/capture_ui_utils.c
index 56e46aef6b..ae192fdf03 100644
--- a/capture_ui_utils.c
+++ b/ui/capture_ui_utils.c
@@ -33,7 +33,7 @@
 #include "epan/prefs.h"
 #include "epan/ex-opt.h"
 #include <capchild/capture_ifinfo.h>
-#include "capture_ui_utils.h"
+#include "ui/capture_ui_utils.h"
 #include "wiretap/wtap.h"
 #include "epan/to_str.h"
 
diff --git a/capture_ui_utils.h b/ui/capture_ui_utils.h
index fd2a4e4b1e..fd2a4e4b1e 100644
--- a/capture_ui_utils.h
+++ b/ui/capture_ui_utils.h
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index dcaf302f2c..e2a65ff602 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -39,9 +39,9 @@
 #include "../capture.h"
 #include <capchild/capture_ifinfo.h>
 #include "../capture-pcap-util.h"
-#include "../capture_ui_utils.h"
 #include "../ringbuffer.h"
 
+#include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 #include "ui/preference_utils.h"
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index 306e2ab64e..5d9302d812 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -36,10 +36,10 @@
 #include <capchild/capture_ifinfo.h>
 #include "../capture.h"
 #include "../capture-pcap-util.h"
-#include "../capture_ui_utils.h"
 #include "wsutil/file_util.h"
 #include <wiretap/wtap.h>
 
+#include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/recent.h"
 #include "ui/simple_dialog.h"
diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c
index 16cde28839..d7c946cfcf 100644
--- a/ui/gtk/capture_info_dlg.c
+++ b/ui/gtk/capture_info_dlg.c
@@ -32,9 +32,10 @@
 
 #include "../capture.h"
 #include "../capture_info.h"
-#include "../capture_ui_utils.h"
 #include "../capture-pcap-util.h"
 
+#include "ui/capture_ui_utils.h"
+
 #include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/main.h"
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index ff5bf274b3..c7a4a615db 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -123,6 +123,7 @@
 #include "ui/ui_util.h"
 
 #ifdef HAVE_LIBPCAP
+#include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 #endif
@@ -130,7 +131,6 @@
 #include "codecs/codecs.h"
 
 #ifdef HAVE_LIBPCAP
-#include "capture_ui_utils.h"
 #include "capture-pcap-util.h"
 #include <capchild/capture_ifinfo.h>
 #include "capture.h"
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index a76d03470c..8cdfc18f36 100644
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@@ -39,7 +39,6 @@
 #ifdef HAVE_LIBPCAP
 #include "../capture_opts.h"
 #include "../capture_session.h"
-#include "../capture_ui_utils.h"
 #include "../capture.h"
 #endif
 
@@ -48,6 +47,9 @@
 #include "ui/main_statusbar.h"
 #include "ui/recent.h"
 #include "ui/utf8_entities.h"
+#ifdef HAVE_LIBPCAP
+#include "ui/capture_ui_utils.h"
+#endif
 
 #include "ui/gtk/main.h"
 #include "ui/gtk/main_statusbar_private.h"
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index ca34a12230..24159f6d99 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -32,7 +32,6 @@
 #include "capture.h"
 #include "capture-pcap-util.h"
 #include "capture_opts.h"
-#include "capture_ui_utils.h"
 #endif
 
 #include <wsutil/file_util.h>
@@ -40,6 +39,7 @@
 #include <wsutil/ws_version_info.h>
 
 #ifdef HAVE_LIBPCAP
+#include "ui/capture_ui_utils.h"
 #include "ui/iface_lists.h"
 #include "ui/capture_globals.h"
 #endif
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c
index 703afd9c98..d92b4a15fb 100644
--- a/ui/gtk/prefs_capture.c
+++ b/ui/gtk/prefs_capture.c
@@ -31,7 +31,7 @@
 
 #include "capture_opts.h"
 #include <capchild/capture_ifinfo.h>
-#include "capture_ui_utils.h"
+#include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 #include "ui/simple_dialog.h"
diff --git a/ui/iface_lists.c b/ui/iface_lists.c
index 3667c87eab..26702fc184 100644
--- a/ui/iface_lists.c
+++ b/ui/iface_lists.c
@@ -32,8 +32,7 @@
 #include <epan/prefs.h>
 #include <epan/to_str.h>
 
-#include "../capture_ui_utils.h"
-
+#include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 #include "../log.h"
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index dd3033039c..5278589966 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -191,7 +191,6 @@ SOURCES_WS_C = \
     ../../capture.c       \
     ../../capture_info.c  \
     ../../capture_opts.c \
-    ../../capture_ui_utils.c \
     ../../cfile.c \
     ../../color_filters.c \
     ../../file.c  \
diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp
index b7259d032a..4146354dbf 100644
--- a/ui/qt/capture_interfaces_dialog.cpp
+++ b/ui/qt/capture_interfaces_dialog.cpp
@@ -35,7 +35,7 @@
 #include <QTimer>
 #include <QMessageBox>
 
-#include "capture_ui_utils.h"
+#include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/iface_lists.h"
 
diff --git a/ui/qt/capture_preferences_frame.cpp b/ui/qt/capture_preferences_frame.cpp
index dd3a3417ea..5aea33ff84 100644
--- a/ui/qt/capture_preferences_frame.cpp
+++ b/ui/qt/capture_preferences_frame.cpp
@@ -28,7 +28,7 @@
 
 #include <QSpacerItem>
 
-#include "capture_ui_utils.h"
+#include "ui/capture_ui_utils.h"
 #include "ui/ui_util.h"
 
 #include <cstdio>
diff --git a/ui/qt/interface_tree.h b/ui/qt/interface_tree.h
index 6a63590221..e9331d9c4e 100644
--- a/ui/qt/interface_tree.h
+++ b/ui/qt/interface_tree.h
@@ -30,7 +30,7 @@
 #include "capture.h"
 #include "capture-pcap-util.h"
 #include "capture_opts.h"
-#include "capture_ui_utils.h"
+#include "ui/capture_ui_utils.h"
 #endif
 
 #include <QTreeWidget>
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index ef4704bc4f..8efba08cb7 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -95,6 +95,9 @@
 
 #include "ui/alert_box.h"
 #include "ui/capture_globals.h"
+#ifdef HAVE_LIBPCAP
+#  include "ui/capture_ui_utils.h"
+#endif
 #include "ui/iface_lists.h"
 #include "ui/main_statusbar.h"
 #include "ui/persfilepath_opt.h"
@@ -103,7 +106,6 @@
 #include "ui/ui_util.h"
 
 #ifdef HAVE_LIBPCAP
-#  include "capture_ui_utils.h"
 #  include "capture-pcap-util.h"
 #  include <capchild/capture_ifinfo.h>
 #  include "capture.h"
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 3dc1efbf79..ca87034192 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -33,11 +33,13 @@
 #ifdef HAVE_LIBPCAP
 #include "capture.h"
 #include "capture-pcap-util.h"
-#include "capture_ui_utils.h"
 #include "capture_session.h"
 #endif
 
 #include "ui/alert_box.h"
+#ifdef HAVE_LIBPCAP
+#include "ui/capture_ui_utils.h"
+#endif
 #include "ui/capture_globals.h"
 #include "ui/main_statusbar.h"
 #include "ui/recent.h"
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 69f5d61f1a..567287cca4 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -45,7 +45,6 @@
 #ifdef HAVE_LIBPCAP
 #include "capture.h"
 #include "capture-pcap-util.h"
-#include "capture_ui_utils.h"
 #endif
 
 #include "wsutil/file_util.h"
@@ -56,6 +55,9 @@
 #include <epan/value_string.h>
 
 #include "ui/alert_box.h"
+#ifdef HAVE_LIBPCAP
+#include "ui/capture_ui_utils.h"
+#endif
 #include "ui/ui_util.h"
 #include "ui/capture_globals.h"
 #include "ui/help_url.h"