diff --git a/autotests/kxmlgui_unittest.cpp b/autotests/kxmlgui_unittest.cpp --- a/autotests/kxmlgui_unittest.cpp +++ b/autotests/kxmlgui_unittest.cpp @@ -285,9 +285,9 @@ static QStringList collectMenuNames(KXMLGUIFactory &factory) { - QList containers = factory.containers(QStringLiteral("Menu")); + const QList containers = factory.containers(QStringLiteral("Menu")); QStringList containerNames; - Q_FOREACH (QWidget *w, containers) { + for (QWidget *w : containers) { containerNames << w->objectName(); } return containerNames; diff --git a/src/kedittoolbar.cpp b/src/kedittoolbar.cpp --- a/src/kedittoolbar.cpp +++ b/src/kedittoolbar.cpp @@ -970,7 +970,7 @@ // now, rebuild the gui from the first to the last //qDebug(240) << "rebuilding the gui"; - foreach (KXMLGUIClient *client, clients) { + for (KXMLGUIClient *client : clients) { //qDebug(240) << "updating client " << client << " " << client->componentName() << " xmlFile=" << client->xmlFile(); QString file(client->xmlFile()); // before setting ui_standards! if (!file.isEmpty()) { @@ -992,7 +992,7 @@ // Now we can add the clients to the factory // We don't do it in the loop above because adding a part automatically // adds its plugins, so we must make sure the plugins were updated first. - foreach (KXMLGUIClient *client, clients) { + for (KXMLGUIClient *client : clients) { d->m_factory->addClient(client); } } diff --git a/src/kkeysequencewidget.cpp b/src/kkeysequencewidget.cpp --- a/src/kkeysequencewidget.cpp +++ b/src/kkeysequencewidget.cpp @@ -410,7 +410,7 @@ } } - Q_FOREACH (KActionCollection *col, changedCollections) { + for (KActionCollection *col : qAsConst(changedCollections)) { col->writeSettings(); } @@ -568,7 +568,7 @@ QList conflictingActions; //find conflicting shortcuts with existing actions - foreach (QAction *qaction, allActions) { + for (QAction *qaction : qAsConst(allActions)) { if (shortcutsConflictWith(qaction->shortcuts(), keySequence)) { // A conflict with a KAction. If that action is configurable // ask the user what to do. If not reject this keySequence. diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp --- a/src/kmainwindow.cpp +++ b/src/kmainwindow.cpp @@ -320,7 +320,7 @@ for (;;) { const QList list = qApp->topLevelWidgets(); bool found = false; - foreach (QWidget *w, list) { + for (QWidget *w : list) { if (w != q && w->objectName() == s) { found = true; break; diff --git a/src/kmainwindowiface.cpp b/src/kmainwindowiface.cpp --- a/src/kmainwindowiface.cpp +++ b/src/kmainwindowiface.cpp @@ -40,8 +40,8 @@ QStringList KMainWindowInterface::actions() { QStringList tmp_actions; - QList lst = m_MainWindow->actionCollection()->actions(); - foreach (QAction *it, lst) { + const QList lst = m_MainWindow->actionCollection()->actions(); + for (QAction *it : lst) { if (!it->associatedWidgets().isEmpty()) { tmp_actions.append(it->objectName()); } diff --git a/src/kshortcutschemeseditor.cpp b/src/kshortcutschemeseditor.cpp --- a/src/kshortcutschemeseditor.cpp +++ b/src/kshortcutschemeseditor.cpp @@ -50,7 +50,7 @@ // List files in the shortcuts subdir, each one is a scheme. See KShortcutSchemesHelper::{shortcutSchemeFileName,exportActionCollection} const QStringList shortcutsDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QCoreApplication::applicationName() + QLatin1String("/shortcuts"), QStandardPaths::LocateDirectory); qCDebug(DEBUG_KXMLGUI) << "shortcut scheme dirs:" << shortcutsDirs; - Q_FOREACH (const QString &dir, shortcutsDirs) { + for (const QString &dir : shortcutsDirs) { Q_FOREACH (const QString &file, QDir(dir).entryList(QDir::Files | QDir::NoDotAndDotDot)) { qCDebug(DEBUG_KXMLGUI) << "shortcut scheme file:" << file; schemes << file; diff --git a/src/kshortcutseditor.cpp b/src/kshortcutseditor.cpp --- a/src/kshortcutseditor.cpp +++ b/src/kshortcutseditor.cpp @@ -130,8 +130,8 @@ QSet actionsSeen; // Add all categories in their own subtree below the collections root node - QList categories = collection->findChildren(); - foreach (KActionCategory *category, categories) { + const QList categories = collection->findChildren(); + for (KActionCategory *category : categories) { hier[KShortcutsEditorPrivate::Action] = d->findOrMakeItem(hier[KShortcutsEditorPrivate::Program], category->text()); foreach (QAction *action, category->actions()) { // Set a marker that we have seen this action diff --git a/src/kswitchlanguagedialog_p.cpp b/src/kswitchlanguagedialog_p.cpp --- a/src/kswitchlanguagedialog_p.cpp +++ b/src/kswitchlanguagedialog_p.cpp @@ -342,7 +342,7 @@ QSet insertedLanguges; const QList allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry); - foreach(const QLocale &l, allLocales) { + for (const QLocale &l : allLocales) { if (l != cLocale) { QString languageCode = l.name(); if (!insertedLanguges.contains(languageCode) && KLocalizedString::isApplicationTranslatedInto(languageCode)) { diff --git a/src/ktoolbar.cpp b/src/ktoolbar.cpp --- a/src/ktoolbar.cpp +++ b/src/ktoolbar.cpp @@ -354,7 +354,7 @@ if (avSizes.count() < 10) { // Fixed or threshold type icons - Q_FOREACH (int it, avSizes) { + for (int it : qAsConst(avSizes)) { QString text; if (it < 19) { text = i18n("Small (%1x%2)", it, it); @@ -374,7 +374,7 @@ const int progression[] = { 16, 22, 32, 48, 64, 96, 128, 192, 256 }; for (uint i = 0; i < 9; i++) { - Q_FOREACH (int it, avSizes) { + for (int it : qAsConst(avSizes)) { if (it >= progression[ i ]) { QString text; if (it < 19) { @@ -1096,7 +1096,7 @@ stream >> actionNames; - Q_FOREACH (const QString &actionName, actionNames) { + for (const QString &actionName : qAsConst(actionNames)) { Q_FOREACH (KActionCollection *ac, KActionCollection::allCollections()) { QAction *newAction = ac->action(actionName); if (newAction) { diff --git a/src/ktoolbarhandler.cpp b/src/ktoolbarhandler.cpp --- a/src/ktoolbarhandler.cpp +++ b/src/ktoolbarhandler.cpp @@ -54,9 +54,9 @@ QLinkedList &oldToolBarList) : m_actionCollection(actionCollection), m_mainWindow(mainWindow), m_needsRebuild(false) { - QList toolBars = m_mainWindow->findChildren(); + const QList toolBars = m_mainWindow->findChildren(); - Q_FOREACH (KToolBar *toolBar, toolBars) { + for (KToolBar *toolBar : toolBars) { if (toolBar->mainWindow() != m_mainWindow) { continue; } diff --git a/src/kxmlguifactory.cpp b/src/kxmlguifactory.cpp --- a/src/kxmlguifactory.cpp +++ b/src/kxmlguifactory.cpp @@ -429,7 +429,7 @@ // remove child clients first (create a copy of the list just in case the // original list is modified directly or indirectly in removeClient()) const QList childClients(client->childClients()); - Q_FOREACH (KXMLGUIClient *child, childClients) { + for (KXMLGUIClient *child : childClients) { removeClient(child); } diff --git a/src/kxmlguiversionhandler.cpp b/src/kxmlguiversionhandler.cpp --- a/src/kxmlguiversionhandler.cpp +++ b/src/kxmlguiversionhandler.cpp @@ -50,7 +50,7 @@ { QDomElement parent = doc.documentElement(); const QList toolBars = extractToolBars(doc); - Q_FOREACH (const QDomElement &e, toolBars) { + for (const QDomElement &e : toolBars) { parent.removeChild(e); } }