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

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

diff --git a/pv/view/header.h b/pv/view/header.h
index 5474f10eb48bcac2461f8d58546605e86d409173..7759652e402d5cbc38b4f760d675a5a8d0359006 100644 (file)
--- a/pv/view/header.h
+++ b/pv/view/header.h
@@ -21,10 +21,8 @@
 #ifndef PULSEVIEW_PV_VIEW_HEADER_H
 #define PULSEVIEW_PV_VIEW_HEADER_H
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 #include <list>
+#include <memory>
 #include <utility>
 
 #include "marginwidget.h"
@@ -47,8 +45,14 @@ public:
 
        QSize sizeHint() const;
 
+       /**
+        * The horizontal offset, relative to the left edge of the widget,
+        * where the arrows of the trace labels end.
+        */
+       static const int BaselineOffset;
+
 private:
-       boost::shared_ptr<pv::view::Trace> get_mouse_over_trace(
+       std::shared_ptr<pv::view::Trace> get_mouse_over_trace(
                const QPoint &pt);
 
        void clear_selection();
@@ -69,14 +73,14 @@ private:
 
        void keyPressEvent(QKeyEvent *e);
 
-private slots:
+private Q_SLOTS:
        void on_signals_changed();
 
        void on_signals_moved();
 
-       void on_trace_text_changed();
+       void on_trace_changed();
 
-signals:
+Q_SIGNALS:
        void signals_moved();
 
 private:
@@ -84,7 +88,7 @@ private:
        QPoint _mouse_down_point;
        bool _dragging;
 
-       std::list<std::pair<boost::weak_ptr<Trace>, int> >
+       std::list<std::pair<std::weak_ptr<Trace>, int> >
                _drag_traces;
 };