diff options
| author | Gerald Combs <gerald@zing.org> | 2015-02-12 20:13:09 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-13 04:22:02 +0000 |
| commit | f0b4b721589b77ca12488cc4df11a54268afd0fb (patch) | |
| tree | c67164b71cf19ddd45fd8fbdd6ae6196f517c863 /ui/qt/main_status_bar.cpp | |
| parent | 80342e43e8e781d75161dab9730839a03cb97763 (diff) | |
| download | wireshark-f0b4b721589b77ca12488cc4df11a54268afd0fb.tar.gz | |
Qt: Revert g6e88978 for main_status_bar.
It made some slot signatures unusable.
Change-Id: I0f7cdad9e84a5ffb2bdfe4042ac93b3ea19b4893
Reviewed-on: https://code.wireshark.org/review/7095
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_status_bar.cpp')
| -rw-r--r-- | ui/qt/main_status_bar.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp index 79fd769d25..725015a6db 100644 --- a/ui/qt/main_status_bar.cpp +++ b/ui/qt/main_status_bar.cpp @@ -25,8 +25,6 @@ #include "file.h" -#include "capchild/capture_session.h" - #include "epan/expert.h" #include "wsutil/filesystem.h" @@ -43,6 +41,7 @@ #include "tango_colors.h" + // XXX - The GTK+ code assigns priorities to these and pushes/pops accordingly. enum StatusContext { @@ -225,7 +224,7 @@ void MainStatusBar::expertUpdate() { expert_status_.show(); } -void MainStatusBar::setCaptureFile(_capture_file *cf) +void MainStatusBar::setCaptureFile(capture_file *cf) { cap_file_ = cf; comment_label_.setEnabled(cap_file_ != NULL); @@ -316,7 +315,7 @@ void MainStatusBar::popProfileStatus() { profile_status_.popText(STATUS_CTX_MAIN); } -void MainStatusBar::updateCaptureStatistics(struct _capture_session *cap_session) +void MainStatusBar::updateCaptureStatistics(capture_session *cap_session _U_) { QString packets_str; |