URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9ba9cd83a4f72339b15aebbc1fbdde32f08ef3bc
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
9ba9cd8 by Gerald Combs (gerald@xxxxxxxxxxxxx):
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@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 2bb8255 Consolidate RTP stream structs.
adds 9ba9cd8 Qt: Add a CaptureFile class.
Summary of changes:
capchild/capture_ifinfo.c | 5 +-
capchild/capture_session.h | 10 +-
capchild/capture_sync.c | 2 +-
echld/dispatcher.c | 2 +-
file.c | 4 +-
file.h | 20 +++-
tshark.c | 2 +-
ui/capture.c | 4 +-
ui/capture.h | 4 +-
ui/gtk/main.c | 2 +-
ui/qt/CMakeLists.txt | 2 +
ui/qt/Makefile.common | 2 +
ui/qt/Wireshark.pro | 2 +
ui/qt/capture_file.cpp | 212 +++++++++++++++++++++++++++++++++++
ui/qt/capture_file.h | 92 +++++++++++++++
ui/qt/main.cpp | 36 +-----
ui/qt/main_window.cpp | 149 +++++++++++++------------
ui/qt/main_window.h | 28 ++---
ui/qt/main_window_slots.cpp | 234 +++++++++++++++++++--------------------
ui/qt/wireshark_application.cpp | 115 ++-----------------
ui/qt/wireshark_application.h | 10 +-
21 files changed, 567 insertions(+), 370 deletions(-)
create mode 100644 ui/qt/capture_file.cpp
create mode 100644 ui/qt/capture_file.h