X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftriggermarker.cpp;h=3311f3502ba2d92540939a3ad9c5102550d07dda;hp=031bc5d9d3cb9a03d86eb5dc4736b78c66ef87e0;hb=119c5c232ef47e92ef6a5cc9f8b7c4c31dc2f387;hpb=963be49714665b5b12b29937875d432660ff4bc1

diff --git a/pv/views/trace/triggermarker.cpp b/pv/views/trace/triggermarker.cpp
index 031bc5d..3311f35 100644
--- a/pv/views/trace/triggermarker.cpp
+++ b/pv/views/trace/triggermarker.cpp
@@ -24,7 +24,7 @@ namespace pv {
 namespace views {
 namespace trace {
 
-const QColor TriggerMarker::Colour(0x00, 0x00, 0xB0);
+const QColor TriggerMarker::Color(0x00, 0x00, 0xB0);
 
 TriggerMarker::TriggerMarker(View &view, const pv::util::Timestamp& time) :
 	TimeItem(view),
@@ -43,8 +43,9 @@ bool TriggerMarker::enabled() const
 	return true;
 }
 
-bool TriggerMarker::is_draggable() const
+bool TriggerMarker::is_draggable(QPoint pos) const
 {
+	(void)pos;
 	return false;
 }
 
@@ -73,7 +74,7 @@ void TriggerMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
 	if (!enabled())
 		return;
 
-	QPen pen(Colour);
+	QPen pen(Color);
 	pen.setStyle(Qt::DashLine);
 
 	const float x = get_x();