diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-10 11:26:23 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-10 11:26:23 (GMT) |
| commit | 53632d45ca64ad4c20d4302e0826c0234877dd69 (patch) | |
| tree | 44bfb141f7b699f53a9f775c18cafa8e2931c7b8 | |
| parent | 8b75843c44df306cf5003980f4563d0759dffe7e (diff) | |
| download | Qt-53632d45ca64ad4c20d4302e0826c0234877dd69.zip Qt-53632d45ca64ad4c20d4302e0826c0234877dd69.tar.gz Qt-53632d45ca64ad4c20d4302e0826c0234877dd69.tar.bz2 | |
Revert "implement equality operator in a more sane way"
This reverts commit 07dca7a30d4bd1efd8032915700420cca3fd60fa.
Move the equality operator code back in (qFuzzyCompare) to avoid
breaking many autotests. The change should go back in later on,
possibly supplemented by a qFuzzyCompare(QTransform) function.
But until we can figure out how to not break everything this
patch has to wait.
Reviewed-by: Lars
| -rw-r--r-- | src/gui/painting/qtransform.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index bd2ea31..86e594c 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -700,15 +700,11 @@ QTransform & QTransform::rotateRadians(qreal a, Qt::Axis axis) */ bool QTransform::operator==(const QTransform &o) const { - return affine._m11 == o.affine._m11 && - affine._m12 == o.affine._m12 && - affine._m21 == o.affine._m21 && - affine._m22 == o.affine._m22 && - affine._dx == o.affine._dx && - affine._dy == o.affine._dy && - m_13 == o.m_13 && - m_23 == o.m_23 && - m_33 == o.m_33; +#define qFZ qFuzzyCompare + return qFZ(affine._m11, o.affine._m11) && qFZ(affine._m12, o.affine._m12) && qFZ(m_13, o.m_13) + && qFZ(affine._m21, o.affine._m21) && qFZ(affine._m22, o.affine._m22) && qFZ(m_23, o.m_23) + && qFZ(affine._dx, o.affine._dx) && qFZ(affine._dy, o.affine._dy) && qFZ(m_33, o.m_33); +#undef qFZ } /*! |