From 22afdaa2dadc9ef610cbb9c69755ca589fbf907b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 5 Apr 2014 00:00:15 +0200 Subject: [PATCH] QPageSize: provide op!= For consistency. Change-Id: I4375a6f8c2514479a7479c735d397bf8a9876db1 Reviewed-by: Friedemann Kleint Reviewed-by: John Layt --- src/gui/painting/qpagesize.cpp | 8 ++++++++ src/gui/painting/qpagesize.h | 2 ++ tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp | 3 +++ 3 files changed, 13 insertions(+) diff --git a/src/gui/painting/qpagesize.cpp b/src/gui/painting/qpagesize.cpp index 9cf7f192e89..60ca69d1f2a 100644 --- a/src/gui/painting/qpagesize.cpp +++ b/src/gui/painting/qpagesize.cpp @@ -1268,6 +1268,14 @@ bool operator==(const QPageSize &lhs, const QPageSize &rhs) return true; return lhs.d && rhs.d && *lhs.d == *rhs.d; } +/*! + \fn bool operator!=(const QPageSize &lhs, const QPageSize &rhs) + \relates QPageSize + + Returns \c true if page size \a lhs is unequal to page size \a + rhs, i.e. if the page size has different attributes. Current + attributes are size and name. +*/ /*! Returns \c true if this page is equivalent to the \a other page, i.e. if the diff --git a/src/gui/painting/qpagesize.h b/src/gui/painting/qpagesize.h index d228f05a4a9..8205d2eae4f 100644 --- a/src/gui/painting/qpagesize.h +++ b/src/gui/painting/qpagesize.h @@ -299,6 +299,8 @@ private: Q_DECLARE_SHARED(QPageSize) Q_GUI_EXPORT bool operator==(const QPageSize &lhs, const QPageSize &rhs); +inline bool operator!=(const QPageSize &lhs, const QPageSize &rhs) +{ return !operator==(lhs, rhs); } #ifndef QT_NO_DEBUG_STREAM Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageSize &pageSize); diff --git a/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp b/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp index 968c5ff6174..c54f2350e5a 100644 --- a/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp +++ b/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp @@ -137,10 +137,13 @@ void tst_QPageSize::basics() // Comparisons QCOMPARE((a4 == folio), false); + QCOMPARE((a4 != folio), true); QCOMPARE((a4.isEquivalentTo(folio)), false); QCOMPARE((a4 == a4b), true); + QCOMPARE((a4 != a4b), false); QCOMPARE((a4.isEquivalentTo(a4b)), true); QCOMPARE((folio == folio2), false); // Name different + QCOMPARE((folio != folio2), true); // Name different QCOMPARE((folio.isEquivalentTo(folio2)), true); // Simple QSize in Millimeters