Qt: Add a CaptureFile class.

Wrap the capture_file struct in a QObject which translates cf_cb_* and
capture_cb_* events into signals. Move the global cfile to
capture_file.cpp.

Don't use a void pointer for the capture file struct.

Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a
Reviewed-on: https://code.wireshark.org/review/5885
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/capchild/capture_session.h b/capchild/capture_session.h
index 951b51e499..06cfb88902 100644
--- a/capchild/capture_session.h
+++ b/capchild/capture_session.h
@@ -41,10 +41,12 @@ typedef enum {
     CAPTURE_RUNNING         /**< capture child signalled ok, capture is running now */
 } capture_state;
 
+struct _capture_file;
+
 /*
  * State of a capture session.
  */
-typedef struct {
+typedef struct _capture_session {
     int fork_child;                 /**< If not -1, in parent, process ID of child */
     int fork_child_status;          /**< Child exit status */
 #ifdef _WIN32
@@ -57,15 +59,15 @@ typedef struct {
 #endif
     gboolean session_started;
     capture_options *capture_opts;  /**< options for this capture */
-    void *cf;                       /**< handle to cfile (note: untyped handle) */
+    struct _capture_file *cf;       /**< handle to cfile */
 } capture_session;
 
 extern void
-capture_session_init(capture_session *cap_session, void *cf);
+capture_session_init(capture_session *cap_session, struct _capture_file *cf);
 #else
 
 /* dummy is needed because clang throws the error: empty struct has size 0 in C, size 1 in C++ */
-typedef struct {int dummy;} capture_session;
+typedef struct _capture_session {int dummy;} capture_session;
 
 #endif /* HAVE_LIBPCAP */