X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftrace.hpp;h=a9ccd7b7c4bd1b581d2b245821054466d2edf036;hp=134f11024f3a8de618dd64354280b5817b9c69fa;hb=641574bcc118be0b6dc3a65039ab3497f9d7241a;hpb=5e685656d6686eb66a39450d1b324f6382fc60c5

diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index 134f1102..a9ccd7b7 100644
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -88,8 +88,8 @@ private:
 	static const QPen AxisPen;
 	static const int LabelHitPadding;
 
-	static const QColor BrightGrayBGColour;
-	static const QColor DarkGrayBGColour;
+	static const QColor BrightGrayBGColor;
+	static const QColor DarkGrayBGColor;
 
 protected:
 	Trace(shared_ptr<data::SignalBase> channel);
@@ -106,9 +106,9 @@ public:
 	virtual void set_name(QString name);
 
 	/**
-	 * Set the colour of the signal.
+	 * Set the color of the signal.
 	 */
-	virtual void set_colour(QColor colour);
+	virtual void set_color(QColor color);
 
 	/**
 	 * Configures the segment display mode to use.
@@ -154,7 +154,7 @@ protected:
 	 */
 	void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
 
-	void add_colour_option(QWidget *parent, QFormLayout *form);
+	void add_color_option(QWidget *parent, QFormLayout *form);
 
 	void create_popup_form();
 
@@ -163,14 +163,14 @@ protected:
 protected Q_SLOTS:
 	virtual void on_name_changed(const QString &text);
 
-	virtual void on_colour_changed(const QColor &colour);
+	virtual void on_color_changed(const QColor &color);
 
 	void on_popup_closed();
 
 private Q_SLOTS:
 	void on_nameedit_changed(const QString &name);
 
-	void on_colouredit_changed(const QColor &colour);
+	void on_coloredit_changed(const QColor &color);
 
 protected:
 	shared_ptr<data::SignalBase> base_;