Modified header guards to match file names

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

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index dd4097a8d2a7cea131e7d3eea6912a4caead690e..c95fffaf247518454b065ef9775cb5dcab8a2447 100644 (file)
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.cpp
@@ -18,13 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <boost/foreach.hpp>
+#include <cassert>
 
-#include "analog.h"
-#include "analogsnapshot.h"
+#include "analog.hpp"
+#include "analogsegment.hpp"
 
-using namespace boost;
-using namespace std;
+using std::deque;
+using std::max;
+using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace data {
@@ -34,25 +36,31 @@ Analog::Analog() :
 {
 }
 
-void Analog::push_snapshot(shared_ptr<AnalogSnapshot> &snapshot)
+void Analog::push_segment(shared_ptr<AnalogSegment> &segment)
 {
-       _snapshots.push_front(snapshot);
+       segments_.push_front(segment);
 }
 
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+const deque< shared_ptr<AnalogSegment> >& Analog::analog_segments() const
 {
-       return _snapshots;
+       return segments_;
+}
+
+vector< shared_ptr<Segment> > Analog::segments() const
+{
+       return vector< shared_ptr<Segment> >(
+               segments_.begin(), segments_.end());
 }
 
 void Analog::clear()
 {
-       _snapshots.clear();
+       segments_.clear();
 }
 
 uint64_t Analog::get_max_sample_count() const
 {
        uint64_t l = 0;
-       BOOST_FOREACH(const boost::shared_ptr<AnalogSnapshot> s, _snapshots) {
+       for (const std::shared_ptr<AnalogSegment> s : segments_) {
                assert(s);
                l = max(l, s->get_sample_count());
        }