diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-04-20 09:15:56 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-04-23 10:55:47 +0000 |
| commit | 2ddad99979f19ad731b29fd4de6ff7c673068440 (patch) | |
| tree | 5a199aef828432f372b070c86e323473363b84dd /src/gui/painting | |
| parent | e81ba336e9f1a44080fc9a8419fcbac40615bdc2 (diff) | |
QRegion: mark boundingRect() and rectCount() nothrow
With this, the operations usually called when inspecting
a QRegion are now all nothrow (when using begin()/end()
instead of rects()).
Change-Id: I7012be2ac2350ab7d14dae58df3b8fe4956233db
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qregion.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qregion.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index b70257a00f..abdfc7c8c7 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -4288,7 +4288,7 @@ QRegion QRegion::xored(const QRegion &r) const } } -QRect QRegion::boundingRect() const +QRect QRegion::boundingRect() const Q_DECL_NOTHROW { if (isEmpty()) return QRect(); @@ -4386,7 +4386,7 @@ void QRegion::setRects(const QRect *rects, int num) } } -int QRegion::rectCount() const +int QRegion::rectCount() const Q_DECL_NOTHROW { return (d->qt_rgn ? d->qt_rgn->numRects : 0); } diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index f00b1fd284..3bf1a5268c 100644 --- a/src/gui/painting/qregion.h +++ b/src/gui/painting/qregion.h @@ -120,10 +120,10 @@ public: bool intersects(const QRegion &r) const; bool intersects(const QRect &r) const; - QRect boundingRect() const; + QRect boundingRect() const Q_DECL_NOTHROW; QVector<QRect> rects() const; void setRects(const QRect *rect, int num); - int rectCount() const; + int rectCount() const Q_DECL_NOTHROW; #ifdef Q_COMPILER_MANGLES_RETURN_TYPE // ### Qt 6: remove these, they're kept for MSVC compat const QRegion operator|(const QRegion &r) const; |