From caabb84c559023f179bf2c4600a5ebce34eab081 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Mon, 2 Dec 2013 20:53:18 +0000 Subject: [PATCH] Renamed SignalData::clear_snapshots to clear --- pv/data/analog.cpp | 2 +- pv/data/analog.h | 2 +- pv/data/decoderstack.cpp | 2 +- pv/data/decoderstack.h | 2 +- pv/data/logic.cpp | 2 +- pv/data/logic.h | 2 +- pv/data/signaldata.cpp | 2 +- pv/data/signaldata.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp index fadd5c69..6e2f2db8 100644 --- a/pv/data/analog.cpp +++ b/pv/data/analog.cpp @@ -42,7 +42,7 @@ deque< shared_ptr >& Analog::get_snapshots() return _snapshots; } -void Analog::clear_snapshots() +void Analog::clear() { _snapshots.clear(); } diff --git a/pv/data/analog.h b/pv/data/analog.h index 3a755159..47514ad9 100644 --- a/pv/data/analog.h +++ b/pv/data/analog.h @@ -42,7 +42,7 @@ public: std::deque< boost::shared_ptr >& get_snapshots(); - void clear_snapshots(); + void clear(); private: std::deque< boost::shared_ptr > _snapshots; diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 7bd5e6e6..760d336e 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -141,7 +141,7 @@ void DecoderStack::begin_decode() data); } -void DecoderStack::clear_snapshots() +void DecoderStack::clear() { } diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h index 4de7ae4c..029ca25c 100644 --- a/pv/data/decoderstack.h +++ b/pv/data/decoderstack.h @@ -83,7 +83,7 @@ public: QString error_message(); - void clear_snapshots(); + void clear(); void begin_decode(); diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index c62a2f2e..4317d44d 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -50,7 +50,7 @@ deque< shared_ptr >& Logic::get_snapshots() return _snapshots; } -void Logic::clear_snapshots() +void Logic::clear() { _snapshots.clear(); } diff --git a/pv/data/logic.h b/pv/data/logic.h index 4fe4c42e..739b52e8 100644 --- a/pv/data/logic.h +++ b/pv/data/logic.h @@ -44,7 +44,7 @@ public: std::deque< boost::shared_ptr >& get_snapshots(); - void clear_snapshots(); + void clear(); private: const unsigned int _num_probes; diff --git a/pv/data/signaldata.cpp b/pv/data/signaldata.cpp index 78e5e91d..f7bfe1f0 100644 --- a/pv/data/signaldata.cpp +++ b/pv/data/signaldata.cpp @@ -37,7 +37,7 @@ double SignalData::get_samplerate() const void SignalData::set_samplerate(double samplerate) { _samplerate = samplerate; - clear_snapshots(); + clear(); } double SignalData::get_start_time() const diff --git a/pv/data/signaldata.h b/pv/data/signaldata.h index c5ed6bd3..eb9d14c6 100644 --- a/pv/data/signaldata.h +++ b/pv/data/signaldata.h @@ -37,7 +37,7 @@ public: double get_start_time() const; - virtual void clear_snapshots() = 0; + virtual void clear() = 0; protected: double _start_time; -- 2.30.2