diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-12-01 10:45:53 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-12-04 16:13:07 +0000 |
| commit | a3a8dd0bf97f77368f5f0262b94115875bd0669e (patch) | |
| tree | 9c79ca7ea16ac9d9b71e97f5e1b054b5a0246152 | |
| parent | 5471abc9284952c701206fb47a5bcdc5c66d07be (diff) | |
Port away from QRegion::rects()
Use begin()/end() instead.
Drop the special handling of rectCount() == 1, since with begin()/end(),
we no longer take the hit of creating a QVector just to be able to return
it from rects().
Change-Id: I4c03e10f7a8bfea87cb04aed7b87410991020a89
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/activeqt/shared/qaxutils.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/activeqt/shared/qaxutils.cpp b/src/activeqt/shared/qaxutils.cpp index bf5b99b..c41b321 100644 --- a/src/activeqt/shared/qaxutils.cpp +++ b/src/activeqt/shared/qaxutils.cpp @@ -99,14 +99,8 @@ static void addRectToHrgn(HRGN &winRegion, const QRect &r) HRGN qaxHrgnFromQRegion(QRegion region, const QWindow *window) { - region = QHighDpi::toNativeLocalRegion(region, window); HRGN hRegion = CreateRectRgn(0, 0, 0, 0); - if (region.rectCount() == 1) { - addRectToHrgn(hRegion, region.boundingRect()); - return hRegion; - } - const QVector<QRect> &rects = region.rects(); - for (const QRect &rect : rects) + for (const QRect &rect : QHighDpi::toNativeLocalRegion(region, window)) addRectToHrgn(hRegion, rect); return hRegion; } |