From 24100ee6270861c8b63c195c2a840c3b4fbddf62 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 27 May 2019 22:34:30 +0000 Subject: [PATCH] QPainterPrivate cleanup Signed-off-by: Ivailo Monev --- src/gui/painting/qpainter.cpp | 4 ++-- src/gui/painting/qpainter_p.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 7670bbd7a..5273e115c 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -599,7 +599,7 @@ void QPainterPrivate::updateStateImpl(QPainterState *newState) // Upon restore, revert all changes since last save else if (engine->state != newState) - newState->dirtyFlags |= QPaintEngine::DirtyFlags(static_cast(engine->state)->changeFlags); + newState->dirtyFlags |= static_cast(engine->state)->changeFlags; // We need to store all changes made so that restore can deal with them else @@ -5712,7 +5712,7 @@ void QPainter::drawTextItem(const QPointF &p, const QTextItem &_ti) if (pen().style() == Qt::NoPen) return; - const RenderHints oldRenderHints = d->state->renderHints; + const QPainter::RenderHints oldRenderHints = d->state->renderHints; if (!(d->state->renderHints & QPainter::Antialiasing) && d->state->matrix.type() >= QTransform::TxScale) { // draw antialias decoration (underline/overline/strikeout) with // transformed text diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h index 3ffe145d6..d32169176 100644 --- a/src/gui/painting/qpainter_p.h +++ b/src/gui/painting/qpainter_p.h @@ -136,11 +136,11 @@ public: int vx, vy, vw, vh; // viewport rectangle qreal opacity; - uint WxF:1; // World transformation - uint VxF:1; // View transformation - uint clipEnabled:1; + bool WxF; // World transformation + bool VxF; // View transformation + bool clipEnabled; - uint changeFlags; + QPaintEngine::DirtyFlags changeFlags; Qt::BGMode bgMode; QPainter *painter; Qt::LayoutDirection layoutDirection; -- 2.11.0