aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-10-10 16:03:24 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-10-10 20:05:52 +0000
commitd72cafb2fcc35df22036843ac71054db8650f64d (patch)
tree209aac2b5b2ea50351c9caadf58fbaf00814f07e
parent9cbc5be241bcd8abb0cafc7a7e4b04746e9fe291 (diff)
Platform: fix clazy-range-loop findings
Avoid accidental detach with C++11 range for loops. Change-Id: I2a105ef5a2505d26ee086974177f8f1e4040b522 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/platform/qquickplatformmenu.cpp8
-rw-r--r--src/imports/platform/qquickplatformmenubar.cpp6
-rw-r--r--src/imports/platform/qquickplatformmenuitemgroup.cpp8
3 files changed, 11 insertions, 11 deletions
diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp
index fbef8b8d..82adb6c3 100644
--- a/src/imports/platform/qquickplatformmenu.cpp
+++ b/src/imports/platform/qquickplatformmenu.cpp
@@ -153,7 +153,7 @@ QQuickPlatformMenu::~QQuickPlatformMenu()
m_menuBar->removeMenu(this);
if (m_parentMenu)
m_parentMenu->removeMenu(this);
- for (QQuickPlatformMenuItem *item : m_items) {
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) {
if (QQuickPlatformMenu *subMenu = item->subMenu())
subMenu->setParentMenu(nullptr);
item->setMenu(nullptr);
@@ -197,7 +197,7 @@ QPlatformMenu * QQuickPlatformMenu::create()
connect(m_handle, &QPlatformMenu::aboutToShow, this, &QQuickPlatformMenu::aboutToShow);
connect(m_handle, &QPlatformMenu::aboutToHide, this, &QQuickPlatformMenu::aboutToHide);
- for (QQuickPlatformMenuItem *item : m_items)
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items))
m_handle->insertMenuItem(item->create(), nullptr);
if (m_menuItem) {
@@ -237,7 +237,7 @@ void QQuickPlatformMenu::sync()
m_systemTrayIcon->handle()->updateMenu(m_handle);
#endif
- for (QQuickPlatformMenuItem *item : m_items)
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items))
item->sync();
}
@@ -637,7 +637,7 @@ void QQuickPlatformMenu::clear()
if (m_items.isEmpty())
return;
- for (QQuickPlatformMenuItem *item : m_items) {
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) {
m_data.removeOne(item);
if (m_handle)
m_handle->removeMenuItem(item->handle());
diff --git a/src/imports/platform/qquickplatformmenubar.cpp b/src/imports/platform/qquickplatformmenubar.cpp
index 516bcc3e..4487b9a7 100644
--- a/src/imports/platform/qquickplatformmenubar.cpp
+++ b/src/imports/platform/qquickplatformmenubar.cpp
@@ -117,7 +117,7 @@ QQuickPlatformMenuBar::QQuickPlatformMenuBar(QObject *parent)
QQuickPlatformMenuBar::~QQuickPlatformMenuBar()
{
- for (QQuickPlatformMenu *menu : m_menus)
+ for (QQuickPlatformMenu *menu : qAsConst(m_menus))
menu->setMenuBar(nullptr);
delete m_handle;
m_handle = nullptr;
@@ -235,7 +235,7 @@ void QQuickPlatformMenuBar::clear()
if (m_menus.isEmpty())
return;
- for (QQuickPlatformMenu *menu : m_menus) {
+ for (QQuickPlatformMenu *menu : qAsConst(m_menus)) {
m_data.removeOne(menu);
if (m_handle)
m_handle->removeMenu(menu->handle());
@@ -254,7 +254,7 @@ void QQuickPlatformMenuBar::classBegin()
void QQuickPlatformMenuBar::componentComplete()
{
m_complete = true;
- for (QQuickPlatformMenu *menu : m_menus)
+ for (QQuickPlatformMenu *menu : qAsConst(m_menus))
menu->sync();
if (!m_window)
setWindow(findWindow());
diff --git a/src/imports/platform/qquickplatformmenuitemgroup.cpp b/src/imports/platform/qquickplatformmenuitemgroup.cpp
index af901bb8..f07d0a1b 100644
--- a/src/imports/platform/qquickplatformmenuitemgroup.cpp
+++ b/src/imports/platform/qquickplatformmenuitemgroup.cpp
@@ -164,7 +164,7 @@ void QQuickPlatformMenuItemGroup::setEnabled(bool enabled)
m_enabled = enabled;
emit enabledChanged();
- for (QQuickPlatformMenuItem *item : m_items) {
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) {
if (item->m_enabled) {
item->sync();
emit item->enabledChanged();
@@ -193,7 +193,7 @@ void QQuickPlatformMenuItemGroup::setVisible(bool visible)
m_visible = visible;
emit visibleChanged();
- for (QQuickPlatformMenuItem *item : m_items) {
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) {
if (item->m_visible) {
item->sync();
emit item->visibleChanged();
@@ -222,7 +222,7 @@ void QQuickPlatformMenuItemGroup::setExclusive(bool exclusive)
m_exclusive = exclusive;
emit exclusiveChanged();
- for (QQuickPlatformMenuItem *item : m_items)
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items))
item->sync();
}
@@ -317,7 +317,7 @@ void QQuickPlatformMenuItemGroup::clear()
if (m_items.isEmpty())
return;
- for (QQuickPlatformMenuItem *item : m_items) {
+ for (QQuickPlatformMenuItem *item : qAsConst(m_items)) {
item->setGroup(nullptr);
disconnect(item, &QQuickPlatformMenuItem::checkedChanged, this, &QQuickPlatformMenuItemGroup::updateCurrent);
disconnect(item, &QQuickPlatformMenuItem::triggered, this, &QQuickPlatformMenuItemGroup::activateItem);