diff --git a/ui/qt/capture_event.h b/ui/qt/capture_event.h new file mode 100644 index 0000000000..609041da96 --- /dev/null +++ b/ui/qt/capture_event.h @@ -0,0 +1,81 @@ +/* capture_event.h + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef CAPTURE_EVENT_H +#define CAPTURE_EVENT_H + +#include + +typedef struct _capture_session capture_session; + +struct _packet_info; + +class CaptureEvent +{ +public: + enum Context { +#ifdef HAVE_LIBPCAP + Capture = 0x0001, + Update = 0x0100 | Capture, + Fixed = 0x0200 | Capture, +#endif + File = 0x0002, + Reload = 0x0100 | File, + Rescan = 0x0200 | File, + Save = 0x0400 | File, + Retap = 0x0800 | File, + Merge = 0x1000 | File + }; + + enum EventType { + Opened = 0x0001, + Started = 0x0002, + Finished = 0x0004, + Closing = 0x0008, + Closed = 0x0010, + Failed = 0x0020, + Stopped = 0x0040, + Flushed = 0x0080, + Prepared = 0x0100, + Continued = 0x0200, + Stopping = 0x0400 + }; + + CaptureEvent(Context ctx, EventType evt); + CaptureEvent(Context ctx, EventType evt, QString file); + CaptureEvent(Context ctx, EventType evt, capture_session * session); + + CaptureEvent(const CaptureEvent &ce); + + Context captureContext() const; + EventType eventType() const; + QString filePath() const; + capture_session * capSession() const; + +private: + Context _ctx; + EventType _evt; + QString _filePath; + capture_session * _session; +}; + +#endif // CAPTURE_EVENT_H + +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/qt/capture_file.h b/ui/qt/capture_file.h index cf5e367edb..34971a8630 100644 --- a/ui/qt/capture_file.h +++ b/ui/qt/capture_file.h @@ -10,67 +10,13 @@ #define CAPTURE_FILE_H #include -#include #include #include #include "cfile.h" - -typedef struct _capture_session capture_session; - -struct _packet_info; - -class CaptureEvent -{ - -public: - enum Context { -#ifdef HAVE_LIBPCAP - Capture = 0x0001, - Update = 0x0100 | Capture, - Fixed = 0x0200 | Capture, -#endif - File = 0x0002, - Reload = 0x0100 | File, - Rescan = 0x0200 | File, - Save = 0x0400 | File, - Retap = 0x0800 | File, - Merge = 0x1000 | File - }; - - enum EventType { - Opened = 0x0001, - Started = 0x0002, - Finished = 0x0004, - Closing = 0x0008, - Closed = 0x0010, - Failed = 0x0020, - Stopped = 0x0040, - Flushed = 0x0080, - Prepared = 0x0100, - Continued = 0x0200, - Stopping = 0x0400 - }; - - CaptureEvent(Context ctx, EventType evt); - CaptureEvent(Context ctx, EventType evt, QString file); - CaptureEvent(Context ctx, EventType evt, capture_session * session); - - CaptureEvent(const CaptureEvent &ce); - - Context captureContext() const; - EventType eventType() const; - QString filePath() const; - capture_session * capSession() const; - -private: - Context _ctx; - EventType _evt; - QString _filePath; - capture_session * _session; -}; +#include "capture_event.h" class CaptureFile : public QObject { diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h index 55db153fc9..82e6955c56 100644 --- a/ui/qt/wireshark_application.h +++ b/ui/qt/wireshark_application.h @@ -25,13 +25,13 @@ #include #include +#include "capture_event.h" + struct _e_prefs; class QAction; class QSocketNotifier; -class CaptureEvent; - // Recent items: // - Read from prefs // - Add from open file