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 22e8e4dbd2c3dbba58908d6a7a7a1208339bdfb0..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"
@@ -32,18 +30,29 @@
 namespace pv {
 namespace view {
 
-class Signal;
+class Trace;
 class View;
 
 class Header : public MarginWidget
 {
        Q_OBJECT
 
+private:
+       static const int Padding;
+
 public:
        Header(View &parent);
 
+       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::Signal> get_mouse_over_signal(
+       std::shared_ptr<pv::view::Trace> get_mouse_over_trace(
                const QPoint &pt);
 
        void clear_selection();
@@ -62,28 +71,25 @@ private:
 
        void contextMenuEvent(QContextMenuEvent *event);
 
-private slots:
-       void on_signals_changed();
-
-       void on_action_set_name_triggered();
+       void keyPressEvent(QKeyEvent *e);
 
-       void on_action_set_colour_triggered();
+private Q_SLOTS:
+       void on_signals_changed();
 
        void on_signals_moved();
 
-signals:
+       void on_trace_changed();
+
+Q_SIGNALS:
        void signals_moved();
 
 private:
        QPoint _mouse_point;
        QPoint _mouse_down_point;
+       bool _dragging;
 
-       std::list<std::pair<boost::weak_ptr<Signal>, int> >
-               _drag_sigs;
-
-       boost::shared_ptr<Signal> _context_signal;
-       QAction *_action_set_name;
-       QAction *_action_set_colour;
+       std::list<std::pair<std::weak_ptr<Trace>, int> >
+               _drag_traces;
 };
 
 } // namespace view