From c8235ba0e0292f209a8233613669e2cff8de80da Mon Sep 17 00:00:00 2001 From: Neil 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/LineMarker.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/LineMarker.h') diff --git a/src/LineMarker.h b/src/LineMarker.h index e0921b2b3..e0c4100a5 100644 --- a/src/LineMarker.h +++ b/src/LineMarker.h @@ -24,9 +24,9 @@ public: enum class FoldPart { undefined, head, body, tail, headWithTail }; int markType = SC_MARK_CIRCLE; - ColourAlpha fore = ColourAlpha(0, 0, 0); - ColourAlpha back = ColourAlpha(0xff, 0xff, 0xff); - ColourAlpha backSelected = ColourAlpha(0xff, 0x00, 0x00); + ColourRGBA fore = ColourRGBA(0, 0, 0); + ColourRGBA back = ColourRGBA(0xff, 0xff, 0xff); + ColourRGBA backSelected = ColourRGBA(0xff, 0x00, 0x00); Layer layer = Layer::base; int alpha = SC_ALPHA_NOALPHA; XYPOSITION strokeWidth = 1.0f; @@ -45,7 +45,7 @@ public: LineMarker &operator=(LineMarker&&) noexcept = default; virtual ~LineMarker() = default; - ColourAlpha BackWithAlpha() const noexcept; + ColourRGBA BackWithAlpha() const noexcept; void SetXPM(const char *textForm); void SetXPM(const char *const *linesForm); -- cgit v1.2.3