projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
decodetrace.cpp: Drop unused "using std::all_of".
[pulseview.git]
/
pv
/
data
/
logic.hpp
diff --git
a/pv/data/logic.hpp
b/pv/data/logic.hpp
index e7f7a055da3db150f12f8365edf16af3b7aec59c..d11e0cca67677b5a833ef66fb9390ed4237a406e 100644
(file)
--- a/
pv/data/logic.hpp
+++ b/
pv/data/logic.hpp
@@
-26,12
+26,16
@@
#include <QObject>
#include <QObject>
+using std::deque;
+using std::shared_ptr;
+using std::vector;
+
namespace pv {
namespace data {
class LogicSegment;
namespace pv {
namespace data {
class LogicSegment;
-class Logic : public
QObject, public
SignalData
+class Logic : public SignalData
{
Q_OBJECT
{
Q_OBJECT
@@
-40,13
+44,13
@@
public:
unsigned int num_channels() const;
unsigned int num_channels() const;
- void push_segment(
- std::shared_ptr<LogicSegment> &segment);
+ void push_segment(shared_ptr<LogicSegment> &segment);
+
+ const deque< shared_ptr<LogicSegment> >& logic_segments() const;
- const std::deque< std::shared_ptr<LogicSegment> >&
- logic_segments() const;
+ vector< shared_ptr<Segment> > segments() const;
-
std::vector< std::shared_ptr<Segment> > segments
() const;
+
uint32_t get_segment_count
() const;
void clear();
void clear();
@@
-63,7
+67,7
@@
Q_SIGNALS:
private:
const unsigned int num_channels_;
private:
const unsigned int num_channels_;
-
std::deque< std::
shared_ptr<LogicSegment> > segments_;
+
deque<
shared_ptr<LogicSegment> > segments_;
};
} // namespace data
};
} // namespace data