Don't use Qt-defined keywords, they can cause problems with other headers.

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

diff --git a/pv/view/view.h b/pv/view/view.h
index 06616376c96045447dcd81af766bf236f1d1e0a0..021767dba6a197ea551effd1f6068da2c3c0e20c 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;
@@ -97,11 +96,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 +136,7 @@ public:
 
        void update_viewport();
 
-signals:
+Q_SIGNALS:
        void hover_point_changed();
 
        void signals_moved();
@@ -162,8 +161,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);
@@ -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);
@@ -191,6 +190,7 @@ private:
 
        Viewport *_viewport;
        Ruler *_ruler;
+       CursorHeader *_cursorheader;
        Header *_header;
 
        /// The view time scale in seconds per pixel.