aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/handlers/qquickpinchhandler_p.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2019-01-25 10:42:45 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2019-01-28 18:31:51 +0000
commitdea0f1b1e69cd313f81dc998e973428161d411e9 (patch)
treec0d5b3c30034ac7821cb2c7e54af0b9ee3be7e00 /src/quick/handlers/qquickpinchhandler_p.h
parent63bbaf837976bae45fdd2766da0ed4cc808cc0ac (diff)
PinchHandler: fix pedantic warnings
- qreal<->float conversions are explicit - use qFuzzyCompare rather than == - remove padding between variables (but the class still needs padding) Change-Id: I9a9eb01f5a4108592b34e4b2f018c720ba19beb0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/handlers/qquickpinchhandler_p.h')
-rw-r--r--src/quick/handlers/qquickpinchhandler_p.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/handlers/qquickpinchhandler_p.h b/src/quick/handlers/qquickpinchhandler_p.h
index 8f24d18166..b9e2cbf48f 100644
--- a/src/quick/handlers/qquickpinchhandler_p.h
+++ b/src/quick/handlers/qquickpinchhandler_p.h
@@ -150,10 +150,9 @@ private:
qreal m_startDistance = 0;
QPointF m_startPos;
qreal m_accumulatedStartCentroidDistance = 0;
-
QVector<PointData> m_startAngles;
- QMatrix4x4 m_startMatrix;
QQuickMatrix4x4 m_transform;
+ QMatrix4x4 m_startMatrix;
};
QT_END_NAMESPACE