summaryrefslogtreecommitdiffstats
path: root/src/core/transforms
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2015-01-13 12:46:56 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-01-13 13:26:07 +0100
commit159409f39034b24647c0ea4c91f98fed491f16bb (patch)
treebd15fba739297419c5532cf46ab20265bba50b56 /src/core/transforms
parentb90d8c04569d22fa68f740049a43717f998776ce (diff)
Make QTransform::applyTransforms private.
Change-Id: If84c0aec1230eaabdf3fa01b65745eb9ce26e587 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/transforms')
-rw-r--r--src/core/transforms/qtransform.cpp19
-rw-r--r--src/core/transforms/qtransform.h1
-rw-r--r--src/core/transforms/qtransform_p.h2
3 files changed, 11 insertions, 11 deletions
diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index ace25c0b8..67ddd9dc6 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -98,11 +98,19 @@ void QTransformPrivate::_q_update()
emit static_cast<QTransform *>(q_ptr)->matrixChanged();
}
+QMatrix4x4 QTransformPrivate::applyTransforms() const
+{
+ QMatrix4x4 m;
+ Q_FOREACH (const QAbstractTransform *t, m_transforms)
+ m = t->transformMatrix() * m;
+ return m;
+}
+
QMatrix4x4 QTransform::matrix() const
{
Q_D(const QTransform);
if (d->m_transformsDirty) {
- d->m_matrix = applyTransforms();
+ d->m_matrix = d->applyTransforms();
d->m_transformsDirty = false;
}
return d->m_matrix;
@@ -146,15 +154,6 @@ void QTransform::removeTransform(QAbstractTransform *transform)
d->_q_update();
}
-QMatrix4x4 QTransform::applyTransforms() const
-{
- Q_D(const QTransform);
- QMatrix4x4 m;
- Q_FOREACH (const QAbstractTransform *t, d->m_transforms)
- m = t->transformMatrix() * m;
- return m;
-}
-
QList<QAbstractTransform *> QTransform::transformList() const
{
Q_D(const QTransform);
diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h
index 78bdb8009..b33c27c90 100644
--- a/src/core/transforms/qtransform.h
+++ b/src/core/transforms/qtransform.h
@@ -86,7 +86,6 @@ private:
Q_DECLARE_PRIVATE(QTransform)
QT3D_CLONEABLE(QTransform)
Q_PRIVATE_SLOT(d_func(), void _q_update())
- QMatrix4x4 applyTransforms() const;
};
} // namespace Qt3D
diff --git a/src/core/transforms/qtransform_p.h b/src/core/transforms/qtransform_p.h
index 43dd4db3b..8a82f2c53 100644
--- a/src/core/transforms/qtransform_p.h
+++ b/src/core/transforms/qtransform_p.h
@@ -64,6 +64,8 @@ public:
mutable QMatrix4x4 m_matrix;
QMatrix4x4 m_sceneMatrix;
+ QMatrix4x4 applyTransforms() const;
+
private:
void _q_update();
};