From 9c6447e0815a18102e5ebe236c52ba4343dbb8fa Mon Sep 17 00:00:00 2001
From: John Layt <jlayt@kde.org>
Date: Fri, 14 Feb 2014 15:23:47 +0100
Subject: [PATCH] QMargins - Add missing operators

Add missing standard operators.

[ChangeLog][QtCore][QMargins] Added missing addition and subtraction
operators.

Change-Id: I6aeed39531a736c12d378a817a9431279da79bc4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/corelib/tools/qmargins.cpp                | 45 +++++++++++++++++++
 src/corelib/tools/qmargins.h                  | 23 ++++++++++
 .../corelib/tools/qmargins/tst_qmargins.cpp   |  7 +++
 3 files changed, 75 insertions(+)

diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp
index 06f41a67372..7d8a167a88f 100644
--- a/src/corelib/tools/qmargins.cpp
+++ b/src/corelib/tools/qmargins.cpp
@@ -181,6 +181,42 @@ QT_BEGIN_NAMESPACE
     \since 5.1
 */
 
+/*!
+    \fn const QMargins operator+(const QMargins &lhs, int rhs)
+    \relates QMargins
+
+    Returns a QMargins object that is formed by adding \a rhs to
+    \a lhs.
+
+    \sa QMargins::operator+=(), QMargins::operator-=()
+
+    \since 5.3
+*/
+
+/*!
+    \fn const QMargins operator+(int lhs, const QMargins &rhs)
+    \relates QMargins
+
+    Returns a QMargins object that is formed by adding \a lhs to
+    \a rhs.
+
+    \sa QMargins::operator+=(), QMargins::operator-=()
+
+    \since 5.3
+*/
+
+/*!
+    \fn const QMargins operator-(const QMargins &lhs, int rhs)
+    \relates QMargins
+
+    Returns a QMargins object that is formed by subtracting \a rhs from
+    \a lhs.
+
+    \sa QMargins::operator+=(), QMargins::operator-=()
+
+    \since 5.3
+*/
+
 /*!
     \fn const QMargins operator*(const QMargins &margins, int factor)
     \relates QMargins
@@ -257,6 +293,15 @@ QT_BEGIN_NAMESPACE
     \since 5.1
 */
 
+/*!
+    \fn QMargins operator+(const QMargins &margins)
+    \relates QMargins
+
+    Returns a QMargin object that is formed from all components of \a margins.
+
+    \since 5.3
+*/
+
 /*!
     \fn QMargins operator-(const QMargins &margins)
     \relates QMargins
diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h
index 6bffa544c15..55355ac8593 100644
--- a/src/corelib/tools/qmargins.h
+++ b/src/corelib/tools/qmargins.h
@@ -161,6 +161,24 @@ Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &m1, const QMargins &m
                     m1.right() - m2.right(), m1.bottom() - m2.bottom());
 }
 
+Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &lhs, int rhs)
+{
+    return QMargins(lhs.left() + rhs, lhs.top() + rhs,
+                    lhs.right() + rhs, lhs.bottom() + rhs);
+}
+
+Q_DECL_CONSTEXPR inline QMargins operator+(int lhs, const QMargins &rhs)
+{
+    return QMargins(rhs.left() + lhs, rhs.top() + lhs,
+                    rhs.right() + lhs, rhs.bottom() + lhs);
+}
+
+Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &lhs, int rhs)
+{
+    return QMargins(lhs.left() - rhs, lhs.top() - rhs,
+                    lhs.right() - rhs, lhs.bottom() - rhs);
+}
+
 Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, int factor)
 {
     return QMargins(margins.left() * factor, margins.top() * factor,
@@ -245,6 +263,11 @@ inline QMargins &QMargins::operator/=(qreal divisor)
     return *this = *this / divisor;
 }
 
+Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &margins)
+{
+    return margins;
+}
+
 Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &margins)
 {
     return QMargins(-margins.left(), -margins.top(), -margins.right(), -margins.bottom());
diff --git a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
index ec837401962..d49e0efe433 100644
--- a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
+++ b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
@@ -123,6 +123,13 @@ void tst_QMargins::operators()
     QCOMPARE(a, halved);
 
     QCOMPARE(m1 + (-m1), QMargins());
+
+    QMargins m3 = QMargins(10, 11, 12, 13);
+    QCOMPARE(m3 + 1, QMargins(11, 12, 13, 14));
+    QCOMPARE(1 + m3, QMargins(11, 12, 13, 14));
+    QCOMPARE(m3 - 1, QMargins(9, 10, 11, 12));
+    QCOMPARE(+m3, QMargins(10, 11, 12, 13));
+    QCOMPARE(-m3, QMargins(-10, -11, -12, -13));
 }
 
 // Testing QDataStream operators