diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 22:14:24 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 10:33:12 +0000 |
commit | c27d4981e9c7ea441729cf7a955c0d44efa9aac3 (patch) | |
tree | 5cf457e94084917f75b51fc9195ad3e1ef0a58a0 /src/gui/painting | |
parent | efeab107bfd631b9e372f4d69923f2f788919467 (diff) |
Fix nullptr literal 0s which would look odd as nullptr
These all invoke the QFlags<>(Zero *) ctor, which is designed to
accept a 0, but no other int. But in doing so, it requires passing
a nullptr literal, and 0 is not a nullptr literal accepted under
-Wzero-as-null-pointer-constant or similar warnings.
Fix by using the QFlags::QFlags() ctor instead.
Task-number: QTBUG-45291
Change-Id: I73f9c9f4de11eeb1ba04ace6c7121d17510ea29f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qpaintengine.h | 4 | ||||
-rw-r--r-- | src/gui/painting/qpainter.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h index eeca87ce16..fa3fad1caa 100644 --- a/src/gui/painting/qpaintengine.h +++ b/src/gui/painting/qpaintengine.h @@ -137,7 +137,7 @@ public: PolylineMode }; - explicit QPaintEngine(PaintEngineFeatures features=0); + explicit QPaintEngine(PaintEngineFeatures features=PaintEngineFeatures()); virtual ~QPaintEngine(); bool isActive() const { return active; } @@ -220,7 +220,7 @@ public: inline bool isExtended() const { return extended; } protected: - QPaintEngine(QPaintEnginePrivate &data, PaintEngineFeatures devcaps=0); + QPaintEngine(QPaintEnginePrivate &data, PaintEngineFeatures devcaps=PaintEngineFeatures()); QPaintEngineState *state; PaintEngineFeatures gccaps; diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h index e0c124ea66..8e2d17d3a5 100644 --- a/src/gui/painting/qpainter.h +++ b/src/gui/painting/qpainter.h @@ -374,7 +374,7 @@ public: inline void drawPixmap(int x, int y, int w, int h, const QPixmap &pm); void drawPixmapFragments(const PixmapFragment *fragments, int fragmentCount, - const QPixmap &pixmap, PixmapFragmentHints hints = 0); + const QPixmap &pixmap, PixmapFragmentHints hints = PixmapFragmentHints()); void drawImage(const QRectF &targetRect, const QImage &image, const QRectF &sourceRect, Qt::ImageConversionFlags flags = Qt::AutoColor); |