diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-09-20 17:38:02 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-09-22 18:57:08 +0200 |
| commit | fb8c7953026e12cf97150b5397bdfb9e32d1ca5b (patch) | |
| tree | d1395b953cd349064b35b56aa65ef86f79851e55 | |
| parent | 8c2f0ac3827e765dfd31711ad576b396df7df467 (diff) | |
QTransform: initialize the d member
Although never used, the d member triggers all sorts of warnings
when copying a QTransform around because it's technically
undefined behavior (reading from an uninitialized variable).
Change-Id: If06b6bea6f0ec0623c38ba330d46958b373cdc65
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| -rw-r--r-- | src/gui/painting/qtransform.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qtransform.h | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 30673d90fe..c79a77cc63 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -258,6 +258,7 @@ QTransform::QTransform() , m_13(0), m_23(0), m_33(1) , m_type(TxNone) , m_dirty(TxNone) + , d(Q_NULLPTR) { } @@ -276,6 +277,7 @@ QTransform::QTransform(qreal h11, qreal h12, qreal h13, , m_13(h13), m_23(h23), m_33(h33) , m_type(TxNone) , m_dirty(TxProject) + , d(Q_NULLPTR) { } @@ -292,6 +294,7 @@ QTransform::QTransform(qreal h11, qreal h12, qreal h21, , m_13(0), m_23(0), m_33(1) , m_type(TxNone) , m_dirty(TxShear) + , d(Q_NULLPTR) { } @@ -307,6 +310,7 @@ QTransform::QTransform(const QMatrix &mtx) m_13(0), m_23(0), m_33(1) , m_type(TxNone) , m_dirty(TxShear) + , d(Q_NULLPTR) { } diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index 060362f63e..25b0e7c2fa 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -162,12 +162,18 @@ private: : affine(h11, h12, h21, h22, h31, h32, true) , m_13(h13), m_23(h23), m_33(h33) , m_type(TxNone) - , m_dirty(TxProject) {} + , m_dirty(TxProject) + , d(Q_NULLPTR) + { + } inline QTransform(bool) : affine(true) , m_13(0), m_23(0), m_33(1) , m_type(TxNone) - , m_dirty(TxNone) {} + , m_dirty(TxNone) + , d(Q_NULLPTR) + { + } inline TransformationType inline_type() const; QMatrix affine; qreal m_13; |