aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-06-29 22:38:29 -0700
committerGuy Harris <guy@alum.mit.edu>2014-06-30 05:38:57 +0000
commitad1391aa4e0f8610d756dadf9bb21b35d5f00a96 (patch)
tree1af5a13c4a1f340f16736896d50bfcb44b0676ab
parent7d1a93f7fdf93e00b16335acc8f9277bbb25ae8f (diff)
Move capture.[ch] to libui.
Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0 Reviewed-on: https://code.wireshark.org/review/2711 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat
-rw-r--r--CMakeLists.txt1
-rw-r--r--Makefile.common2
-rw-r--r--capchild/capture_sync.c2
-rw-r--r--summary.h2
-rw-r--r--ui/CMakeLists.txt1
-rw-r--r--ui/Makefile.common2
-rw-r--r--ui/capture.c (renamed from capture.c)2
-rw-r--r--ui/capture.h (renamed from capture.h)0
-rw-r--r--ui/gtk/capture_dlg.c2
-rw-r--r--ui/gtk/capture_if_details_dlg_win32.c2
-rw-r--r--ui/gtk/capture_if_dlg.c2
-rw-r--r--ui/gtk/capture_info_dlg.c2
-rw-r--r--ui/gtk/drag_and_drop.c2
-rw-r--r--ui/gtk/main.c2
-rw-r--r--ui/gtk/main_statusbar.c2
-rw-r--r--ui/gtk/main_welcome.c2
-rw-r--r--ui/gtk/summary_dlg.c2
-rw-r--r--ui/qt/QtShark.pro1
-rw-r--r--ui/qt/interface_tree.h2
-rw-r--r--ui/qt/main.cpp2
-rw-r--r--ui/qt/main_window.cpp2
-rw-r--r--ui/qt/main_window_slots.cpp2
-rw-r--r--ui/qt/summary_dialog.h2
-rw-r--r--ui/qt/wireshark_application.cpp2
24 files changed, 21 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fdb51e4e6..163032e1f3 100644
--- a/CMakeLists.txt
+++ b/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
diff --git a/Makefile.common b/Makefile.common
index f8e65a3426..721a18ba20 100644
--- a/Makefile.common
+++ b/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 \
diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index bc5f6c4907..f75ca556f0 100644
--- a/capchild/capture_sync.c
+++ b/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"
diff --git a/summary.h b/summary.h
index 81223b9212..8f63fd417a 100644
--- a/summary.h
+++ b/summary.h
@@ -24,7 +24,7 @@
#define __SUMMARY_H__
#ifdef HAVE_LIBPCAP
-#include "capture.h"
+#include "ui/capture.h"
#endif
#ifdef __cplusplus
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 58a7cd8e2e..6d88733f10 100644
--- a/ui/CMakeLists.txt
+++ b/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
diff --git a/ui/Makefile.common b/ui/Makefile.common
index a8c2e3026e..db016a429e 100644
--- a/ui/Makefile.common
+++ b/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 \
diff --git a/capture.c b/ui/capture.c
index cfac3f3845..9665bcb340 100644
--- a/capture.c
+++ b/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"
diff --git a/capture.h b/ui/capture.h
index 6aaa5035be..6aaa5035be 100644
--- a/capture.h
+++ b/ui/capture.h
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index e2a65ff602..e43d168f68 100644
--- a/ui/gtk/capture_dlg.c
+++ b/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"
diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c
index 788d0e4c41..8c8da75bcd 100644
--- a/ui/gtk/capture_if_details_dlg_win32.c
+++ b/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"
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index 3a6dc27d58..f9db745edc 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/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>
diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c
index d7c946cfcf..497aa7b9f3 100644
--- a/ui/gtk/capture_info_dlg.c
+++ b/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"
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c
index 0cb1514cef..5bc1e82191 100644
--- a/ui/gtk/drag_and_drop.c
+++ b/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
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index c7a4a615db..eea7a13b26 100644
--- a/ui/gtk/main.c
+++ b/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
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index 9afaac5199..c264a8a1ce 100644
--- a/ui/gtk/main_statusbar.c
+++ b/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>
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index 24159f6d99..f87fdb5f44 100644
--- a/ui/gtk/main_welcome.c
+++ b/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
diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
index ef53201528..96094f881e 100644
--- a/ui/gtk/summary_dlg.c
+++ b/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"
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index 5278589966..e852a08a91 100644
--- a/ui/qt/QtShark.pro
+++ b/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 \
diff --git a/ui/qt/interface_tree.h b/ui/qt/interface_tree.h
index e9331d9c4e..d5b15f6a89 100644
--- a/ui/qt/interface_tree.h
+++ b/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"
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 8efba08cb7..c84ba93225 100644
--- a/ui/qt/main.cpp
+++ b/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
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 68f45fdfea..08adb54322 100644
--- a/ui/qt/main_window.cpp
+++ b/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
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 567287cca4..daf4fb54dd 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/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
diff --git a/ui/qt/summary_dialog.h b/ui/qt/summary_dialog.h
index eb9bf689c2..48c6e59217 100644
--- a/ui/qt/summary_dialog.h
+++ b/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
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index d953ede9c3..8d8c493f26 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 19:26:14 +0000