From 06149d431d48726903ace7216c20f3a8d110cdf8 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sun, 16 Nov 2014 18:55:53 +0000 Subject: [PATCH] Trace: Renamed get_colour() to colour() --- pv/view/trace.cpp | 10 ++++------ pv/view/trace.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index 367891a..f6c2743 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -58,7 +58,7 @@ void Trace::set_name(QString name) _name = name; } -QColor Trace::get_colour() const +QColor Trace::colour() const { return _colour; } @@ -77,8 +77,6 @@ void Trace::paint_label(QPainter &p, int right, bool hover) if (!enabled()) return; - const QColor colour = get_colour(); - const QRectF r = label_rect(right); // Paint the label @@ -105,14 +103,14 @@ void Trace::paint_label(QPainter &p, int right, bool hover) } p.setPen(Qt::transparent); - p.setBrush(hover ? colour.lighter() : colour); + p.setBrush(hover ? _colour.lighter() : _colour); p.drawPolygon(points, countof(points)); - p.setPen(colour.lighter()); + p.setPen(_colour.lighter()); p.setBrush(Qt::transparent); p.drawPolygon(highlight_points, countof(highlight_points)); - p.setPen(colour.darker()); + p.setPen(_colour.darker()); p.setBrush(Qt::transparent); p.drawPolygon(points, countof(points)); diff --git a/pv/view/trace.h b/pv/view/trace.h index 7cfa3c2..e3754b6 100644 --- a/pv/view/trace.h +++ b/pv/view/trace.h @@ -66,7 +66,7 @@ public: /** * Get the colour of the signal. */ - QColor get_colour() const; + QColor colour() const; /** * Set the colour of the signal. -- 2.30.2