Backport recent changes from mainline.

[pulseview.git] / pv / views / trace / viewitempaintparams.hpp

diff --git a/pv/views/trace/viewitempaintparams.hpp b/pv/views/trace/viewitempaintparams.hpp
index f39085ce6712e91ff678168dbb807175672f3ae6..725a4336bbcb4944d3ca09992ba9da293523ee6c 100644 (file)
--- a/pv/views/trace/viewitempaintparams.hpp
+++ b/pv/views/trace/viewitempaintparams.hpp
@@ -75,9 +75,9 @@ public:
                return (offset_ / scale_).convert_to<double>();
        }
 
-       bool next_bg_colour_state() {
-               const bool state = bg_colour_state_;
-               bg_colour_state_ = !bg_colour_state_;
+       bool next_bg_color_state() {
+               const bool state = bg_color_state_;
+               bg_color_state_ = !bg_color_state_;
                return state;
        }
 
@@ -90,7 +90,7 @@ private:
        QRect rect_;
        double scale_;
        pv::util::Timestamp offset_;
-       bool bg_colour_state_;
+       bool bg_color_state_;
 };
 
 } // namespace trace