diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-18 16:22:46 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-20 05:40:59 +0000 |
| commit | 3dcc075f4a5efce348a6fa00cf5a0adef97b1089 (patch) | |
| tree | 5739f64af10ac72ad4fb147f7fdcb92b440a8622 /src/gui/painting/qregion.h | |
| parent | 870964895baadd013570d626d9e8ebc9d57fee94 (diff) | |
Move Q_REQUIRED_RESULT to its correct position
That's before the return type or static, inline, constexpr or such
keywords (if any).
Perl Script:
s/^(\s+)(.*) Q_REQUIRED_RESULT(;)?(\s*\/\/.*)?$/\1Q_REQUIRED_RESULT \2\3\4/
Change-Id: I7814054a102a407d876ffffd14b6a16182f159e2
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/painting/qregion.h')
| -rw-r--r-- | src/gui/painting/qregion.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index 4f0a071da8..8dd7649447 100644 --- a/src/gui/painting/qregion.h +++ b/src/gui/painting/qregion.h @@ -99,23 +99,23 @@ public: void translate(int dx, int dy); inline void translate(const QPoint &p) { translate(p.x(), p.y()); } - QRegion translated(int dx, int dy) const Q_REQUIRED_RESULT; - inline QRegion translated(const QPoint &p) const Q_REQUIRED_RESULT { return translated(p.x(), p.y()); } + Q_REQUIRED_RESULT QRegion translated(int dx, int dy) const; + Q_REQUIRED_RESULT inline QRegion translated(const QPoint &p) const { return translated(p.x(), p.y()); } - QRegion united(const QRegion &r) const Q_REQUIRED_RESULT; - QRegion united(const QRect &r) const Q_REQUIRED_RESULT; - QRegion intersected(const QRegion &r) const Q_REQUIRED_RESULT; - QRegion intersected(const QRect &r) const Q_REQUIRED_RESULT; - QRegion subtracted(const QRegion &r) const Q_REQUIRED_RESULT; - QRegion xored(const QRegion &r) const Q_REQUIRED_RESULT; + Q_REQUIRED_RESULT QRegion united(const QRegion &r) const; + Q_REQUIRED_RESULT QRegion united(const QRect &r) const; + Q_REQUIRED_RESULT QRegion intersected(const QRegion &r) const; + Q_REQUIRED_RESULT QRegion intersected(const QRect &r) const; + Q_REQUIRED_RESULT QRegion subtracted(const QRegion &r) const; + Q_REQUIRED_RESULT QRegion xored(const QRegion &r) const; #if QT_DEPRECATED_SINCE(5, 0) - inline QT_DEPRECATED QRegion unite(const QRegion &r) const Q_REQUIRED_RESULT { return united(r); } - inline QT_DEPRECATED QRegion unite(const QRect &r) const Q_REQUIRED_RESULT { return united(r); } - inline QT_DEPRECATED QRegion intersect(const QRegion &r) const Q_REQUIRED_RESULT { return intersected(r); } - inline QT_DEPRECATED QRegion intersect(const QRect &r) const Q_REQUIRED_RESULT { return intersected(r); } - inline QT_DEPRECATED QRegion subtract(const QRegion &r) const Q_REQUIRED_RESULT { return subtracted(r); } - inline QT_DEPRECATED QRegion eor(const QRegion &r) const Q_REQUIRED_RESULT { return xored(r); } + Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion unite(const QRegion &r) const { return united(r); } + Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion unite(const QRect &r) const { return united(r); } + Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion intersect(const QRegion &r) const { return intersected(r); } + Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion intersect(const QRect &r) const { return intersected(r); } + Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion subtract(const QRegion &r) const { return subtracted(r); } + Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion eor(const QRegion &r) const { return xored(r); } #endif bool intersects(const QRegion &r) const; |