diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-09-06 11:46:40 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-09-06 11:58:42 +0000 |
| commit | 57b5739923a741aa4317c11c5e86c911cc25f798 (patch) | |
| tree | 8d7c44697d499a167518a6216712501362974368 | |
| parent | e0e5a57430af761192b98292fab73284d351e4f1 (diff) | |
Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freev5.8.0-beta1
In the examples, replaced a Q_FOREACH with QList<QByteArray>::join().
Change-Id: I6b1ca1666bf0a69c6489f970da19b3f966327cdb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/macextras/macpasteboardmime/main.cpp | 6 | ||||
| -rw-r--r-- | src/macextras/qmactoolbar.mm | 2 | ||||
| -rw-r--r-- | src/macextras/qmactoolbardelegate.mm | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/.qmake.conf b/.qmake.conf index aefa1e7..aae5d51 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,5 @@ load(qt_build_config) +DEFINES += QT_NO_FOREACH + MODULE_VERSION = 5.8.0 diff --git a/examples/macextras/macpasteboardmime/main.cpp b/examples/macextras/macpasteboardmime/main.cpp index 7cb5e3e..f747e02 100644 --- a/examples/macextras/macpasteboardmime/main.cpp +++ b/examples/macextras/macpasteboardmime/main.cpp @@ -91,11 +91,7 @@ public: Q_UNUSED(mime); Q_UNUSED(flav); - QByteArray all; - foreach (QByteArray i, data) { - all += i; - } - return QVariant(all); + return QVariant(data.join()); } QList<QByteArray> convertFromMime(const QString &mime, QVariant data, QString flav) diff --git a/src/macextras/qmactoolbar.mm b/src/macextras/qmactoolbar.mm index c5156b2..1881c4f 100644 --- a/src/macextras/qmactoolbar.mm +++ b/src/macextras/qmactoolbar.mm @@ -312,7 +312,7 @@ QMacToolBarPrivate::~QMacToolBarPrivate() NSMutableArray *QMacToolBarPrivate::getItemIdentifiers(const QList<QMacToolBarItem *> &items, bool cullUnselectable) { NSMutableArray *array = [[NSMutableArray alloc] init]; - foreach (const QMacToolBarItem * item, items) { + for (const QMacToolBarItem * item : items) { if (cullUnselectable && item->selectable() == false) continue; [array addObject : item->d_func()->itemIdentifier()]; diff --git a/src/macextras/qmactoolbardelegate.mm b/src/macextras/qmactoolbardelegate.mm index 05986ff..23e5150 100644 --- a/src/macextras/qmactoolbardelegate.mm +++ b/src/macextras/qmactoolbardelegate.mm @@ -52,7 +52,7 @@ QT_USE_NAMESPACE NSArray *toNSArray(const QList<QString> &stringList) { NSMutableArray *array = [[NSMutableArray alloc] init]; - foreach (const QString &string, stringList) { + for (const QString &string : stringList) { [array addObject:string.toNSString()]; } return array; |