diff options
| author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-08-11 17:34:59 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-08-12 09:14:54 +0000 |
| commit | 4a7e03fc700cb7431df20a31bed6834a31e6833e (patch) | |
| tree | 4ca35f349d4fcf2353a9db139c906594e3f0bd61 /src/quickwidgets | |
| parent | d39d23b9f2aab71c942954e68d92abfd19018e96 (diff) | |
QuickWidgets: replace 'foreach' with 'range for'
And add QT_NO_FOREACH define to .pro file.
Now QuickWidgets is 'foreach' free.
Change-Id: Iff711ab3a8bb78188aac48371f6e45eb4b174699
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 12 | ||||
| -rw-r--r-- | src/quickwidgets/quickwidgets.pro | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index ad04c76783..b8c5b900c9 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -575,8 +575,8 @@ void QQuickWidget::setContent(const QUrl& url, QQmlComponent *component, QObject d->component = component; if (d->component && d->component->isError()) { - QList<QQmlError> errorList = d->component->errors(); - foreach (const QQmlError &error, errorList) { + const QList<QQmlError> errorList = d->component->errors(); + for (const QQmlError &error : errorList) { QMessageLogger(error.url().toString().toLatin1().constData(), error.line(), 0).warning() << error; } @@ -1018,8 +1018,8 @@ void QQuickWidget::continueExecute() disconnect(d->component, SIGNAL(statusChanged(QQmlComponent::Status)), this, SLOT(continueExecute())); if (d->component->isError()) { - QList<QQmlError> errorList = d->component->errors(); - foreach (const QQmlError &error, errorList) { + const QList<QQmlError> errorList = d->component->errors(); + for (const QQmlError &error : errorList) { QMessageLogger(error.url().toString().toLatin1().constData(), error.line(), 0).warning() << error; } @@ -1030,8 +1030,8 @@ void QQuickWidget::continueExecute() QObject *obj = d->component->create(); if (d->component->isError()) { - QList<QQmlError> errorList = d->component->errors(); - foreach (const QQmlError &error, errorList) { + const QList<QQmlError> errorList = d->component->errors(); + for (const QQmlError &error : errorList) { QMessageLogger(error.url().toString().toLatin1().constData(), error.line(), 0).warning() << error; } diff --git a/src/quickwidgets/quickwidgets.pro b/src/quickwidgets/quickwidgets.pro index 87409e31c5..2438e577ae 100644 --- a/src/quickwidgets/quickwidgets.pro +++ b/src/quickwidgets/quickwidgets.pro @@ -2,7 +2,7 @@ TARGET = QtQuickWidgets QT = core-private gui-private qml-private quick-private widgets-private -DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES +DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES QT_NO_FOREACH HEADERS += \ qquickwidget.h \ |