X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogic.hpp;h=1ca5d3ed3af0f407ca34cb54908d4e6dc01e40e0;hp=e7f7a055da3db150f12f8365edf16af3b7aec59c;hb=e91883bb2d8e1f23078a7cd02bc5a7f4e3c9556c;hpb=7db61e770abd2d1c7eb326a09e35cd4266664c1d diff --git a/pv/data/logic.hpp b/pv/data/logic.hpp index e7f7a055..1ca5d3ed 100644 --- a/pv/data/logic.hpp +++ b/pv/data/logic.hpp @@ -26,12 +26,16 @@ #include +using std::deque; +using std::shared_ptr; +using std::vector; + namespace pv { namespace data { class LogicSegment; -class Logic : public QObject, public SignalData +class Logic : public SignalData { Q_OBJECT @@ -40,13 +44,11 @@ public: unsigned int num_channels() const; - void push_segment( - std::shared_ptr &segment); + void push_segment(shared_ptr &segment); - const std::deque< std::shared_ptr >& - logic_segments() const; + const deque< shared_ptr >& logic_segments() const; - std::vector< std::shared_ptr > segments() const; + vector< shared_ptr > segments() const; void clear(); @@ -63,7 +65,7 @@ Q_SIGNALS: private: const unsigned int num_channels_; - std::deque< std::shared_ptr > segments_; + deque< shared_ptr > segments_; }; } // namespace data