forked from osmocom/wireshark
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>
This commit is contained in:
parent
fe8661a767
commit
df5833723c
|
@ -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
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -38,7 +38,6 @@
|
|||
|
||||
#include <epan/packet.h>
|
||||
#include <epan/prefs.h>
|
||||
#include "capture_ui_utils.h"
|
||||
|
||||
#include "capture_opts.h"
|
||||
#include "ringbuffer.h"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
|
|
4
tshark.c
4
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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"
|
||||
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#include <QSpacerItem>
|
||||
|
||||
#include "capture_ui_utils.h"
|
||||
#include "ui/capture_ui_utils.h"
|
||||
#include "ui/ui_util.h"
|
||||
|
||||
#include <cstdio>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue