Move capture.[ch] to libui.

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

CMakeLists.txt

@@ -1032,7 +1032,6 @@ set(LIBEPAN_LIBS
 if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
 	set(wireshark_FILES
 		airpcap_loader.c
-		capture.c
 		capture_info.c
 		capture_opts.c
 		color_filters.c

Makefile.common

@@ -66,7 +66,6 @@ SHARK_COMMON_INCLUDES =	\
 WIRESHARK_COMMON_SRC =	\
 	$(SHARK_COMMON_SRC)	\
 	airpcap_loader.c \
-	capture.c	\
 	capture_info.c	\
 	capture_opts.c	\
 	color_filters.c	\
@@ -82,7 +81,6 @@ WIRESHARK_COMMON_SRC =	\
 WIRESHARK_COMMON_INCLUDES =	\
 	airpcap.h	\
 	airpcap_loader.h \
-	capture.h	\
 	capture_info.h	\
 	capture_opts.h	\
 	color_filters.h	\

capchild/capture_sync.c

@@ -84,7 +84,7 @@
 #include "globals.h"
 #include "file.h"
 
-#include "capture.h"
+#include "ui/capture.h"
 #include <capchild/capture_sync.h>
 
 #include "sync_pipe.h"

summary.h

@@ -24,7 +24,7 @@
 #define __SUMMARY_H__
 
 #ifdef HAVE_LIBPCAP
-#include "capture.h"
+#include "ui/capture.h"
 #endif
 
 #ifdef __cplusplus

ui/CMakeLists.txt

@@ -22,6 +22,7 @@
 
 set(COMMON_UI_SRC
 	alert_box.c
+	capture.c
 	capture_ui_utils.c
 	decode_as_utils.c
 	export_object.c

ui/Makefile.common

@@ -43,6 +43,7 @@ GENERATOR_FILES = \
 
 WIRESHARK_UI_SRC = \
 	alert_box.c		\
+	capture.c		\
 	capture_ui_utils.c	\
 	decode_as_utils.c	\
 	export_object.c		\
@@ -73,6 +74,7 @@ WIRESHARK_UI_SRC = \
 
 noinst_HEADERS = \
 	alert_box.h		\
+	capture.h		\
 	capture_globals.h	\
 	capture_ui_utils.h	\
 	decode_as_utils.h	\

ui/capture.c

@@ -37,7 +37,7 @@
 #include <epan/packet.h>
 #include <epan/dfilter/dfilter.h>
 #include "file.h"
-#include "capture.h"
+#include "ui/capture.h"
 #include <capchild/capture_ifinfo.h>
 #include <capchild/capture_sync.h>
 #include "capture_info.h"

ui/gtk/capture_dlg.c

@@ -36,7 +36,7 @@
 #include <epan/prefs.h>
 #include <wsutil/filesystem.h>
 
-#include "../capture.h"
+#include "ui/capture.h"
 #include <capchild/capture_ifinfo.h>
 #include "../capture-pcap-util.h"
 #include "../ringbuffer.h"

ui/gtk/capture_if_details_dlg_win32.c

@@ -36,7 +36,7 @@
 #include <wsutil/str_util.h>
 
 #include "../file.h"
-#include "../capture.h"
+#include "ui/capture.h"
 
 #include "ui/simple_dialog.h"
 

ui/gtk/capture_if_dlg.c

@@ -34,7 +34,7 @@
 #include "../capture_opts.h"
 #include <capchild/capture_session.h>
 #include <capchild/capture_ifinfo.h>
-#include "../capture.h"
+#include "ui/capture.h"
 #include "../capture-pcap-util.h"
 #include "wsutil/file_util.h"
 #include <wiretap/wtap.h>

ui/gtk/capture_info_dlg.c

@@ -30,7 +30,7 @@
 
 #include <epan/packet.h>
 
-#include "../capture.h"
+#include "ui/capture.h"
 #include "../capture_info.h"
 #include "../capture-pcap-util.h"
 

ui/gtk/drag_and_drop.c

@@ -32,7 +32,7 @@
 #include "ui/util.h"
 #include "../file.h"
 #ifdef HAVE_LIBPCAP
-#include "../capture.h"
+#include "ui/capture.h"
 #endif
 
 #ifdef HAVE_LIBPCAP

ui/gtk/main.c

@@ -133,7 +133,7 @@
 #ifdef HAVE_LIBPCAP
 #include "capture-pcap-util.h"
 #include <capchild/capture_ifinfo.h>
-#include "capture.h"
+#include "ui/capture.h"
 #include <capchild/capture_sync.h>
 #endif
 

ui/gtk/main_statusbar.c

@@ -39,7 +39,7 @@
 #ifdef HAVE_LIBPCAP
 #include "../capture_opts.h"
 #include <capchild/capture_session.h>
-#include "../capture.h"
+#include "ui/capture.h"
 #endif
 
 #include <wsutil/str_util.h>

ui/gtk/main_welcome.c

@@ -29,7 +29,7 @@
 
 #include "../color.h"
 #ifdef HAVE_LIBPCAP
-#include "capture.h"
+#include "ui/capture.h"
 #include "capture-pcap-util.h"
 #include "capture_opts.h"
 #endif

ui/gtk/summary_dlg.c

@@ -39,7 +39,7 @@
 #include "../capture-pcap-util.h"
 
 #ifdef HAVE_LIBPCAP
-#include "../capture.h"
+#include "ui/capture.h"
 #include "ui/capture_globals.h"
 #endif
 #include "ui/main_statusbar.h"

ui/qt/QtShark.pro

@@ -188,7 +188,6 @@ win32:INCLUDEPATH += \
 SOURCES_WS_C = \
     ../../airpcap_loader.c \
     ../../capture-pcap-util.c     \
-    ../../capture.c       \
     ../../capture_info.c  \
     ../../capture_opts.c \
     ../../cfile.c \

ui/qt/interface_tree.h

@@ -27,7 +27,7 @@
 #include <glib.h>
 
 #ifdef HAVE_LIBPCAP
-#include "capture.h"
+#include "ui/capture.h"
 #include "capture-pcap-util.h"
 #include "capture_opts.h"
 #include "ui/capture_ui_utils.h"

ui/qt/main.cpp

@@ -108,7 +108,7 @@
 #ifdef HAVE_LIBPCAP
 #  include "capture-pcap-util.h"
 #  include <capchild/capture_ifinfo.h>
-#  include "capture.h"
+#  include "ui/capture.h"
 #  include <capchild/capture_sync.h>
 #endif
 

ui/qt/main_window.cpp

@@ -31,7 +31,7 @@
 //#include <wiretap/wtap.h>
 
 #ifdef HAVE_LIBPCAP
-#include "capture.h"
+#include "ui/capture.h"
 #include "capture-pcap-util.h"
 #include <capchild/capture_session.h>
 #endif

ui/qt/main_window_slots.cpp

@@ -43,7 +43,7 @@
 #endif
 
 #ifdef HAVE_LIBPCAP
-#include "capture.h"
+#include "ui/capture.h"
 #include "capture-pcap-util.h"
 #endif
 

ui/qt/summary_dialog.h

@@ -39,7 +39,7 @@
 #include "summary.h"
 
 #ifdef HAVE_LIBPCAP
-    #include "capture.h"
+    #include "ui/capture.h"
     #include "ui/capture_globals.h"
     #include "capture-pcap-util.h"
 #endif

ui/qt/wireshark_application.cpp

@@ -35,7 +35,7 @@
 
 #include "qt_ui_utils.h"
 
-#include "capture.h"
+#include "ui/capture.h"
 #include "color_filters.h"
 #include "filters.h"
 #include "log.h"