diff options
| author | John Layt <jlayt@kde.org> | 2014-02-14 01:45:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-21 20:33:10 +0100 |
| commit | db352e1e97a0eb38cb5756f264b3162efeb86c02 (patch) | |
| tree | 2d8242b8103619ed777cafd1b9f9c829d85c4e08 /src/corelib/tools/qmargins.h | |
| parent | b9feb884664aa8869ebfafbd8b3a8c65f668574e (diff) | |
QRect - Move QMargins operators
Move QMargins operators to QRect file, change include sequence.
Change-Id: I0e2ad91859ae65eb67c6ece50f8e4037516b463e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/corelib/tools/qmargins.h')
| -rw-r--r-- | src/corelib/tools/qmargins.h | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h index ad5e94cefe..6bffa544c1 100644 --- a/src/corelib/tools/qmargins.h +++ b/src/corelib/tools/qmargins.h @@ -42,7 +42,7 @@ #ifndef QMARGINS_H #define QMARGINS_H -#include <QtCore/qrect.h> +#include <QtCore/qnamespace.h> QT_BEGIN_NAMESPACE @@ -149,41 +149,6 @@ Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &m1, const QMargins &m2) m1.m_bottom != m2.m_bottom; } -Q_DECL_CONSTEXPR inline QRect operator+(const QRect &rectangle, const QMargins &margins) -{ - return QRect(QPoint(rectangle.left() - margins.left(), rectangle.top() - margins.top()), - QPoint(rectangle.right() + margins.right(), rectangle.bottom() + margins.bottom())); -} - -Q_DECL_CONSTEXPR inline QRect operator+(const QMargins &margins, const QRect &rectangle) -{ - return QRect(QPoint(rectangle.left() - margins.left(), rectangle.top() - margins.top()), - QPoint(rectangle.right() + margins.right(), rectangle.bottom() + margins.bottom())); -} - -inline QRect QRect::marginsAdded(const QMargins &margins) const -{ - return *this + margins; -} - -inline QRect QRect::marginsRemoved(const QMargins &margins) const -{ - return QRect(QPoint(x1 + margins.left(), y1 + margins.top()), - QPoint(x2 - margins.right(), y2 - margins.bottom())); -} - -inline QRect &QRect::operator+=(const QMargins &margins) -{ - *this = marginsAdded(margins); - return *this; -} - -inline QRect &QRect::operator-=(const QMargins &margins) -{ - *this = marginsRemoved(margins); - return *this; -} - Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &m1, const QMargins &m2) { return QMargins(m1.left() + m2.left(), m1.top() + m2.top(), |