X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftimemarker.cpp;h=65b9481d12ff8261d321143d01b2add95c38ae5a;hp=487496d9fd102d1c8c3f72295b0669259fbdf702;hb=99ba5f2845a24f91901addb80c04d5bf0e0906f3;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff

diff --git a/pv/views/trace/timemarker.cpp b/pv/views/trace/timemarker.cpp
index 487496d9..65b9481d 100644
--- a/pv/views/trace/timemarker.cpp
+++ b/pv/views/trace/timemarker.cpp
@@ -44,9 +44,9 @@ namespace trace {
 const int TimeMarker::ArrowSize = 4;
 
 TimeMarker::TimeMarker(
-	View &view, const QColor &colour, const pv::util::Timestamp& time) :
+	View &view, const QColor &color, const pv::util::Timestamp& time) :
 	TimeItem(view),
-	colour_(colour),
+	color_(color),
 	time_(time),
 	value_action_(nullptr),
 	value_widget_(nullptr),
@@ -78,7 +78,7 @@ float TimeMarker::get_x() const
 	return roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f;
 }
 
-QPoint TimeMarker::point(const QRect &rect) const
+QPoint TimeMarker::drag_point(const QRect &rect) const
 {
 	return QPoint(get_x(), rect.bottom());
 }
@@ -140,18 +140,18 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
 	}
 
 	p.setPen(Qt::transparent);
-	p.setBrush(hover ? colour_.lighter() : colour_);
+	p.setBrush(hover ? color_.lighter() : color_);
 	p.drawPolygon(points, countof(points));
 
-	p.setPen(colour_.lighter());
+	p.setPen(color_.lighter());
 	p.setBrush(Qt::transparent);
 	p.drawPolygon(highlight_points, countof(highlight_points));
 
-	p.setPen(colour_.darker());
+	p.setPen(color_.darker());
 	p.setBrush(Qt::transparent);
 	p.drawPolygon(points, countof(points));
 
-	p.setPen(select_text_colour(colour_));
+	p.setPen(select_text_color(color_));
 	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
 }
 
@@ -161,7 +161,7 @@ void TimeMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 		return;
 
 	const float x = get_x();
-	p.setPen(colour_.darker());
+	p.setPen(color_.darker());
 	p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
 }
 
@@ -171,7 +171,7 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 
 	Popup *const popup = new Popup(parent);
 	popup->set_position(parent->mapToGlobal(
-		point(parent->rect())), Popup::Bottom);
+		drag_point(parent->rect())), Popup::Bottom);
 
 	QFormLayout *const form = new QFormLayout(popup);
 	popup->setLayout(form);