SignalBase: Always hook into signal data, not just for analog

[pulseview.git] / pv / data / logic.hpp

diff --git a/pv/data/logic.hpp b/pv/data/logic.hpp
index e7f7a055da3db150f12f8365edf16af3b7aec59c..1ca5d3ed3af0f407ca34cb54908d4e6dc01e40e0 100644 (file)
--- a/pv/data/logic.hpp
+++ b/pv/data/logic.hpp
@@ -26,12 +26,16 @@
 
 #include <QObject>
 
+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<LogicSegment> &segment);
+       void push_segment(shared_ptr<LogicSegment> &segment);
 
-       const std::deque< std::shared_ptr<LogicSegment> >&
-               logic_segments() const;
+       const deque< shared_ptr<LogicSegment> >& logic_segments() const;
 
-       std::vector< std::shared_ptr<Segment> > segments() const;
+       vector< shared_ptr<Segment> > segments() const;
 
        void clear();
 
@@ -63,7 +65,7 @@ Q_SIGNALS:
 
 private:
        const unsigned int num_channels_;
-       std::deque< std::shared_ptr<LogicSegment> > segments_;
+       deque< shared_ptr<LogicSegment> > segments_;
 };
 
 } // namespace data