diff options
Diffstat (limited to 'src/gui/painting/qregion.cpp')
| -rw-r--r-- | src/gui/painting/qregion.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index 68338602e2..cf947630bc 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -3930,7 +3930,7 @@ void QRegion::translate(int dx, int dy) OffsetRegion(*d->qt_rgn, dx, dy); } -QRegion QRegion::unite(const QRegion &r) const +QRegion QRegion::united(const QRegion &r) const { if (isEmptyHelper(d->qt_rgn)) return r; @@ -3993,7 +3993,7 @@ QRegion& QRegion::operator+=(const QRegion &r) } } -QRegion QRegion::unite(const QRect &r) const +QRegion QRegion::united(const QRect &r) const { if (isEmptyHelper(d->qt_rgn)) return r; @@ -4054,7 +4054,7 @@ QRegion& QRegion::operator+=(const QRect &r) } } -QRegion QRegion::intersect(const QRegion &r) const +QRegion QRegion::intersected(const QRegion &r) const { if (isEmptyHelper(d->qt_rgn) || isEmptyHelper(r.d->qt_rgn) || !EXTENTCHECK(&d->qt_rgn->extents, &r.d->qt_rgn->extents)) @@ -4099,7 +4099,7 @@ QRegion QRegion::intersect(const QRegion &r) const return result; } -QRegion QRegion::intersect(const QRect &r) const +QRegion QRegion::intersected(const QRect &r) const { if (isEmptyHelper(d->qt_rgn) || r.isEmpty() || !EXTENTCHECK(&d->qt_rgn->extents, &r)) @@ -4125,7 +4125,7 @@ QRegion QRegion::intersect(const QRect &r) const return result; } -QRegion QRegion::subtract(const QRegion &r) const +QRegion QRegion::subtracted(const QRegion &r) const { if (isEmptyHelper(d->qt_rgn) || isEmptyHelper(r.d->qt_rgn)) return *this; @@ -4150,7 +4150,7 @@ QRegion QRegion::subtract(const QRegion &r) const return result; } -QRegion QRegion::eor(const QRegion &r) const +QRegion QRegion::xored(const QRegion &r) const { if (isEmptyHelper(d->qt_rgn)) { return r; |