From 5bc8bdc40e992acd09ea21eff6c6a7d7285c777d Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 22 May 2013 11:49:36 +0000 Subject: [PATCH] More capture_options -> capture_session fixes. svn path=/trunk/; revision=49510 --- ui/qt/main_window.h | 1 + ui/qt/main_window_slots.cpp | 5 +++-- ui/qt/wireshark_application.h | 16 ++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index ff4cc2a5f3..450626a3ca 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -36,6 +36,7 @@ #ifdef HAVE_LIBPCAP #include "capture_opts.h" +#include "capture_session.h" #endif #include diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 60f99aef99..fc4ef1f4dc 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -48,6 +48,7 @@ #include "capture.h" #include "capture-pcap-util.h" #include "capture_ui_utils.h" +#include "capture_session.h" #endif #include "wsutil/file_util.h" @@ -421,11 +422,11 @@ void MainWindow::startCapture() { // main_auto_scroll_live_changed(auto_scroll_live); /* XXX - can this ever happen? */ - if (global_capture_opts.state != CAPTURE_STOPPED) + if (global_capture_session.state != CAPTURE_STOPPED) return; /* close the currently loaded capture file */ - cf_close((capture_file *) global_capture_opts.cf); + cf_close((capture_file *) global_capture_session.cf); /* Copy the selected interfaces to the set of interfaces to use for this capture. */ diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h index 610bb612ed..b9147378da 100644 --- a/ui/qt/wireshark_application.h +++ b/ui/qt/wireshark_application.h @@ -115,14 +115,14 @@ signals: #ifdef HAVE_LIBPCAP // XXX It might make more sense to move these to main.cpp or main_window.cpp or their own class. - void captureCapturePrepared(capture_options *capture_opts); - void captureCaptureUpdateStarted(capture_options *capture_opts); - void captureCaptureUpdateContinue(capture_options *capture_opts); - void captureCaptureUpdateFinished(capture_options *capture_opts); - void captureCaptureFixedStarted(capture_options *capture_opts); - void captureCaptureFixedFinished(capture_options *capture_opts); - void captureCaptureStopping(capture_options *capture_opts); - void captureCaptureFailed(capture_options *capture_opts); + void captureCapturePrepared(capture_session *cap_session); + void captureCaptureUpdateStarted(capture_session *cap_session); + void captureCaptureUpdateContinue(capture_session *cap_session); + void captureCaptureUpdateFinished(capture_session *cap_session); + void captureCaptureFixedStarted(capture_session *cap_session); + void captureCaptureFixedFinished(capture_session *cap_session); + void captureCaptureStopping(capture_session *cap_session); + void captureCaptureFailed(capture_session *cap_session); #endif void captureFileOpened(const capture_file *cf);