diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-29 22:08:59 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-30 05:09:31 +0000 |
| commit | b33512b704eae1716939cd493ecac85998039f07 (patch) | |
| tree | 1b9f0aedd7ba3b73bd3e66cc4c06f19d63b50b7b /ui | |
| parent | df5833723c41003486eba83aaf6ca41f0c27816b (diff) | |
| download | wireshark-b33512b704eae1716939cd493ecac85998039f07.tar.gz | |
Move capture_session.h to capchild; what it declares is defined there.
Change-Id: I8b1407839390b7ac0b45bf6f583c1a509073f002
Reviewed-on: https://code.wireshark.org/review/2709
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/capture_globals.h | 2 | ||||
| -rw-r--r-- | ui/gtk/capture_if_dlg.c | 2 | ||||
| -rw-r--r-- | ui/gtk/main_80211_toolbar.c | 2 | ||||
| -rw-r--r-- | ui/gtk/main_statusbar.c | 2 | ||||
| -rw-r--r-- | ui/qt/main_window.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/main_window.h | 2 | ||||
| -rw-r--r-- | ui/qt/wireshark_application.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/ui/capture_globals.h b/ui/capture_globals.h index 51c81aa212..d7b9e77542 100644 --- a/ui/capture_globals.h +++ b/ui/capture_globals.h @@ -23,7 +23,7 @@ #ifndef __CAPTURE_GLOBALS_H__ #define __CAPTURE_GLOBALS_H__ -#include "../capture_session.h" +#include <capchild/capture_session.h> #ifdef __cplusplus extern "C" { diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index 5d9302d812..3a6dc27d58 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -32,7 +32,7 @@ #include <epan/to_str.h> #include "../capture_opts.h" -#include "../capture_session.h" +#include <capchild/capture_session.h> #include <capchild/capture_ifinfo.h> #include "../capture.h" #include "../capture-pcap-util.h" diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c index df11100cb2..212c9ffbb4 100644 --- a/ui/gtk/main_80211_toolbar.c +++ b/ui/gtk/main_80211_toolbar.c @@ -46,7 +46,7 @@ #include "ui/gtk/main_80211_toolbar.h" #include "ws80211_utils.h" -#include "capture_session.h" +#include <capchild/capture_session.h> #include <capchild/capture_sync.h> static GtkWidget *tb80211_tb, *tb80211_iface_list_box, *tb80211_freq_list_box, *tb80211_chan_type_box, *tb80211_info_label; diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index 8cdfc18f36..9afaac5199 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -38,7 +38,7 @@ #include "../file.h" #ifdef HAVE_LIBPCAP #include "../capture_opts.h" -#include "../capture_session.h" +#include <capchild/capture_session.h> #include "../capture.h" #endif diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index ca87034192..68f45fdfea 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -33,7 +33,7 @@ #ifdef HAVE_LIBPCAP #include "capture.h" #include "capture-pcap-util.h" -#include "capture_session.h" +#include <capchild/capture_session.h> #endif #include "ui/alert_box.h" diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index 916bbe7d2b..8219c3425a 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -37,7 +37,7 @@ #ifdef HAVE_LIBPCAP #include "capture_opts.h" #endif -#include "capture_session.h" +#include <capchild/capture_session.h> #include <QMainWindow> #include <QSplitter> diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h index 2403555894..0c78055982 100644 --- a/ui/qt/wireshark_application.h +++ b/ui/qt/wireshark_application.h @@ -29,7 +29,7 @@ #include "epan/prefs.h" #include "capture_opts.h" -#include "capture_session.h" +#include <capchild/capture_session.h> #include "file.h" #include "register.h" |