diff --git a/src/browseropenorsavequestion.cpp b/src/browseropenorsavequestion.cpp --- a/src/browseropenorsavequestion.cpp +++ b/src/browseropenorsavequestion.cpp @@ -267,8 +267,8 @@ KGuiItem::assign(d->openWithButton, openWithItem); d->openWithButton->setMenu(menu); QObject::connect(menu, &QMenu::triggered, d, &BrowserOpenOrSaveQuestionPrivate::slotAppSelected); - for (KService::List::const_iterator it = apps.begin(); it != apps.end(); ++it) { - QAction *act = createAppAction(*it, d); + for (auto& app : apps) { + QAction *act = createAppAction(app, d); menu->addAction(act); } QAction *openWithDialogAction = new QAction(d); diff --git a/src/partbase.h b/src/partbase.h --- a/src/partbase.h +++ b/src/partbase.h @@ -131,9 +131,9 @@ * \code * if( factory() ) * { - * QList plugins = KParts::Plugin::pluginObjects( this ); - * for(int i = 0; i != plugins.size(); ++i) { - * factory()->addClient( plugins[i] ); + * const QList plugins = KParts::Plugin::pluginObjects(this); + * for (auto* plugin : plugins) { + * factory()->addClient(plugin); * } * } * \endcode diff --git a/src/partmanager.cpp b/src/partmanager.cpp --- a/src/partmanager.cpp +++ b/src/partmanager.cpp @@ -315,8 +315,8 @@ Part *PartManager::findPartFromWidget(QWidget *widget, const QPoint &pos) { - for (QList::iterator it = d->m_parts.begin(), end = d->m_parts.end(); it != end; ++it) { - Part *part = (*it)->hitTest(widget, pos); + for (auto* p : qAsConst(d->m_parts)) { + Part *part = p->hitTest(widget, pos); if (part && d->m_parts.contains(part)) { return part; } @@ -326,9 +326,9 @@ Part *PartManager::findPartFromWidget(QWidget *widget) { - for (QList::iterator it = d->m_parts.begin(), end = d->m_parts.end(); it != end; ++it) { - if (widget == (*it)->widget()) { - return (*it); + for (auto* part : qAsConst(d->m_parts)) { + if (widget == part->widget()) { + return part; } } return nullptr; diff --git a/src/plugin.cpp b/src/plugin.cpp --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -135,21 +135,19 @@ void Plugin::loadPlugins(QObject *parent, const QList &pluginInfos, const QString &componentName) { - QList::ConstIterator pIt = pluginInfos.begin(); - QList::ConstIterator pEnd = pluginInfos.end(); - for (; pIt != pEnd; ++pIt) { - QString library = (*pIt).m_document.documentElement().attribute(QStringLiteral("library")); + for (auto& pluginInfo : pluginInfos) { + const QString library = pluginInfo.m_document.documentElement().attribute(QStringLiteral("library")); if (library.isEmpty() || hasPlugin(parent, library)) { continue; } - Plugin *plugin = loadPlugin(parent, library, (*pIt).m_document.documentElement().attribute(QStringLiteral("X-KDE-PluginKeyword"))); + Plugin *plugin = loadPlugin(parent, library, pluginInfo.m_document.documentElement().attribute(QStringLiteral("X-KDE-PluginKeyword"))); if (plugin) { plugin->d->m_parentInstance = componentName; - plugin->setXMLFile((*pIt).m_relXMLFileName, false, false); - plugin->setDOMDocument((*pIt).m_document); + plugin->setXMLFile(pluginInfo.m_relXMLFileName, false, false); + plugin->setDOMDocument(pluginInfo.m_document); } } @@ -195,14 +193,10 @@ { const QObjectList plugins = parent->children(); - QObjectList::ConstIterator it = plugins.begin(); - for (; it != plugins.end(); ++it) { - Plugin *plugin = qobject_cast(*it); - if (plugin && plugin->d->m_library == library) { - return true; - } - } - return false; + return std::any_of(plugins.begin(), plugins.end(), [library](QObject* p) { + Plugin *plugin = qobject_cast(p); + return (plugin && plugin->d->m_library == library); + }); } void Plugin::setComponentData(const KAboutData &pluginData) @@ -217,10 +211,8 @@ { KConfigGroup cfgGroup(KSharedConfig::openConfig(componentName + QLatin1String("rc")), "KParts Plugins"); const QList plugins = pluginInfos(componentName); - QList::ConstIterator pIt = plugins.begin(); - const QList::ConstIterator pEnd = plugins.end(); - for (; pIt != pEnd; ++pIt) { - QDomElement docElem = (*pIt).m_document.documentElement(); + for (auto& pluginInfo : plugins) { + QDomElement docElem = pluginInfo.m_document.documentElement(); QString library = docElem.attribute(QStringLiteral("library")); QString keyword; @@ -235,7 +227,7 @@ if (cfgGroup.hasKey(name + QLatin1String("Enabled"))) { pluginEnabled = cfgGroup.readEntry(name + QLatin1String("Enabled"), false); } else { // no user-setting, load plugin default setting - QString relPath = componentName + QLatin1Char('/') + (*pIt).m_relXMLFileName; + QString relPath = componentName + QLatin1Char('/') + pluginInfo.m_relXMLFileName; relPath.truncate(relPath.lastIndexOf(QLatin1Char('.'))); // remove extension relPath += QLatin1String(".desktop"); //qDebug() << "looking for " << relPath; @@ -263,8 +255,8 @@ const QObjectList pluginList = parent->children(); bool pluginFound = false; - for (QObjectList::ConstIterator it = pluginList.begin(); it != pluginList.end(); ++it) { - Plugin *plugin = qobject_cast(*it); + for (auto* p : pluginList) { + Plugin *plugin = qobject_cast(p); if (plugin && plugin->d->m_library == library) { // delete and unload disabled plugins if (!pluginEnabled) { @@ -292,8 +284,8 @@ if (plugin) { plugin->d->m_parentInstance = componentName; - plugin->setXMLFile((*pIt).m_relXMLFileName, false, false); - plugin->setDOMDocument((*pIt).m_document); + plugin->setXMLFile(pluginInfo.m_relXMLFileName, false, false); + plugin->setDOMDocument(pluginInfo.m_document); parentGUIClient->insertChildClient(plugin); } } diff --git a/src/scriptableextension.cpp b/src/scriptableextension.cpp --- a/src/scriptableextension.cpp +++ b/src/scriptableextension.cpp @@ -257,9 +257,9 @@ QStringList qargs; // Convert args to strings for LC use. qargs.reserve(a.size()); - for (int i = 0; i < a.size(); ++i) { + for (auto& arg : a) { bool ok; - qargs.append(toLC(a[i], &ok)); + qargs.append(toLC(arg, &ok)); if (!ok) { return unimplemented(); } diff --git a/src/statusbarextension.cpp b/src/statusbarextension.cpp --- a/src/statusbarextension.cpp +++ b/src/statusbarextension.cpp @@ -136,14 +136,12 @@ d->m_activated = gae->activated(); if (d->m_activated) { - QList::iterator it = d->m_statusBarItems.begin(); - for (; it != d->m_statusBarItems.end(); ++it) { - (*it).ensureItemShown(sb); + for (auto& item : d->m_statusBarItems) { + item.ensureItemShown(sb); } } else { - QList::iterator it = d->m_statusBarItems.begin(); - for (; it != d->m_statusBarItems.end(); ++it) { - (*it).ensureItemHidden(sb); + for (auto& item : d->m_statusBarItems) { + item.ensureItemHidden(sb); } }