From c95873400f01061b944e42db71c87e09692d9848 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Fri, 14 Jun 2024 16:09:18 +0200
Subject: [PATCH] QPainter: code tidies

* Use nullptr instead of 0
* static_assert that certain arrays have the expected size.

Change-Id: Ia1ddc7a862d9a237c5049b0b8efa33eb3dd4f8ca
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/gui/painting/qcompositionfunctions.cpp | 28 +++++++++++++++-------
 src/gui/painting/qpainter.cpp              |  2 ++
 src/gui/painting/qpainter.h                |  4 +++-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/gui/painting/qcompositionfunctions.cpp b/src/gui/painting/qcompositionfunctions.cpp
index 00fd749fe64..9db5080f361 100644
--- a/src/gui/painting/qcompositionfunctions.cpp
+++ b/src/gui/painting/qcompositionfunctions.cpp
@@ -4182,6 +4182,8 @@ CompositionFunctionSolid qt_functionForModeSolid_C[] = {
         rasterop_solid_NotDestination
 };
 
+static_assert(std::size(qt_functionForModeSolid_C) == QPainter::NCompositionModes);
+
 CompositionFunctionSolid64 qt_functionForModeSolid64_C[] = {
 #if QT_CONFIG(raster_64bit)
         comp_func_solid_SourceOver_rgb64,
@@ -4217,6 +4219,8 @@ CompositionFunctionSolid64 qt_functionForModeSolid64_C[] = {
         nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 };
 
+static_assert(std::size(qt_functionForModeSolid64_C) == QPainter::NCompositionModes);
+
 CompositionFunctionSolidFP qt_functionForModeSolidFP_C[] = {
 #if QT_CONFIG(raster_fp)
         comp_func_solid_SourceOver_rgbafp,
@@ -4244,13 +4248,15 @@ CompositionFunctionSolidFP qt_functionForModeSolidFP_C[] = {
         comp_func_solid_Difference_rgbafp,
         comp_func_solid_Exclusion_rgbafp,
 #else
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 #endif
-        0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 };
 
+static_assert(std::size(qt_functionForModeSolidFP_C) == QPainter::NCompositionModes);
+
 CompositionFunction qt_functionForMode_C[] = {
         comp_func_SourceOver,
         comp_func_DestinationOver,
@@ -4292,6 +4298,8 @@ CompositionFunction qt_functionForMode_C[] = {
         rasterop_NotDestination
 };
 
+static_assert(std::size(qt_functionForMode_C) == QPainter::NCompositionModes);
+
 CompositionFunction64 qt_functionForMode64_C[] = {
 #if QT_CONFIG(raster_64bit)
         comp_func_SourceOver_rgb64,
@@ -4327,6 +4335,8 @@ CompositionFunction64 qt_functionForMode64_C[] = {
         nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 };
 
+static_assert(std::size(qt_functionForMode64_C) == QPainter::NCompositionModes);
+
 CompositionFunctionFP qt_functionForModeFP_C[] = {
 #if QT_CONFIG(raster_fp)
         comp_func_SourceOver_rgbafp,
@@ -4354,11 +4364,13 @@ CompositionFunctionFP qt_functionForModeFP_C[] = {
         comp_func_Difference_rgbafp,
         comp_func_Exclusion_rgbafp,
 #else
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
 #endif
-        0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
 };
 
+static_assert(std::size(qt_functionForModeFP_C) == QPainter::NCompositionModes);
+
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index f4b9741eed8..830f91face7 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -2310,6 +2310,8 @@ void QPainter::setBrushOrigin(const QPointF &p)
     where the source is OR'ed with the inverted destination pixels
     (src OR (NOT dst)).
 
+    \omitvalue NCompositionModes
+
     \sa compositionMode(), setCompositionMode(), {QPainter#Composition
     Modes}{Composition Modes}, {Image Composition Example}
 */
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 7bcacb4bcaa..d0c309467f2 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -136,7 +136,9 @@ public:
         RasterOp_SourceOrNotDestination,
         RasterOp_ClearDestination,
         RasterOp_SetDestination,
-        RasterOp_NotDestination
+        RasterOp_NotDestination,
+
+        NCompositionModes
     };
     void setCompositionMode(CompositionMode mode);
     CompositionMode compositionMode() const;