diff options
Diffstat (limited to 'src')
6 files changed, 15 insertions, 31 deletions
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp index 30238217dd..be6a50a139 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp @@ -51,7 +51,6 @@ class QWindowsDirect2DDeviceContextPrivate { public: QWindowsDirect2DDeviceContextPrivate(ID2D1DeviceContext *dc) : deviceContext(dc) - , refCount(0) { if (!dc) { HRESULT hr = QWindowsDirect2DContext::instance()->d2dDevice()->CreateDeviceContext( @@ -98,7 +97,7 @@ public: } ComPtr<ID2D1DeviceContext> deviceContext; - int refCount; + int refCount = 0; }; QWindowsDirect2DDeviceContext::QWindowsDirect2DDeviceContext(ID2D1DeviceContext *dc) diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp index 4905cc79a0..c8349dc408 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp @@ -74,12 +74,7 @@ public: class Direct2DVersion { private: - Direct2DVersion() - : partOne(0) - , partTwo(0) - , partThree(0) - , partFour(0) - {} + Direct2DVersion() = default; Direct2DVersion(int one, int two, int three, int four) : partOne(one) @@ -170,7 +165,10 @@ public: return a - b; } - int partOne, partTwo, partThree, partFour; + int partOne = 0; + int partTwo = 0; + int partThree = 0; + int partFour = 0; }; QWindowsDirect2DIntegration *QWindowsDirect2DIntegration::create(const QStringList ¶mList) diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp index 5a73145e63..730f91ece3 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp @@ -138,14 +138,6 @@ static QVector<D2D1_GRADIENT_STOP> qGradientStopsToD2DStops(const QGradientStops class Direct2DPathGeometryWriter { public: - Direct2DPathGeometryWriter() - : m_inFigure(false) - , m_roundCoordinates(false) - , m_adjustPositivelySlopedLines(false) - { - - } - bool begin() { HRESULT hr = factory()->CreatePathGeometry(&m_geometry); @@ -249,9 +241,9 @@ private: ComPtr<ID2D1PathGeometry1> m_geometry; ComPtr<ID2D1GeometrySink> m_sink; - bool m_inFigure; - bool m_roundCoordinates; - bool m_adjustPositivelySlopedLines; + bool m_inFigure = false; + bool m_roundCoordinates = false; + bool m_adjustPositivelySlopedLines = false; QPointF m_previousPoint; }; @@ -272,7 +264,6 @@ class QWindowsDirect2DPaintEnginePrivate : public QPaintEngineExPrivate public: QWindowsDirect2DPaintEnginePrivate(QWindowsDirect2DBitmap *bm, QWindowsDirect2DPaintEngine::Flags flags) : bitmap(bm) - , clipFlags(0) , flags(flags) { pen.reset(); @@ -284,7 +275,7 @@ public: QWindowsDirect2DBitmap *bitmap; QImage fallbackImage; - unsigned int clipFlags; + unsigned int clipFlags = 0; QStack<ClipType> pushedClips; QWindowsDirect2DPaintEngine::Flags flags; diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.cpp index e7e2fa4ff7..65e056d312 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.cpp @@ -57,15 +57,12 @@ public: : owns_bitmap(true) , bitmap(new QWindowsDirect2DBitmap) , device(new QWindowsDirect2DPaintDevice(bitmap, QInternal::Pixmap)) - , devicePixelRatio(1.0) {} QWindowsDirect2DPlatformPixmapPrivate(QWindowsDirect2DBitmap *bitmap, QWindowsDirect2DPaintEngine::Flags flags) - : owns_bitmap(false) - , bitmap(bitmap) + : bitmap(bitmap) , device(new QWindowsDirect2DPaintDevice(bitmap, QInternal::Pixmap, flags)) - , devicePixelRatio(1.0) {} ~QWindowsDirect2DPlatformPixmapPrivate() @@ -74,10 +71,10 @@ public: delete bitmap; } - bool owns_bitmap; + bool owns_bitmap = false; QWindowsDirect2DBitmap *bitmap; QScopedPointer<QWindowsDirect2DPaintDevice> device; - qreal devicePixelRatio; + qreal devicePixelRatio = 1.0; }; static int qt_d2dpixmap_serno = 0; diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp index 9c325f6b86..b5543b7c37 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE QWindowsDirect2DWindow::QWindowsDirect2DWindow(QWindow *window, const QWindowsWindowData &data) : QWindowsWindow(window, data) - , m_needsFullFlush(true) , m_directRendering(!(data.flags & Qt::FramelessWindowHint && window->format().hasAlpha())) { if (window->type() == Qt::Desktop) diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h index 2da0e5f507..156d4660d1 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h @@ -74,8 +74,8 @@ private: Microsoft::WRL::ComPtr<ID2D1DeviceContext> m_deviceContext; QScopedPointer<QWindowsDirect2DBitmap> m_bitmap; QScopedPointer<QPixmap> m_pixmap; - bool m_needsFullFlush; - bool m_directRendering; + bool m_needsFullFlush = true; + bool m_directRendering = false; }; QT_END_NAMESPACE |