D19913: [plasma-framework] make it compiles without foreach
mlaurent updated this revision to Diff 80344. mlaurent added a comment. Use m_menu->addActions(m_dropActions); REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19913?vs=80182=80344 BRANCH compile_without_foreach (branched from master) REVISION DETAIL https://phabricator.kde.org/D19913 AFFECTED FILES CMakeLists.txt autotests/coronatest.cpp autotests/utils.h src/declarativeimports/calendar/daysmodel.cpp src/declarativeimports/calendar/eventpluginsmanager.cpp src/declarativeimports/core/datamodel.cpp src/declarativeimports/core/datamodel.h src/declarativeimports/core/datasource.cpp src/declarativeimports/core/iconitem.cpp src/declarativeimports/core/tooltipdialog.cpp src/declarativeimports/plasmacomponents/qmenu.cpp src/declarativeimports/plasmaextracomponents/fallbackcomponent.cpp src/plasma/containment.cpp src/plasma/corona.cpp src/plasma/datacontainer.cpp src/plasma/dataengine.cpp src/plasma/dataengineconsumer.cpp src/plasma/package.cpp src/plasma/pluginloader.cpp src/plasma/private/applet_p.cpp src/plasma/private/containment_p.cpp src/plasma/private/dataenginemanager.cpp src/plasma/private/theme_p.cpp src/plasma/private/timetracker.cpp src/plasma/service.cpp src/plasma/svg.cpp src/plasmaquick/appletquickitem.cpp src/plasmaquick/configview.cpp src/plasmaquick/dialog.cpp src/plasmaquick/dialogshadows.cpp src/scriptengines/qml/plasmoid/appletinterface.cpp src/scriptengines/qml/plasmoid/containmentinterface.cpp src/scriptengines/qml/plasmoid/dropmenu.cpp tests/kplugins/plugintest.cpp To: mlaurent, dfaure, apol Cc: ahmadsamir, nicolasfella, broulik, apol, kde-frameworks-devel, LeGast00n, cblack, michaelh, ngraham, bruns
D19913: [plasma-framework] make it compiles without foreach
This revision was automatically updated to reflect the committed changes. Closed by commit R242:48f60533b922: [plasma-framework] make it compiles without foreach (authored by mlaurent). REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19913?vs=80344=80345 REVISION DETAIL https://phabricator.kde.org/D19913 AFFECTED FILES CMakeLists.txt autotests/coronatest.cpp autotests/utils.h src/declarativeimports/calendar/daysmodel.cpp src/declarativeimports/calendar/eventpluginsmanager.cpp src/declarativeimports/core/datamodel.cpp src/declarativeimports/core/datamodel.h src/declarativeimports/core/datasource.cpp src/declarativeimports/core/iconitem.cpp src/declarativeimports/core/tooltipdialog.cpp src/declarativeimports/plasmacomponents/qmenu.cpp src/declarativeimports/plasmaextracomponents/fallbackcomponent.cpp src/plasma/containment.cpp src/plasma/corona.cpp src/plasma/datacontainer.cpp src/plasma/dataengine.cpp src/plasma/dataengineconsumer.cpp src/plasma/package.cpp src/plasma/pluginloader.cpp src/plasma/private/applet_p.cpp src/plasma/private/containment_p.cpp src/plasma/private/dataenginemanager.cpp src/plasma/private/theme_p.cpp src/plasma/private/timetracker.cpp src/plasma/service.cpp src/plasma/svg.cpp src/plasmaquick/appletquickitem.cpp src/plasmaquick/configview.cpp src/plasmaquick/dialog.cpp src/plasmaquick/dialogshadows.cpp src/scriptengines/qml/plasmoid/appletinterface.cpp src/scriptengines/qml/plasmoid/containmentinterface.cpp src/scriptengines/qml/plasmoid/dropmenu.cpp tests/kplugins/plugintest.cpp To: mlaurent, dfaure, apol Cc: ahmadsamir, nicolasfella, broulik, apol, kde-frameworks-devel, LeGast00n, cblack, michaelh, ngraham, bruns
D19913: [plasma-framework] make it compiles without foreach
apol accepted this revision. apol added inline comments. INLINE COMMENTS > dropmenu.cpp:80 > } else if (m_menu) { > -foreach (QAction *action, m_dropActions) { > +for (QAction *action : qAsConst(m_dropActions)) { > m_menu->addAction(action); `m_menu->addActions(m_dropActions);` REPOSITORY R242 Plasma Framework (Library) BRANCH compile_without_foreach (branched from master) REVISION DETAIL https://phabricator.kde.org/D19913 To: mlaurent, dfaure, apol Cc: ahmadsamir, nicolasfella, broulik, apol, kde-frameworks-devel, LeGast00n, cblack, michaelh, ngraham, bruns
D19913: [plasma-framework] make it compiles without foreach
mlaurent added a comment. Ping ?:) REPOSITORY R242 Plasma Framework (Library) BRANCH compile_without_foreach (branched from master) REVISION DETAIL https://phabricator.kde.org/D19913 To: mlaurent, dfaure Cc: ahmadsamir, nicolasfella, broulik, apol, kde-frameworks-devel, LeGast00n, cblack, michaelh, ngraham, bruns
D19913: [plasma-framework] make it compiles without foreach
mlaurent updated this revision to Diff 80182. mlaurent added a comment. Fix comment REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19913?vs=80170=80182 BRANCH compile_without_foreach (branched from master) REVISION DETAIL https://phabricator.kde.org/D19913 AFFECTED FILES CMakeLists.txt autotests/coronatest.cpp autotests/utils.h src/declarativeimports/calendar/daysmodel.cpp src/declarativeimports/calendar/eventpluginsmanager.cpp src/declarativeimports/core/datamodel.cpp src/declarativeimports/core/datamodel.h src/declarativeimports/core/datasource.cpp src/declarativeimports/core/iconitem.cpp src/declarativeimports/core/tooltipdialog.cpp src/declarativeimports/plasmacomponents/qmenu.cpp src/declarativeimports/plasmaextracomponents/fallbackcomponent.cpp src/plasma/containment.cpp src/plasma/corona.cpp src/plasma/datacontainer.cpp src/plasma/dataengine.cpp src/plasma/dataengineconsumer.cpp src/plasma/package.cpp src/plasma/pluginloader.cpp src/plasma/private/applet_p.cpp src/plasma/private/containment_p.cpp src/plasma/private/dataenginemanager.cpp src/plasma/private/theme_p.cpp src/plasma/private/timetracker.cpp src/plasma/service.cpp src/plasma/svg.cpp src/plasmaquick/appletquickitem.cpp src/plasmaquick/configview.cpp src/plasmaquick/dialog.cpp src/plasmaquick/dialogshadows.cpp src/scriptengines/qml/plasmoid/appletinterface.cpp src/scriptengines/qml/plasmoid/containmentinterface.cpp src/scriptengines/qml/plasmoid/dropmenu.cpp tests/kplugins/plugintest.cpp To: mlaurent, dfaure Cc: ahmadsamir, nicolasfella, broulik, apol, kde-frameworks-devel, LeGast00n, cblack, michaelh, ngraham, bruns
D19913: [plasma-framework] make it compiles without foreach
ahmadsamir added inline comments. INLINE COMMENTS > iconitem.cpp:628 > // setup time. > -foreach (const QString& overlay, m_overlays) { > +for (const QString& overlay : qAsConst(m_overlays)) { > if (!overlay.isEmpty()) { Coding style > pluginloader.cpp:328 > const QList packagePlugins = > KPackage::PackageLoader::self()->listPackages(QStringLiteral("Plasma/DataEngine")); > for (auto& plugin : packagePlugins) { > engines << plugin.pluginId(); Coding style, auto > pluginloader.cpp:567 > //info.service() to be valid and would crash otherwise > -foreach (auto& md, plugins) { > +for (const auto& md : plugins) { > auto pi = md.metaDataFileName().endsWith(QLatin1String(".json")) ? > KPluginInfo(md) : > KPluginInfo(KService::serviceByStorageId(md.metaDataFileName())); Style, '' > pluginloader.cpp:645 > QStringList categories; > -foreach (auto& plugin, allApplets) { > +for (auto& plugin : allApplets) { > if (plugin.category().isEmpty()) { const, and style ''. > applet_p.cpp:416 > QList qactions; > -names << QStringLiteral("add sibling containment") << > QStringLiteral("configure shortcuts") << QStringLiteral("lock widgets"); > -foreach (const QString , names) { > +const QList names = QList() << QStringLiteral("add > sibling containment") << QStringLiteral("configure shortcuts") << > QStringLiteral("lock widgets"); > +for (const QString : names) { Nit-pick: initializer list instead of <<. > theme_p.cpp:837 > +for (const QString : qAsConst(fallbackThemes)) { > QString > metadataPath(QStandardPaths::locate(QStandardPaths::GenericDataLocation, > QLatin1Literal(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/") % theme % > QLatin1Literal("/metadata.desktop"))); > KConfig metadata(metadataPath, KConfig::SimpleConfig); s/QLatin1Literal/QStringLiteral/ > timetracker.cpp:44 > > -Q_FOREACH(const ObjectHistory& history, m_data) { > +for (const ObjectHistory& history : qAsConst(m_data)) { > array.append(QJsonObject { Style "". > timetracker.cpp:71 > Q_ASSERT(!events.isEmpty()); > -foreach(const TimeEvent& ev, events) { > +for (const TimeEvent& ev : events) { > ret.append(QJsonObject { "" > containmentinterface.cpp:857 > +for (QAction *a : qAsConst(listActions)) { > +if (a->objectName() == QStringLiteral("lock widgets") || a->menu()) { > //It is up to the Containment to decide if the user is allowed > or not QLatin1String REPOSITORY R242 Plasma Framework (Library) BRANCH compile_without_foreach (branched from master) REVISION DETAIL https://phabricator.kde.org/D19913 To: mlaurent, dfaure Cc: ahmadsamir, nicolasfella, broulik, apol, kde-frameworks-devel, LeGast00n, cblack, michaelh, ngraham, bruns
D19913: [plasma-framework] make it compiles without foreach
mlaurent retitled this revision from "[plasma-desktop] make it compiles without foreach" to "[plasma-framework] make it compiles without foreach". REPOSITORY R242 Plasma Framework (Library) BRANCH compile_without_foreach (branched from master) REVISION DETAIL https://phabricator.kde.org/D19913 To: mlaurent, dfaure Cc: nicolasfella, broulik, apol, kde-frameworks-devel, LeGast00n, cblack, michaelh, ngraham, bruns