Backport recent changes from mainline.

[pulseview.git] / pv / views / trace / cursor.cpp

diff --git a/pv/views/trace/cursor.cpp b/pv/views/trace/cursor.cpp
index 4fb4b65d9841deec2594422092997db66a386f01..7a375c7aad49410450c5f41f0d6d8c949e6bcd38 100644 (file)
--- a/pv/views/trace/cursor.cpp
+++ b/pv/views/trace/cursor.cpp
@@ -34,17 +34,17 @@
 #include <cstdio>
 #include <limits>
 
-using std::abs; // Force usage of std::abs() instead of C's abs().
+using std::abs; // NOLINT. Force usage of std::abs() instead of C's abs().
 using std::shared_ptr;
 
 namespace pv {
 namespace views {
 namespace trace {
 
-const QColor Cursor::FillColour(52, 101, 164);
+const QColor Cursor::FillColor(52, 101, 164);
 
 Cursor::Cursor(View &view, double time) :
-       TimeMarker(view, FillColour, time)
+       TimeMarker(view, FillColor, time)
 {
 }