diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-24 08:54:38 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-28 21:14:58 +0000 |
commit | 61d50cbc96e5331218a6a4e5614f50211f06c718 (patch) | |
tree | 83571cad118c7c5cd70126ae2a6db01d2d462d93 /src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp | |
parent | 850858cce6191593aaab3176932bc04a6f97f202 (diff) |
Windows/Direct2d QPA: Use nullptr
Change-Id: I6ce01caa58de78e0eb61e243ee1e7b05cc1f5568
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp')
-rw-r--r-- | src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp index 2151f3ae95..587bae3598 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp @@ -54,7 +54,8 @@ QT_BEGIN_NAMESPACE class QWindowsDirect2DBitmapPrivate { public: - QWindowsDirect2DBitmapPrivate(ID2D1DeviceContext *dc = 0, ID2D1Bitmap1 *bm = 0) + QWindowsDirect2DBitmapPrivate(ID2D1DeviceContext *dc = nullptr, + ID2D1Bitmap1 *bm = nullptr) : deviceContext(new QWindowsDirect2DDeviceContext(dc)) , bitmap(bm) @@ -75,9 +76,9 @@ public: } - bool resize(int width, int height, const void *data = 0, int pitch = 0) + bool resize(int width, int height, const void *data = nullptr, int pitch = 0) { - deviceContext->get()->SetTarget(0); + deviceContext->get()->SetTarget(nullptr); bitmap.Reset(); D2D1_SIZE_U size = { @@ -108,14 +109,14 @@ public: D2D1_BITMAP_PROPERTIES1 properties = bitmapProperties(); properties.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; - hr = deviceContext->get()->CreateBitmap(size, NULL, 0, + hr = deviceContext->get()->CreateBitmap(size, nullptr, 0, properties, &mappingCopy); if (FAILED(hr)) { qWarning("%s: Could not create bitmap: %#lx", __FUNCTION__, hr); return QImage(); } - hr = mappingCopy->CopyFromBitmap(NULL, bitmap.Get(), NULL); + hr = mappingCopy->CopyFromBitmap(nullptr, bitmap.Get(), nullptr); if (FAILED(hr)) { qWarning("%s: Could not copy from bitmap: %#lx", __FUNCTION__, hr); return QImage(); |