use std::optional for SALCOLOR_NONE

instead of re-using an actual real color value, because it will totally
not work when I convert vcl to use alpha instead of transparency

Change-Id: I01f043e0b65ffd852989dfe28f2b9d5a43c9c3d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145075
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 20 insertions, 20 deletions

diff --git a/vcl/qt5/QtGraphics_GDI.cxx b/vcl/qt5/QtGraphics_GDI.cxx
index 832f8a09eb2f..08116f85a529 100644
--- a/vcl/qt5/QtGraphics_GDI.cxx
+++ b/vcl/qt5/QtGraphics_GDI.cxx
@@ -36,8 +36,8 @@
 QtGraphicsBackend::QtGraphicsBackend(QtFrame* pFrame, QImage* pQImage)
     : m_pFrame(pFrame)
     , m_pQImage(pQImage)
-    , m_aLineColor(0x00, 0x00, 0x00)
-    , m_aFillColor(0xFF, 0xFF, 0XFF)
+    , m_oLineColor(std::in_place, 0x00, 0x00, 0x00)
+    , m_oFillColor(std::in_place, 0xFF, 0xFF, 0XFF)
     , m_eCompositionMode(QPainter::CompositionMode_SourceOver)
 {
     ResetClipRegion();
@@ -217,13 +217,13 @@ void QtGraphicsBackend::drawLine(tools::Long nX1, tools::Long nY1, tools::Long n
 void QtGraphicsBackend::drawRect(tools::Long nX, tools::Long nY, tools::Long nWidth,
                                  tools::Long nHeight)
 {
-    if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor)
+    if (!m_oFillColor && !m_oLineColor)
         return;
 
     QtPainter aPainter(*this, true);
-    if (SALCOLOR_NONE != m_aFillColor)
+    if (m_oFillColor)
         aPainter.fillRect(nX, nY, nWidth, nHeight, aPainter.brush());
-    if (SALCOLOR_NONE != m_aLineColor)
+    if (m_oLineColor)
         aPainter.drawRect(nX, nY, nWidth - 1, nHeight - 1);
     aPainter.update(nX, nY, nWidth, nHeight);
 }
@@ -268,7 +268,7 @@ void QtGraphicsBackend::drawPolyPolygon(sal_uInt32 nPolyCount, const sal_uInt32*
                                         const Point** ppPtAry)
 {
     // ignore invisible polygons
-    if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor)
+    if (!m_oFillColor && !m_oLineColor)
         return;
 
     QPainterPath aPath;
@@ -296,7 +296,7 @@ bool QtGraphicsBackend::drawPolyPolygon(const basegfx::B2DHomMatrix& rObjectToDe
                                         double fTransparency)
 {
     // ignore invisible polygons
-    if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor)
+    if (!m_oFillColor && !m_oLineColor)
         return true;
     if ((fTransparency >= 1.0) || (fTransparency < 0))
         return true;
@@ -307,7 +307,7 @@ bool QtGraphicsBackend::drawPolyPolygon(const basegfx::B2DHomMatrix& rObjectToDe
 
     QPainterPath aPath;
     // ignore empty polygons
-    if (!AddPolyPolygonToPath(aPath, aPolyPolygon, !getAntiAlias(), m_aLineColor != SALCOLOR_NONE))
+    if (!AddPolyPolygonToPath(aPath, aPolyPolygon, !getAntiAlias(), m_oLineColor.has_value()))
         return true;
 
     QtPainter aPainter(*this, true, 255 * (1.0 - fTransparency));
@@ -342,7 +342,7 @@ bool QtGraphicsBackend::drawPolyLine(const basegfx::B2DHomMatrix& rObjectToDevic
                                      basegfx::B2DLineJoin eLineJoin, css::drawing::LineCap eLineCap,
                                      double fMiterMinimumAngle, bool bPixelSnapHairline)
 {
-    if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor)
+    if (!m_oFillColor && !m_oLineColor)
     {
         return true;
     }
@@ -651,15 +651,15 @@ bool QtGraphicsBackend::hasFastDrawTransformedBitmap() const { return false; }
 bool QtGraphicsBackend::drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth,
                                       tools::Long nHeight, sal_uInt8 nTransparency)
 {
-    if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor)
+    if (!m_oFillColor && !m_oLineColor)
         return true;
     assert(nTransparency <= 100);
     if (nTransparency > 100)
         nTransparency = 100;
     QtPainter aPainter(*this, true, (100 - nTransparency) * (255.0 / 100));
-    if (SALCOLOR_NONE != m_aFillColor)
+    if (m_oFillColor)
         aPainter.fillRect(nX, nY, nWidth, nHeight, aPainter.brush());
-    if (SALCOLOR_NONE != m_aLineColor)
+    if (m_oLineColor)
         aPainter.drawRect(nX, nY, nWidth - 1, nHeight - 1);
     aPainter.update(nX, nY, nWidth, nHeight);
     return true;
@@ -669,13 +669,13 @@ sal_uInt16 QtGraphicsBackend::GetBitCount() const { return getFormatBits(m_pQIma
 
 tools::Long QtGraphicsBackend::GetGraphicsWidth() const { return m_pQImage->width(); }
 
-void QtGraphicsBackend::SetLineColor() { m_aLineColor = SALCOLOR_NONE; }
+void QtGraphicsBackend::SetLineColor() { m_oLineColor = std::nullopt; }
 
-void QtGraphicsBackend::SetLineColor(Color nColor) { m_aLineColor = nColor; }
+void QtGraphicsBackend::SetLineColor(Color nColor) { m_oLineColor = nColor; }
 
-void QtGraphicsBackend::SetFillColor() { m_aFillColor = SALCOLOR_NONE; }
+void QtGraphicsBackend::SetFillColor() { m_oFillColor = std::nullopt; }
 
-void QtGraphicsBackend::SetFillColor(Color nColor) { m_aFillColor = nColor; }
+void QtGraphicsBackend::SetFillColor(Color nColor) { m_oFillColor = nColor; }
 
 void QtGraphicsBackend::SetXORMode(bool bSet, bool)
 {
diff --git a/vcl/qt5/QtPainter.cxx b/vcl/qt5/QtPainter.cxx
index a4c83bbba6d8..529a7c5783dd 100644
--- a/vcl/qt5/QtPainter.cxx
+++ b/vcl/qt5/QtPainter.cxx
@@ -39,17 +39,17 @@ QtPainter::QtPainter(QtGraphicsBackend& rGraphics, bool bPrepareBrush, sal_uInt8
         setClipPath(rGraphics.m_aClipPath);
     else
         setClipRegion(rGraphics.m_aClipRegion);
-    if (SALCOLOR_NONE != rGraphics.m_aLineColor)
+    if (rGraphics.m_oLineColor)
     {
-        QColor aColor = toQColor(rGraphics.m_aLineColor);
+        QColor aColor = toQColor(*rGraphics.m_oLineColor);
         aColor.setAlpha(nTransparency);
         setPen(aColor);
     }
     else
         setPen(Qt::NoPen);
-    if (bPrepareBrush && SALCOLOR_NONE != rGraphics.m_aFillColor)
+    if (bPrepareBrush && rGraphics.m_oFillColor)
     {
-        QColor aColor = toQColor(rGraphics.m_aFillColor);
+        QColor aColor = toQColor(*rGraphics.m_oFillColor);
         aColor.setAlpha(nTransparency);
         setBrush(aColor);
     }