From c8235ba0e0292f209a8233613669e2cff8de80da Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sat, 22 May 2021 08:18:01 +1000
Subject: Rename ColourAlpha to ColourRGBA to avoid clashes when a ColourAlpha
 typedef will be published in externally visible header.

---
 src/Platform.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/Platform.h')

diff --git a/src/Platform.h b/src/Platform.h
index 2d14da96e..f279b80cd 100644
--- a/src/Platform.h
+++ b/src/Platform.h
@@ -225,15 +225,15 @@ public:
 
 	virtual std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) = 0;
 
-	virtual void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, ColourAlpha back) = 0;
-	virtual void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, ColourAlpha back) = 0;
-	virtual void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore) = 0;
+	virtual void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0;
+	virtual void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0;
+	virtual void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) = 0;
 	virtual void MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) = 0;
 	virtual XYPOSITION WidthText(const Font *font_, std::string_view text) = 0;
 
-	virtual void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, ColourAlpha back) = 0;
-	virtual void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore, ColourAlpha back) = 0;
-	virtual void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourAlpha fore) = 0;
+	virtual void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0;
+	virtual void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0;
+	virtual void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) = 0;
 	virtual void MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) = 0;
 	virtual XYPOSITION WidthTextUTF8(const Font *font_, std::string_view text) = 0;
 
@@ -304,10 +304,10 @@ public:
 };
 
 struct ListOptions {
-	std::optional<ColourAlpha> fore;
-	std::optional<ColourAlpha> back;
-	std::optional<ColourAlpha> foreSelected;
-	std::optional<ColourAlpha> backSelected;
+	std::optional<ColourRGBA> fore;
+	std::optional<ColourRGBA> back;
+	std::optional<ColourRGBA> foreSelected;
+	std::optional<ColourRGBA> backSelected;
 };
 
 class ListBox : public Window {
@@ -357,8 +357,8 @@ public:
  */
 namespace Platform {
 
-ColourAlpha Chrome();
-ColourAlpha ChromeHighlight();
+ColourRGBA Chrome();
+ColourRGBA ChromeHighlight();
 const char *DefaultFont();
 int DefaultFontSize();
 unsigned int DoubleClickTime();
-- 
cgit v1.2.3