diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:26 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:26 +0000 |
| commit | c4e8a3222648fcf22ca207f1815ebbf7cd144eeb (patch) | |
| tree | 93d5c6aa93d9987680dd1adad5685e2ad698f223 /ui/qt/capture_file.cpp | |
| parent | Adding upstream version 4.2.6. (diff) | |
| download | wireshark-upstream.tar.xz wireshark-upstream.zip | |
Adding upstream version 4.4.0.upstream/4.4.0upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ui/qt/capture_file.cpp')
| -rw-r--r-- | ui/qt/capture_file.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/qt/capture_file.cpp b/ui/qt/capture_file.cpp index 0fd088b9..5de2c9d4 100644 --- a/ui/qt/capture_file.cpp +++ b/ui/qt/capture_file.cpp @@ -85,9 +85,9 @@ CaptureFile::CaptureFile(QObject *parent, capture_file *cap_file) : file_state_(QString()) { #ifdef HAVE_LIBPCAP - capture_callback_add(captureCallback, (gpointer) this); + capture_callback_add(captureCallback, (void *) this); #endif - cf_callback_add(captureFileCallback, (gpointer) this); + cf_callback_add(captureFileCallback, (void *) this); } CaptureFile::~CaptureFile() @@ -239,7 +239,7 @@ capture_file *CaptureFile::globalCapFile() return &cfile; } -gpointer CaptureFile::window() +void *CaptureFile::window() { if (cap_file_) return cap_file_->window; return NULL; @@ -250,7 +250,7 @@ void CaptureFile::setCaptureStopFlag(bool stop_flag) if (cap_file_) cap_file_->stop_flag = stop_flag; } -void CaptureFile::captureFileCallback(gint event, gpointer data, gpointer user_data) +void CaptureFile::captureFileCallback(int event, void *data, void *user_data) { CaptureFile *capture_file = static_cast<CaptureFile *>(user_data); if (!capture_file) return; @@ -259,7 +259,7 @@ void CaptureFile::captureFileCallback(gint event, gpointer data, gpointer user_d } #ifdef HAVE_LIBPCAP -void CaptureFile::captureCallback(gint event, capture_session *cap_session, gpointer user_data) +void CaptureFile::captureCallback(int event, capture_session *cap_session, void *user_data) { CaptureFile *capture_file = static_cast<CaptureFile *>(user_data); if (!capture_file) return; @@ -268,7 +268,7 @@ void CaptureFile::captureCallback(gint event, capture_session *cap_session, gpoi } #endif -void CaptureFile::captureFileEvent(int event, gpointer data) +void CaptureFile::captureFileEvent(int event, void *data) { switch(event) { case(cf_cb_file_opened): |