feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Remove foreach / Q_FOREACH usage

Browse Source 
Task-number: QTCREATORBUG-27464
Change-Id: Ic72d173d95376276df8d1f08abdaec8370aff2ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Artem Sokolovskii
2022-04-29 12:45:47 +02:00
parent 5dcfe401a3
commit efd25fb43f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/variablechooser.cpp
View File

@@ -309,15 +309,16 @@ void VariableGroupItem::populateGroup(MacroExpander *expander)
{ {
if (!expander) if (!expander)
return; return;
const QList<QByteArray> variables = expander->visibleVariables();
foreach (const QByteArray &variable, expander->visibleVariables()) { for (const QByteArray &variable : variables) {
auto item = new VariableItem; auto item = new VariableItem;
item->m_variable = variable; item->m_variable = variable;
item->m_expander = expander; item->m_expander = expander;
appendChild(item); appendChild(item);
} }
foreach (const MacroExpanderProvider &subProvider, expander->subProviders()) { const MacroExpanderProviders subProviders = expander->subProviders();
for (const MacroExpanderProvider &subProvider : subProviders) {
if (!subProvider) if (!subProvider)
continue; continue;
if (expander->isAccumulating()) { if (expander->isAccumulating()) {
@@ -434,7 +435,8 @@ void VariableChooser::addSupportForChildWidgets(QWidget *parent, MacroExpander *
{ {
auto chooser = new VariableChooser(parent); auto chooser = new VariableChooser(parent);
chooser->addMacroExpanderProvider([expander] { return expander; }); chooser->addMacroExpanderProvider([expander] { return expander; });
foreach (QWidget *child, parent->findChildren<QWidget *>()) { const QList<QWidget *> children = parent->findChildren<QWidget *>();
for (QWidget *child : children) {
if (qobject_cast<QLineEdit *>(child) if (qobject_cast<QLineEdit *>(child)
|| qobject_cast<QTextEdit *>(child) || qobject_cast<QTextEdit *>(child)
|| qobject_cast<QPlainTextEdit *>(child)) || qobject_cast<QPlainTextEdit *>(child))

3
tests/auto/json/tst_json.cpp
View File

@@ -2487,7 +2487,8 @@ void tst_Json::unicodeKeys()
JsonObject o = doc.object(); JsonObject o = doc.object();
QCOMPARE(o.keys().size(), size_t(5)); QCOMPARE(o.keys().size(), size_t(5));
Q_FOREACH (const std::string &k, o.keys()) { const JsonObject::Keys keys = o.keys();
for (const std::string &k : keys) {
QByteArray key(k.data()); QByteArray key(k.data());
std::string suffix = key.mid(key.indexOf('_')).data(); std::string suffix = key.mid(key.indexOf('_')).data();
QCOMPARE(o[key.data()].toString(), "hello" + suffix); QCOMPARE(o[key.data()].toString(), "hello" + suffix);