aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/context2d/qquickcontext2d.cpp
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-13 15:21:06 +0300
committerAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-14 09:52:36 +0000
commitd64642d227be7e0ec47fd4580c0847ab59fdc017 (patch)
tree8a6150d270aa0373eb13b954f5196ea952420abe /src/quick/items/context2d/qquickcontext2d.cpp
parent24d06e7ab56bd8f0262d4135207adee20befc7c1 (diff)
context2d: replace foreach with range-based for
Change-Id: I28156cf5dd8d5197d4e47ecbb8cacdb6722cd6fb Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/quick/items/context2d/qquickcontext2d.cpp')
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index ee880f129d..e6d0b42419 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -300,7 +300,7 @@ static QStringList qExtractFontFamiliesFromString(const QString &fontFamiliesStr
*/
static bool qSetFontFamilyFromTokens(QFont &font, const QStringList &fontFamilyTokens)
{
- foreach (const QString &fontFamilyToken, fontFamilyTokens) {
+ for (const QString &fontFamilyToken : fontFamilyTokens) {
QFontDatabase fontDatabase;
if (fontDatabase.hasFamily(fontFamilyToken)) {
font.setFamily(fontFamilyToken);
@@ -411,7 +411,7 @@ static QFont qt_font_from_string(const QString& fontString, const QFont &current
int usedTokens = NoTokens;
// Optional properties can be in any order, but font-size and font-family must be last.
- foreach (const QString &token, tokens) {
+ for (const QString &token : tokens) {
if (token.compare(QLatin1String("normal")) == 0) {
if (!(usedTokens & FontStyle) || !(usedTokens & FontVariant) || !(usedTokens & FontWeight)) {
// Could be font-style, font-variant or font-weight.