X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=4eb255a2da7a0ec131df8daf6ea6286df8442074;hb=b42d25c43e52c900cbdd3e5cde0282961b8721e7;hp=dd0ad6ca9a2c0c9e2b3b66fb4867e9f55c028d30;hpb=149e359e48ede480f3734cfc5c04bd1399d0d4be;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index dd0ad6ca..4eb255a2 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,12 +23,10 @@
 
 #include <stdint.h>
 
-#include <utility>
-
 #include <QAbstractScrollArea>
 #include <QSizeF>
 
-#include "cursor.h"
+#include "cursorpair.h"
 
 namespace pv {
 
@@ -101,7 +99,7 @@ public:
 	/**
 	 * Returns a reference to the pair of cursors.
 	 */
-	std::pair<Cursor, Cursor>& cursors();
+	CursorPair& cursors();
 
 	const QPoint& hover_point() const;
 
@@ -128,7 +126,7 @@ private:
 
 private slots:
 
-	void h_scroll_moved(int value);
+	void h_scroll_value_changed(int value);
 	void v_scroll_value_changed(int value);
 
 	void signals_changed();
@@ -154,9 +152,10 @@ private:
 	double _offset;
 
 	int _v_offset;
+	bool _updating_scroll;
 
 	bool _show_cursors;
-	std::pair<Cursor, Cursor> _cursors;
+	CursorPair _cursors;
 
 	QPoint _hover_point;
 };