1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPageSize: provide op!=

Browse Source 
For consistency.

Change-Id: I4375a6f8c2514479a7479c735d397bf8a9876db1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
This commit is contained in:
Marc Mutz 2014-04-05 00:00:15 +02:00 committed by The Qt Project
parent 9f924338a8
commit 22afdaa2da
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/painting/qpagesize.cpp
View File

@ -1268,6 +1268,14 @@ bool operator==(const QPageSize &lhs, const QPageSize &rhs)
return true; return true;
return lhs.d && rhs.d && *lhs.d == *rhs.d; 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 Returns \c true if this page is equivalent to the \a other page, i.e. if the

2
src/gui/painting/qpagesize.h
View File

@ -299,6 +299,8 @@ private:
Q_DECLARE_SHARED(QPageSize) Q_DECLARE_SHARED(QPageSize)
Q_GUI_EXPORT bool operator==(const QPageSize &lhs, const QPageSize &rhs); 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 #ifndef QT_NO_DEBUG_STREAM
Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageSize &pageSize); Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageSize &pageSize);

3
tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp
View File

@ -137,10 +137,13 @@ void tst_QPageSize::basics()
// Comparisons // Comparisons
QCOMPARE((a4 == folio), false); QCOMPARE((a4 == folio), false);
QCOMPARE((a4 != folio), true);
QCOMPARE((a4.isEquivalentTo(folio)), false); QCOMPARE((a4.isEquivalentTo(folio)), false);
QCOMPARE((a4 == a4b), true); QCOMPARE((a4 == a4b), true);
QCOMPARE((a4 != a4b), false);
QCOMPARE((a4.isEquivalentTo(a4b)), true); QCOMPARE((a4.isEquivalentTo(a4b)), true);
QCOMPARE((folio == folio2), false); // Name different QCOMPARE((folio == folio2), false); // Name different
QCOMPARE((folio != folio2), true); // Name different
QCOMPARE((folio.isEquivalentTo(folio2)), true); QCOMPARE((folio.isEquivalentTo(folio2)), true);
// Simple QSize in Millimeters // Simple QSize in Millimeters