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

diff --git a/pv/views/trace/timemarker.hpp b/pv/views/trace/timemarker.hpp
index 1a2abb32..99c56d34 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.
@@ -120,7 +120,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 +128,6 @@ protected:
 
 	QWidgetAction *value_action_;
 	pv::widgets::TimestampSpinBox *value_widget_;
-	bool updating_value_widget_;
 };
 
 } // namespace trace