View: Replace compare_trace_v_offsets with a lambda

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

diff --git a/pv/view/view.h b/pv/view/view.h
index 06616376c96045447dcd81af766bf236f1d1e0a0..6e097a4d68c11b4ba3e31df41e16f5a9d98a4dfc 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,12 +23,10 @@
 
 #include <stdint.h>
 
+#include <memory>
 #include <set>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 #include <QAbstractScrollArea>
 #include <QSizeF>
 
@@ -42,6 +40,7 @@ class SigSession;
 
 namespace view {
 
+class CursorHeader;
 class Header;
 class Ruler;
 class Trace;
@@ -71,6 +70,10 @@ public:
        SigSession& session();
        const SigSession& session() const;
 
+       Viewport* viewport();
+
+       const Viewport* viewport() const;
+
        /**
         * Returns the view time scale in seconds per pixel.
         */
@@ -97,11 +100,11 @@ 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<boost::weak_ptr<SelectableItem> > selected_items() const;
+       std::list<std::weak_ptr<SelectableItem> > selected_items() const;
 
-       std::set< boost::shared_ptr<pv::data::SignalData> >
+       std::set< std::shared_ptr<pv::data::SignalData> >
                get_visible_data() const;
 
        std::pair<double, double> get_time_extents() const;
@@ -137,7 +140,7 @@ public:
 
        void update_viewport();
 
-signals:
+Q_SIGNALS:
        void hover_point_changed();
 
        void signals_moved();
@@ -161,10 +164,6 @@ 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);
-
 private:
        bool eventFilter(QObject *object, QEvent *event);
 
@@ -172,7 +171,7 @@ private:
 
        void resizeEvent(QResizeEvent *e);
 
-private slots:
+private Q_SLOTS:
 
        void h_scroll_value_changed(int value);
        void v_scroll_value_changed(int value);
@@ -186,11 +185,14 @@ private slots:
 
        void on_geometry_updated();
 
+       void on_hover_point_changed();
+
 private:
        SigSession &_session;
 
        Viewport *_viewport;
        Ruler *_ruler;
+       CursorHeader *_cursorheader;
        Header *_header;
 
        /// The view time scale in seconds per pixel.