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

QPageLayout: make op== non-member

Browse Source 
Better style, since it treats the left-hand and right-hand size symmetrically,
e.g. for implicit conversions.

Change-Id: Ib5d39b1ebffffcb664ee2f72c756702469e32d3b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2014-04-04 23:59:37 +02:00 committed by The Qt Project
parent 0de0f494bd
commit 4bed03eb85
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/painting/qpagelayout.cpp
View File

@ -424,21 +424,23 @@ QPageLayout &QPageLayout::operator=(const QPageLayout &other)
*/
/*!
Returns \c true if this page layout is equal to the \a other page layout,
\relates QPageLayout
Returns \c true if page layout \a lhs is equal to page layout \a rhs,
i.e. if all the attributes are exactly equal.
Note that this is a strict equality, especially for page size where the
QPageSize ID, name and size must exactly match, and the margins where the
units must match.
\sa isEquivalentTo()
\sa QPageLayout::isEquivalentTo()
*/
bool QPageLayout::operator==(const QPageLayout &other) const
bool operator==(const QPageLayout &lhs, const QPageLayout &rhs)
{
if (d && other.d)
return (*d == *other.d);
return (d == other.d);
if (lhs.d && rhs.d)
return (*lhs.d == *rhs.d);
return (lhs.d == rhs.d);
}
/*!

4
src/gui/painting/qpagelayout.h
View File

@ -92,7 +92,7 @@ public:
void swap(QPageLayout &other) { d.swap(other.d); }
bool operator==(const QPageLayout &other) const;
friend Q_GUI_EXPORT bool operator==(const QPageLayout &lhs, const QPageLayout &rhs);
bool isEquivalentTo(const QPageLayout &other) const;
bool isValid() const;
@ -142,6 +142,8 @@ private:
Q_DECLARE_SHARED(QPageLayout)
Q_GUI_EXPORT bool operator==(const QPageLayout &lhs, const QPageLayout &rhs);
#ifndef QT_NO_DEBUG_STREAM
Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageLayout &pageLayout);
#endif