X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.h;h=f4e7ef4a6bd832eedc69c78a879f0d4f8cbfa674;hb=eae6e30af53f6b3e42dc5be212c82870078276b0;hp=5474f10eb48bcac2461f8d58546605e86d409173;hpb=d7c0ca4a965c5f9cb2ae9aea584bb2547f4baca1;p=pulseview.git

diff --git a/pv/view/header.h b/pv/view/header.h
index 5474f10..f4e7ef4 100644
--- 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,7 +30,7 @@
 namespace pv {
 namespace view {
 
-class Trace;
+class RowItem;
 class View;
 
 class Header : public MarginWidget
@@ -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::RowItem> get_mouse_over_row_item(
 		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,8 +88,8 @@ private:
 	QPoint _mouse_down_point;
 	bool _dragging;
 
-	std::list<std::pair<boost::weak_ptr<Trace>, int> >
-		_drag_traces;
+	std::list<std::pair<std::weak_ptr<RowItem>, int> >
+		_drag_row_items;
 };
 
 } // namespace view