From 93f558a0cf6681d722de5f9c91738c6c483ebe7f Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 30 Oct 2020 16:44:42 +0100 Subject: [PATCH] Remove usages of Q_FOREACH The last places outside tests, tools and qnx platform code Change-Id: I9918861888cf58bf5dbae5603febb8885fc67709 Reviewed-by: Volker Hilsheimer --- .../deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp | 10 +++++----- src/widgets/kernel/qwidget.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp index b6d2a17079..52db076b74 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp @@ -112,7 +112,7 @@ QEglFSKmsGbmCursor::~QEglFSKmsGbmCursor() { delete m_deviceListener; - Q_FOREACH (QPlatformScreen *screen, m_screen->virtualSiblings()) { + for (QPlatformScreen *screen : m_screen->virtualSiblings()) { QEglFSKmsScreen *kmsScreen = static_cast(screen); drmModeSetCursor(kmsScreen->device()->fd(), kmsScreen->output().crtc_id, 0, 0, 0); drmModeMoveCursor(kmsScreen->device()->fd(), kmsScreen->output().crtc_id, 0, 0); @@ -164,7 +164,7 @@ void QEglFSKmsGbmCursor::changeCursor(QCursor *windowCursor, QWindow *window) if (m_state == CursorPendingHidden) { m_state = CursorHidden; - Q_FOREACH (QPlatformScreen *screen, m_screen->virtualSiblings()) { + for (QPlatformScreen *screen : m_screen->virtualSiblings()) { QEglFSKmsScreen *kmsScreen = static_cast(screen); drmModeSetCursor(kmsScreen->device()->fd(), kmsScreen->output().crtc_id, 0, 0, 0); } @@ -213,7 +213,7 @@ void QEglFSKmsGbmCursor::changeCursor(QCursor *windowCursor, QWindow *window) if (m_state == CursorPendingVisible) m_state = CursorVisible; - Q_FOREACH (QPlatformScreen *screen, m_screen->virtualSiblings()) { + for (QPlatformScreen *screen : m_screen->virtualSiblings()) { QEglFSKmsScreen *kmsScreen = static_cast(screen); if (kmsScreen->isCursorOutOfRange()) continue; @@ -232,7 +232,7 @@ QPoint QEglFSKmsGbmCursor::pos() const void QEglFSKmsGbmCursor::setPos(const QPoint &pos) { - Q_FOREACH (QPlatformScreen *screen, m_screen->virtualSiblings()) { + for (QPlatformScreen *screen : m_screen->virtualSiblings()) { QEglFSKmsScreen *kmsScreen = static_cast(screen); const QRect screenGeom = kmsScreen->geometry(); const QPoint origin = screenGeom.topLeft(); @@ -277,7 +277,7 @@ void QEglFSKmsGbmCursor::initCursorAtlas() QFile file(QString::fromUtf8(json)); if (!file.open(QFile::ReadOnly)) { - Q_FOREACH (QPlatformScreen *screen, m_screen->virtualSiblings()) { + for (QPlatformScreen *screen : m_screen->virtualSiblings()) { QEglFSKmsScreen *kmsScreen = static_cast(screen); drmModeSetCursor(kmsScreen->device()->fd(), kmsScreen->output().crtc_id, 0, 0, 0); drmModeMoveCursor(kmsScreen->device()->fd(), kmsScreen->output().crtc_id, 0, 0); diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 28a3c870c2..99b1e1452c 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -10553,7 +10553,7 @@ void QWidgetPrivate::setParent_sys(QWidget *newparent, Qt::WindowFlags f) if (QWidget *npw = newparent->nativeParentWidget()) newParentWindow = npw->windowHandle(); - Q_FOREACH (QObject *child, q->windowHandle()->children()) { + for (QObject *child : q->windowHandle()->children()) { QWindow *childWindow = qobject_cast(child); if (!childWindow) continue;