X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftimemarker.hpp;h=327a498ffe964295d876eb6ea40d38ddb50557f4;hp=1a2abb3251e7bc3a8a3caa6e4d63b150141ecffd;hb=710c2a1896fbac968c82f2d1257aaabd10a48cc8;hpb=1373fec59223e7511078abe3dbf4a6b61b4af234

diff --git a/pv/views/trace/timemarker.hpp b/pv/views/trace/timemarker.hpp
index 1a2abb32..327a498f 100644
--- a/pv/views/trace/timemarker.hpp
+++ b/pv/views/trace/timemarker.hpp
@@ -56,16 +56,16 @@ protected:
 	/**
 	 * Constructor.
 	 * @param view A reference to the view that owns this marker.
-	 * @param colour A reference to the colour of this cursor.
+	 * @param color A reference to the color of this cursor.
 	 * @param time The time to set the flag to.
 	 */
-	TimeMarker(View &view, const QColor &colour, const pv::util::Timestamp& time);
+	TimeMarker(View &view, const QColor &color, const pv::util::Timestamp& time);
 
 public:
 	/**
 	 * Gets the time of the marker.
 	 */
-	const pv::util::Timestamp& time() const;
+	virtual const pv::util::Timestamp time() const override;
 
 	/**
 	 * Sets the time of the marker.
@@ -74,6 +74,8 @@ public:
 
 	float get_x() const override;
 
+	virtual const pv::util::Timestamp delta(const pv::util::Timestamp& other) const override;
+
 	/**
 	 * Gets the arrow-tip point of the time marker.
 	 * @param rect the rectangle of the ruler area.
@@ -120,7 +122,7 @@ private Q_SLOTS:
 	void on_value_changed(const pv::util::Timestamp& value);
 
 protected:
-	const QColor &colour_;
+	const QColor &color_;
 
 	pv::util::Timestamp time_;
 
@@ -128,7 +130,6 @@ protected:
 
 	QWidgetAction *value_action_;
 	pv::widgets::TimestampSpinBox *value_widget_;
-	bool updating_value_widget_;
 };
 
 } // namespace trace