diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2017-12-01 10:48:23 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2017-12-04 16:13:08 +0000 |
commit | 2536567b18ed9455cef485c0ef95ae36a70a502c (patch) | |
tree | 45258cd1b4d62d9565ece00f192c7f736b09282f | |
parent | 45cbaf2a8158f5972e3362f7e777d3263d7c7916 (diff) | |
download | qtmultimedia-2536567b18ed9455cef485c0ef95ae36a70a502c.tar.gz |
Port away from QRegion::rects()
Use begin()/end() instead.
Change-Id: Ifa17458190186b987533bd705717ddaec5fc94d4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp index 2f5c16d5e..7ee3eb541 100644 --- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp +++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp @@ -102,7 +102,7 @@ void VideoWidget::paintEvent(QPaintEvent *event) QBrush brush = palette().background(); - foreach (const QRect &rect, region.rects()) + for (const QRect &rect : region) painter.fillRect(rect, brush); } diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index c43f7a006..9a01c73aa 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -237,10 +237,8 @@ void QRendererVideoWidgetBackend::paintEvent(QPaintEvent *event) QBrush brush = m_widget->palette().window(); - QVector<QRect> rects = borderRegion.rects(); - for (QVector<QRect>::iterator it = rects.begin(), end = rects.end(); it != end; ++it) { - painter.fillRect(*it, brush); - } + for (const QRect &r : borderRegion) + painter.fillRect(r, brush); } if (m_surface->isActive() && m_boundingRect.intersects(event->rect())) { |