From 5cc77c4bf10464215b84c99636339fe0517cc541 Mon Sep 17 00:00:00 2001 From: Artem Sokolovskii Date: Mon, 19 Dec 2022 13:23:53 +0100 Subject: [PATCH] qmleditor: Remove foreach / Q_FOREACH usage Task-number: QTCREATORBUG-27464 Change-Id: Ic6d667d97a9708963f7c3e21aa9598ffe0f9c7b7 Reviewed-by: hjk --- src/libs/glsl/glslsemantic.cpp | 3 ++- src/libs/glsl/glsltypes.cpp | 8 +++---- src/libs/languageutils/fakemetaobject.cpp | 22 +++++++++---------- src/libs/qmldebug/basetoolsclient.cpp | 3 ++- src/libs/qmldebug/qmltoolsclient.cpp | 2 +- .../qmleditorwidgets/contextpanewidget.cpp | 5 +++-- .../contextpanewidgetimage.cpp | 4 +++- .../contextpanewidgetrectangle.cpp | 3 ++- src/libs/qmleditorwidgets/gradientline.cpp | 3 ++- 9 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/libs/glsl/glslsemantic.cpp b/src/libs/glsl/glslsemantic.cpp index 0a0ce7e377e..429e6fd873a 100644 --- a/src/libs/glsl/glslsemantic.cpp +++ b/src/libs/glsl/glslsemantic.cpp @@ -352,7 +352,8 @@ bool Semantic::visit(FunctionCallExpressionAST *ast) _expr.type = funTy->returnType(); } else if (const OverloadSet *overloads = id.type->asOverloadSetType()) { QVector candidates; - foreach (Function *f, overloads->functions()) { + const QVector functions = overloads->functions(); + for (Function *f : functions) { if (f->argumentCount() == actuals.size()) { int argc = 0; for (; argc < actuals.size(); ++argc) { diff --git a/src/libs/glsl/glsltypes.cpp b/src/libs/glsl/glsltypes.cpp index 428291a6695..487a6afe642 100644 --- a/src/libs/glsl/glsltypes.cpp +++ b/src/libs/glsl/glsltypes.cpp @@ -308,7 +308,7 @@ bool ArrayType::isLessThan(const Type *other) const QList Struct::members() const { QList m; - foreach (Symbol *s, _members) { + for (Symbol *s : std::as_const(_members)) { if (! s->name().isEmpty()) m.append(s); } @@ -322,7 +322,7 @@ void Struct::add(Symbol *member) Symbol *Struct::find(const QString &name) const { - foreach (Symbol *s, _members) { + for (Symbol *s : std::as_const(_members)) { if (s->name() == name) return s; } @@ -411,7 +411,7 @@ bool Function::isLessThan(const Type *other) const QList Function::members() const { QList m; - foreach (Argument *arg, _arguments) { + for (Argument *arg : std::as_const(_arguments)) { if (! arg->name().isEmpty()) m.append(arg); } @@ -420,7 +420,7 @@ QList Function::members() const Symbol *Function::find(const QString &name) const { - foreach (Argument *arg, _arguments) { + for (Argument *arg : std::as_const(_arguments)) { if (arg->name() == name) return arg; } diff --git a/src/libs/languageutils/fakemetaobject.cpp b/src/libs/languageutils/fakemetaobject.cpp index 51613ff7df5..796f017ec9c 100644 --- a/src/libs/languageutils/fakemetaobject.cpp +++ b/src/libs/languageutils/fakemetaobject.cpp @@ -44,7 +44,7 @@ void FakeMetaEnum::addToHash(QCryptographicHash &hash) const hash.addData(reinterpret_cast(m_name.constData()), len * sizeof(QChar)); len = m_keys.size(); hash.addData(reinterpret_cast(&len), sizeof(len)); - foreach (const QString &key, m_keys) { + for (const QString &key : std::as_const(m_keys)) { len = key.size(); hash.addData(reinterpret_cast(&len), sizeof(len)); hash.addData(reinterpret_cast(key.constData()), len * sizeof(QChar)); @@ -129,14 +129,14 @@ void FakeMetaMethod::addToHash(QCryptographicHash &hash) const hash.addData(reinterpret_cast(&m_revision), sizeof(m_revision)); len = m_paramNames.size(); hash.addData(reinterpret_cast(&len), sizeof(len)); - foreach (const QString &pName, m_paramNames) { + for (const QString &pName : std::as_const(m_paramNames)) { len = pName.size(); hash.addData(reinterpret_cast(&len), sizeof(len)); hash.addData(reinterpret_cast(pName.constData()), len * sizeof(QChar)); } len = m_paramTypes.size(); hash.addData(reinterpret_cast(&len), sizeof(len)); - foreach (const QString &pType, m_paramTypes) { + for (const QString &pType : std::as_const(m_paramTypes)) { len = pType.size(); hash.addData(reinterpret_cast(&len), sizeof(len)); hash.addData(reinterpret_cast(pType.constData()), len * sizeof(QChar)); @@ -158,7 +158,7 @@ QString FakeMetaMethod::describe(int baseIndent) const res += QString::number(methodType()); res += newLine; res += QLatin1String(" parameterNames:["); - foreach (const QString &pName, parameterNames()) { + for (const QString &pName : parameterNames()) { res += newLine; res += QLatin1String(" "); res += pName; @@ -166,7 +166,7 @@ QString FakeMetaMethod::describe(int baseIndent) const res += QLatin1Char(']'); res += newLine; res += QLatin1String(" parameterTypes:["); - foreach (const QString &pType, parameterTypes()) { + for (const QString &pType : parameterTypes()) { res += newLine; res += QLatin1String(" "); res += pType; @@ -287,7 +287,7 @@ QList FakeMetaObject::exports() const { return m_exports; } FakeMetaObject::Export FakeMetaObject::exportInPackage(const QString &package) const { - foreach (const Export &exp, m_exports) { + for (const Export &exp : std::as_const(m_exports)) { if (exp.package == package) return exp; } @@ -369,7 +369,7 @@ QByteArray FakeMetaObject::calculateFingerprint() const { QStringList keys(m_enumNameToIndex.keys()); keys.sort(); - foreach (const QString &key, keys) { + for (const QString &key : std::as_const(keys)) { len = key.size(); hash.addData(reinterpret_cast(&len), sizeof(len)); hash.addData(reinterpret_cast(key.constData()), len * sizeof(QChar)); @@ -380,16 +380,16 @@ QByteArray FakeMetaObject::calculateFingerprint() const } len = m_exports.size(); hash.addData(reinterpret_cast(&len), sizeof(len)); - foreach (const Export &e, m_exports) + for (const Export &e : std::as_const(m_exports)) e.addToHash(hash); // normalize order? len = m_exports.size(); hash.addData(reinterpret_cast(&len), sizeof(len)); - foreach (const FakeMetaMethod &m, m_methods) + for (const FakeMetaMethod &m : std::as_const(m_methods)) m.addToHash(hash); // normalize order? { QStringList keys(m_propNameToIdx.keys()); keys.sort(); - foreach (const QString &key, keys) { + for (const QString &key : std::as_const(keys)) { len = key.size(); hash.addData(reinterpret_cast(&len), sizeof(len)); hash.addData(reinterpret_cast(key.constData()), len * sizeof(QChar)); @@ -488,7 +488,7 @@ QString FakeMetaObject::describe(bool printDetails, int baseIndent) const res += newLine; res += QLatin1String("exports:["); - foreach (const Export &e, exports()) { + for (const Export &e : exports()) { res += newLine; res += QLatin1String(" "); res += e.describe(baseIndent + 2); diff --git a/src/libs/qmldebug/basetoolsclient.cpp b/src/libs/qmldebug/basetoolsclient.cpp index 31b041d32d7..b6031d2bc56 100644 --- a/src/libs/qmldebug/basetoolsclient.cpp +++ b/src/libs/qmldebug/basetoolsclient.cpp @@ -21,7 +21,8 @@ void BaseToolsClient::recurseObjectIdList(const ObjectReference &ref, { debugIds << ref.debugId(); objectIds << ref.idString(); - foreach (const ObjectReference &child, ref.children()) + const QList children = ref.children(); + for (const ObjectReference &child : children) recurseObjectIdList(child, debugIds, objectIds); } diff --git a/src/libs/qmldebug/qmltoolsclient.cpp b/src/libs/qmldebug/qmltoolsclient.cpp index c74155b66ed..704eaccc9ef 100644 --- a/src/libs/qmldebug/qmltoolsclient.cpp +++ b/src/libs/qmldebug/qmltoolsclient.cpp @@ -56,7 +56,7 @@ void QmlToolsClient::messageReceived(const QByteArray &message) debugIds.removeAll(-1); QStringList debugIdStrings; - foreach (int debugId, debugIds) { + for (int debugId : std::as_const(debugIds)) { debugIdStrings << QString::number(debugId); } log(LogReceive, type + ':' + event, diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index 24003ef3fd9..315b8faa9cc 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -189,8 +189,9 @@ ContextPaneWidget::~ContextPaneWidget() void ContextPaneWidget::activate(const QPoint &pos, const QPoint &alternative, const QPoint &alternative2, bool pinned) { //uncheck all color buttons - foreach (ColorButton *colorButton, findChildren()) { - colorButton->setChecked(false); + const QList children = findChildren(); + for (ColorButton *colorButton : children) { + colorButton->setChecked(false); } show(); update(); diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp index 084c52b027b..996b4e64029 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp @@ -896,7 +896,9 @@ PreviewDialog::PreviewDialog(QWidget *parent) : DragWidget(parent) connect(m_slider, &QSlider::valueChanged, this, &PreviewDialog::onSliderMoved); - foreach (QWidget *childWidget, findChildren()) { + + const QList children = findChildren(); + for (QWidget *childWidget : children) { childWidget->installEventFilter(wheelFilter); } } diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp index 6eca9bf229c..4e6cc7a6a33 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp @@ -241,7 +241,8 @@ void ContextPaneWidgetRectangle::timerEvent(QTimerEvent *event) QLinearGradient gradient = ui->gradientLine->gradient(); QString str = QLatin1String("Gradient {\n"); - foreach (const QGradientStop &stop, gradient.stops()) { + const QGradientStops stops = gradient.stops(); + for (const QGradientStop &stop : stops) { str += QLatin1String("GradientStop {\n"); str += QLatin1String("position: ") + QString::number(stop.first, 'f', 2) + QLatin1String(";\n"); str += QLatin1String("color: ") + QLatin1String("\"") + stop.second.name() + QLatin1String("\";\n"); diff --git a/src/libs/qmleditorwidgets/gradientline.cpp b/src/libs/qmleditorwidgets/gradientline.cpp index bce243f00cc..488e9977670 100644 --- a/src/libs/qmleditorwidgets/gradientline.cpp +++ b/src/libs/qmleditorwidgets/gradientline.cpp @@ -77,7 +77,8 @@ void GradientLine::readGradient() if (m_useGradient) { m_colorList.clear(); m_stops.clear(); - foreach (const QGradientStop &stop, m_gradient.stops()) { + const QGradientStops stops = m_gradient.stops(); + for (const QGradientStop &stop : stops) { m_stops << stop.first; m_colorList << stop.second; }