1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPainter: code tidies

Browse Source 
* 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>
This commit is contained in:
Giuseppe D'Angelo 2024-06-14 16:09:18 +02:00
parent 2f11edad9e
commit c95873400f
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/painting/qcompositionfunctions.cpp
View File

@ -4182,6 +4182,8 @@ CompositionFunctionSolid qt_functionForModeSolid_C[] = {
rasterop_solid_NotDestination rasterop_solid_NotDestination
}; };
static_assert(std::size(qt_functionForModeSolid_C) == QPainter::NCompositionModes);
CompositionFunctionSolid64 qt_functionForModeSolid64_C[] = { CompositionFunctionSolid64 qt_functionForModeSolid64_C[] = {
#if QT_CONFIG(raster_64bit) #if QT_CONFIG(raster_64bit)
comp_func_solid_SourceOver_rgb64, comp_func_solid_SourceOver_rgb64,
@ -4217,6 +4219,8 @@ CompositionFunctionSolid64 qt_functionForModeSolid64_C[] = {
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
}; };
static_assert(std::size(qt_functionForModeSolid64_C) == QPainter::NCompositionModes);
CompositionFunctionSolidFP qt_functionForModeSolidFP_C[] = { CompositionFunctionSolidFP qt_functionForModeSolidFP_C[] = {
#if QT_CONFIG(raster_fp) #if QT_CONFIG(raster_fp)
comp_func_solid_SourceOver_rgbafp, comp_func_solid_SourceOver_rgbafp,
@ -4244,13 +4248,15 @@ CompositionFunctionSolidFP qt_functionForModeSolidFP_C[] = {
comp_func_solid_Difference_rgbafp, comp_func_solid_Difference_rgbafp,
comp_func_solid_Exclusion_rgbafp, comp_func_solid_Exclusion_rgbafp,
#else #else
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
#endif #endif
0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
0, 0, 0, 0, 0, 0, 0, 0 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
}; };
static_assert(std::size(qt_functionForModeSolidFP_C) == QPainter::NCompositionModes);
CompositionFunction qt_functionForMode_C[] = { CompositionFunction qt_functionForMode_C[] = {
comp_func_SourceOver, comp_func_SourceOver,
comp_func_DestinationOver, comp_func_DestinationOver,
@ -4292,6 +4298,8 @@ CompositionFunction qt_functionForMode_C[] = {
rasterop_NotDestination rasterop_NotDestination
}; };
static_assert(std::size(qt_functionForMode_C) == QPainter::NCompositionModes);
CompositionFunction64 qt_functionForMode64_C[] = { CompositionFunction64 qt_functionForMode64_C[] = {
#if QT_CONFIG(raster_64bit) #if QT_CONFIG(raster_64bit)
comp_func_SourceOver_rgb64, comp_func_SourceOver_rgb64,
@ -4327,6 +4335,8 @@ CompositionFunction64 qt_functionForMode64_C[] = {
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
}; };
static_assert(std::size(qt_functionForMode64_C) == QPainter::NCompositionModes);
CompositionFunctionFP qt_functionForModeFP_C[] = { CompositionFunctionFP qt_functionForModeFP_C[] = {
#if QT_CONFIG(raster_fp) #if QT_CONFIG(raster_fp)
comp_func_SourceOver_rgbafp, comp_func_SourceOver_rgbafp,
@ -4354,11 +4364,13 @@ CompositionFunctionFP qt_functionForModeFP_C[] = {
comp_func_Difference_rgbafp, comp_func_Difference_rgbafp,
comp_func_Exclusion_rgbafp, comp_func_Exclusion_rgbafp,
#else #else
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
#endif #endif
0, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
0, 0, 0, 0, 0, 0, 0, 0 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
}; };
static_assert(std::size(qt_functionForModeFP_C) == QPainter::NCompositionModes);
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/gui/painting/qpainter.cpp
View File

@ -2310,6 +2310,8 @@ void QPainter::setBrushOrigin(const QPointF &p)
where the source is OR'ed with the inverted destination pixels where the source is OR'ed with the inverted destination pixels
(src OR (NOT dst)). (src OR (NOT dst)).
\omitvalue NCompositionModes
\sa compositionMode(), setCompositionMode(), {QPainter#Composition \sa compositionMode(), setCompositionMode(), {QPainter#Composition
Modes}{Composition Modes}, {Image Composition Example} Modes}{Composition Modes}, {Image Composition Example}
*/ */

4
src/gui/painting/qpainter.h
View File

@ -136,7 +136,9 @@ public:
RasterOp_SourceOrNotDestination, RasterOp_SourceOrNotDestination,
RasterOp_ClearDestination, RasterOp_ClearDestination,
RasterOp_SetDestination, RasterOp_SetDestination,
RasterOp_NotDestination RasterOp_NotDestination,
NCompositionModes
}; };
void setCompositionMode(CompositionMode mode); void setCompositionMode(CompositionMode mode);
CompositionMode compositionMode() const; CompositionMode compositionMode() const;