From f4ce3e772e3dad5b59f1ab27a6a3c01fdbfb8e1d Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Wed, 30 Nov 2016 08:32:56 +0100 Subject: [PATCH 1/1] MainBar: Correct event handler name --- pv/toolbars/mainbar.cpp | 12 ++++++------ pv/toolbars/mainbar.hpp | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp index e77f18bb..2c64867f 100644 --- a/pv/toolbars/mainbar.cpp +++ b/pv/toolbars/mainbar.cpp @@ -227,7 +227,7 @@ MainBar::MainBar(Session &session, QWidget *parent, // Setup session_ events connect(&session_, SIGNAL(capture_state_changed(int)), - this, SLOT(capture_state_changed(int))); + this, SLOT(on_capture_state_changed(int))); connect(&session, SIGNAL(device_changed()), this, SLOT(on_device_changed())); @@ -561,11 +561,6 @@ void MainBar::show_session_error(const QString text, const QString info_text) msg.exec(); } -void MainBar::capture_state_changed(int state) -{ - set_capture_state((pv::Session::capture_state)state); -} - void MainBar::add_decoder(srd_decoder *decoder) { #ifdef ENABLE_DECODE @@ -715,6 +710,11 @@ void MainBar::on_device_changed() update_device_config_widgets(); } +void MainBar::on_capture_state_changed(int state) +{ + set_capture_state((pv::Session::capture_state)state); +} + void MainBar::on_sample_count_changed() { if (!updating_sample_count_) diff --git a/pv/toolbars/mainbar.hpp b/pv/toolbars/mainbar.hpp index 50c30fd2..a47288c7 100644 --- a/pv/toolbars/mainbar.hpp +++ b/pv/toolbars/mainbar.hpp @@ -125,8 +125,6 @@ private: private Q_SLOTS: void show_session_error(const QString text, const QString info_text); - void capture_state_changed(int state); - void add_decoder(srd_decoder *decoder); void export_file(std::shared_ptr format, @@ -135,6 +133,7 @@ private Q_SLOTS: void on_device_selected(); void on_device_changed(); + void on_capture_state_changed(int state); void on_sample_count_changed(); void on_sample_rate_changed(); -- 2.30.2