RowItem: Make label_rect a const function

[pulseview.git] / pv / view / trace.cpp

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index aba51510db59ad964d9f4213b994c05caf5275d8..3409ecf75cb7a471dba4ebe73b6adf5532cf4762 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -48,7 +48,7 @@ Trace::Trace(QString name) :
 {
 }
 
-QString Trace::get_name() const
+QString Trace::name() const
 {
        return _name;
 }
@@ -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));
 
@@ -145,7 +143,7 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
        return _popup;
 }
 
-QRectF Trace::label_rect(int right)
+QRectF Trace::label_rect(int right) const
 {
        using pv::view::View;