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

QPageSize: 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: If1ffa9dc2a018e402c884f60bfbc82e799daeb92
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 6115ba4f4e
commit 9f924338a8
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1255,15 +1255,18 @@ QPageSize &QPageSize::operator=(const QPageSize &other)
*/ */
/*! /*!
Returns \c true if this page is equal to the \a other page, i.e. if the \relates QPageSize
page has the same attributes. Current attributes are size and name.
Returns \c true if page size \a lhs is equal to page size \a rhs,
i.e. if the page sizes have the same attributes. Current
attributes are size and name.
*/ */
bool QPageSize::operator==(const QPageSize &other) const bool operator==(const QPageSize &lhs, const QPageSize &rhs)
{ {
if (d == other.d) if (lhs.d == rhs.d)
return true; return true;
return d && other.d && *d == *other.d; return lhs.d && rhs.d && *lhs.d == *rhs.d;
} }
/*! /*!

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

@ -246,7 +246,7 @@ public:
void swap(QPageSize &other) { d.swap(other.d); } void swap(QPageSize &other) { d.swap(other.d); }
bool operator==(const QPageSize &other) const; friend Q_GUI_EXPORT bool operator==(const QPageSize &lhs, const QPageSize &rhs);
bool isEquivalentTo(const QPageSize &other) const; bool isEquivalentTo(const QPageSize &other) const;
bool isValid() const; bool isValid() const;
@ -298,6 +298,8 @@ private:
Q_DECLARE_SHARED(QPageSize) Q_DECLARE_SHARED(QPageSize)
Q_GUI_EXPORT bool operator==(const QPageSize &lhs, const QPageSize &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);
#endif #endif