diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-09-06 17:54:23 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-09-13 19:58:19 +0000 |
commit | 74bc4617dd5a38abb60aff8b252001cb2ff9c7b8 (patch) | |
tree | 8368a44500af57a0880d89b47ddc73f9b38d6530 /tests | |
parent | 4c44cffd7b376900fc41169365ae03c7c65d95b6 (diff) | |
download | qtsvg-74bc4617dd5a38abb60aff8b252001cb2ff9c7b8.tar.gz |
Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-free
In BearerCloud::timerEvent(), bite the bullet and use a std::vector
instead of a QList to avoid repeated qAsConst() applications.
In BearerCloud::configurationRemoved() and configurationChanged(),
instead of iterating over QMultiMap::uniqueKeys() and QMap::remove(),
iterate directly over the QMultiMap and remove the desired elements.
Cache a QString.
In BearerCloud::updateConfigurations(), instead of using while !isEmpty()
takeFirst() on a local copy of a QList, simply iterate over the QList
(now made const) using C++11 ranged for.
In tst_QSvgGenerator, replace a QList of statically-known size with
a C array.
Change-Id: Ic0dd1c67d0819fe6167f2bce248f9b910be65803
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qsvggenerator/tst_qsvggenerator.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp index db7e3e5..4795b55 100644 --- a/tests/auto/qsvggenerator/tst_qsvggenerator.cpp +++ b/tests/auto/qsvggenerator/tst_qsvggenerator.cpp @@ -99,10 +99,14 @@ static void compareWithoutFontInfo(const QByteArray &source, const QByteArray &r QDomDocument referenceDoc; referenceDoc.setContent(reference); - QList<QString> fontAttributes; - fontAttributes << "font-family" << "font-size" << "font-weight" << "font-style"; - - foreach (QString attribute, fontAttributes) { + const QString fontAttributes[] = { + "font-family", + "font-size", + "font-weight", + "font-style", + }; + + for (const QString &attribute : fontAttributes) { removeAttribute(sourceDoc, attribute); removeAttribute(referenceDoc, attribute); } |