Trace: Renamed get_colour() to colour()

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 367891a22c67e72b21a68057ba553c9d0ba50e7a..f6c27430942a4d258cb93297b86114c9397354c3 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -58,7 +58,7 @@ void Trace::set_name(QString name)
        _name = name;
 }
 
        _name = name;
 }
 

-QColor Trace::get_colour() const
+QColor Trace::colour() const

 {
        return _colour;
 }
 {
        return _colour;
 }


@@ -77,8 +77,6 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
        if (!enabled())
                return;
 
        if (!enabled())
                return;
 

-       const QColor colour = get_colour();
-

        const QRectF r = label_rect(right);
 
        // Paint the label
        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.setPen(Qt::transparent);

-       p.setBrush(hover ? colour.lighter() : colour);
+       p.setBrush(hover ? _colour.lighter() : _colour);

        p.drawPolygon(points, countof(points));
 
        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.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));
 
        p.setBrush(Qt::transparent);
        p.drawPolygon(points, countof(points));
 

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 7cfa3c2e0681c76663319939f246f983f8a2c31f..e3754b6e73a6fdf566a1f8ecfe464db429d07418 100644 (file)
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -66,7 +66,7 @@ public:
        /**
         * Get the colour of the signal.
         */
        /**
         * Get the colour of the signal.
         */

-       QColor get_colour() const;
+       QColor colour() const;

 
        /**
         * Set the colour of the signal.
 
        /**
         * Set the colour of the signal.