Miscellanea fixes for QT_TYPESAFE_FLAGS in our headers

In preparation for adding it to headersclean.

Some remarks:

* QStandardItemModel builds just fine (QFlags has comparison operators
against literal zero); the warning we however get is about 0 converted
to a null pointer constant. There's nothing we can do about that one
(even <compare> gives such a warning).

* Several code was depending on flags->int conversions. Add toInt(),
but also cast again to the expected type to avoid warnings in case
toInt() returns unsigned int.

* Ported to explicit casts to bool rather than test(Any)Flag to minimize
confusion for people unfamiliar with the test*Flag methods.

Change-Id: I5be280ac33a0b38e2680096f0e79129fd55ba241
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h
index 64170c513e..abd078abe5 100644
--- a/src/gui/painting/qpaintengine.h
+++ b/src/gui/painting/qpaintengine.h
@@ -218,7 +218,7 @@ public:
     inline void setDirty(DirtyFlags df);
     inline void clearDirty(DirtyFlags df);
 
-    bool hasFeature(PaintEngineFeatures feature) const { return gccaps & feature; }
+    bool hasFeature(PaintEngineFeatures feature) const { return bool(gccaps & feature); }
 
     QPainter *painter() const;
 
@@ -320,7 +320,7 @@ inline void QPaintEngine::fix_neg_rect(int *x, int *y, int *w, int *h)
 
 inline bool QPaintEngine::testDirty(DirtyFlags df) {
     Q_ASSERT(state);
-    return state->dirtyFlags & df;
+    return bool(state->dirtyFlags & df);
 }
 
 inline void QPaintEngine::setDirty(DirtyFlags df) {
@@ -331,7 +331,7 @@ inline void QPaintEngine::setDirty(DirtyFlags df) {
 inline void QPaintEngine::clearDirty(DirtyFlags df)
 {
     Q_ASSERT(state);
-    state->dirtyFlags &= ~static_cast<uint>(df);
+    state->dirtyFlags &= ~df;
 }
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTextItem::RenderFlags)
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 6446e88b0b..a3f556bfdf 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -438,7 +438,7 @@ public:
     void setRenderHint(RenderHint hint, bool on = true);
     void setRenderHints(RenderHints hints, bool on = true);
     RenderHints renderHints() const;
-    inline bool testRenderHint(RenderHint hint) const { return renderHints() & hint; }
+    inline bool testRenderHint(RenderHint hint) const { return bool(renderHints() & hint); }
 
     QPaintEngine *paintEngine() const;