Replaced boost::shared_ptr with std::shared_ptr

[pulseview.git] / pv / view / view.h

diff --git a/pv/view/view.h b/pv/view/view.h
index 6f1e87288bd1dd14f40568f86198ea39f0a3a7bc..83a6fe2d2a4d318288f084920e07f5c3c963e25a 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,14 +23,15 @@
 
 #include <stdint.h>
 
+#include <memory>
+#include <set>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 #include <QAbstractScrollArea>
 #include <QSizeF>
 
+#include <pv/data/signaldata.h>
+
 #include "cursorpair.h"
 
 namespace pv {
@@ -94,9 +95,14 @@ public:
         */
        void set_scale_offset(double scale, double offset);
 
-       std::vector< boost::shared_ptr<Trace> > get_traces() const;
+       std::vector< std::shared_ptr<Trace> > get_traces() const;
+
+       std::list<std::weak_ptr<SelectableItem> > selected_items() const;
+
+       std::set< std::shared_ptr<pv::data::SignalData> >
+               get_visible_data() const;
 
-       std::list<boost::weak_ptr<SelectableItem> > selected_items() const;
+       std::pair<double, double> get_time_extents() const;
 
        /**
         * Returns true if cursors are displayed. false otherwise.
@@ -140,7 +146,13 @@ signals:
 
 private:
        void get_scroll_layout(double &length, double &offset) const;
-       
+
+       /**
+        * Simultaneously sets the zoom and offset.
+        * @param scale The scale to set the view to in seconds per pixel. This
+        * value is clamped between MinScale and MaxScale.
+        * @param offset The offset of the left edge of the view in seconds.
+        */
        void set_zoom(double scale, int offset);
 
        void update_scroll();
@@ -148,8 +160,8 @@ private:
        void update_layout();
 
        static bool compare_trace_v_offsets(
-               const boost::shared_ptr<pv::view::Trace> &a,
-               const boost::shared_ptr<pv::view::Trace> &b);
+               const std::shared_ptr<pv::view::Trace> &a,
+               const std::shared_ptr<pv::view::Trace> &b);
 
 private:
        bool eventFilter(QObject *object, QEvent *event);
@@ -179,8 +191,6 @@ private:
        Ruler *_ruler;
        Header *_header;
 
-       uint64_t _data_length;
-
        /// The view time scale in seconds per pixel.
        double _scale;