MathSignal: Rename sig_sample() to sample()

[pulseview.git] / pv / data / decodesignal.cpp

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 256c29b8c9f34d65d090ab8a77ca1e4d563d32f3..b6166a4c603dee6a4548b4351a2dad7ed811408b 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -56,8 +56,7 @@ DecodeSignal::DecodeSignal(pv::Session &session) :
        srd_session_(nullptr),
        logic_mux_data_invalid_(false),
        stack_config_changed_(true),
-       current_segment_id_(0),
-       error_message_("")
+       current_segment_id_(0)
 {
        connect(&session_, SIGNAL(capture_state_changed(int)),
                this, SLOT(on_capture_state_changed(int)));
@@ -171,7 +170,7 @@ void DecodeSignal::reset_decode(bool shutting_down)
        logic_mux_data_invalid_ = true;
 
        if (!error_message_.isEmpty()) {
-               error_message_ = QString();
+               error_message_.clear();
                // TODO Emulate noquote()
                qDebug().nospace() << name() << ": Error cleared";
        }
@@ -266,12 +265,6 @@ bool DecodeSignal::is_paused() const
        return decode_paused_;
 }
 
-QString DecodeSignal::error_message() const
-{
-       lock_guard<mutex> lock(output_mutex_);
-       return error_message_;
-}
-
 const vector<decode::DecodeChannel> DecodeSignal::get_channels() const
 {
        return channels_;
@@ -829,13 +822,6 @@ void DecodeSignal::restore_settings(QSettings &settings)
        begin_decode();
 }
 
-void DecodeSignal::set_error_message(QString msg)
-{
-       error_message_ = msg;
-       // TODO Emulate noquote()
-       qDebug().nospace() << name() << ": " << msg;
-}
-
 bool DecodeSignal::all_input_segments_complete(uint32_t segment_id) const
 {
        bool all_complete = true;