Fix a few #include guard inconsistencies.

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

diff --git a/pv/views/trace/viewitempaintparams.hpp b/pv/views/trace/viewitempaintparams.hpp
index f39085ce6712e91ff678168dbb807175672f3ae6..e52b92f18e3b020ce0a82405aea2f94a4e8bd570 100644 (file)
--- a/pv/views/trace/viewitempaintparams.hpp
+++ b/pv/views/trace/viewitempaintparams.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMPAINTPARAMS_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMPAINTPARAMS_HPP
 
 #include "pv/util.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,11 +90,11 @@ private:
        QRect rect_;
        double scale_;
        pv::util::Timestamp offset_;
-       bool bg_colour_state_;
+       bool bg_color_state_;
 };
 
 } // namespace trace
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEWITEMPAINTPARAMS_HPP