X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;fp=pv%2Fdata%2Fsignalbase.hpp;h=b6f69ef56e0950d628c0b55234f0bbf6770a42a5;hp=3356af5b786ad3fefeace38f7d42fe32dc7bdfa7;hb=641574bcc118be0b6dc3a65039ab3497f9d7241a;hpb=5e685656d6686eb66a39450d1b324f6382fc60c5;ds=sidebyside

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 3356af5b..b6f69ef5 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -86,7 +86,7 @@ public:
 	};
 
 private:
-	static const int ColourBGAlpha;
+	static const int ColorBGAlpha;
 	static const uint64_t ConversionBlockSize;
 	static const uint32_t ConversionDelay;
 
@@ -152,19 +152,19 @@ public:
 	virtual void set_name(QString name);
 
 	/**
-	 * Get the colour of the signal.
+	 * Get the color of the signal.
 	 */
-	QColor colour() const;
+	QColor color() const;
 
 	/**
-	 * Set the colour of the signal.
+	 * Set the color of the signal.
 	 */
-	void set_colour(QColor colour);
+	void set_color(QColor color);
 
 	/**
-	 * Get the background colour of the signal.
+	 * Get the background color of the signal.
 	 */
-	QColor bgcolour() const;
+	QColor bgcolor() const;
 
 	/**
 	 * Sets the internal data object.
@@ -298,7 +298,7 @@ Q_SIGNALS:
 
 	void name_changed(const QString &name);
 
-	void colour_changed(const QColor &colour);
+	void color_changed(const QColor &color);
 
 	void conversion_type_changed(const ConversionType t);
 
@@ -338,7 +338,7 @@ protected:
 	QTimer delayed_conversion_starter_;
 
 	QString internal_name_, name_;
-	QColor colour_, bgcolour_;
+	QColor color_, bgcolor_;
 };
 
 } // namespace data