From 92af9748947d45495d68fe28aa134626dcb93f6c Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 24 Dec 2013 10:25:43 +0100 Subject: [PATCH] Use C++11 for syntax --- src/libdanbooru/danbooruservice.cpp | 9 +++++---- src/libdanbooru/utils.cpp | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libdanbooru/danbooruservice.cpp b/src/libdanbooru/danbooruservice.cpp index a890003..ab31448 100644 --- a/src/libdanbooru/danbooruservice.cpp +++ b/src/libdanbooru/danbooruservice.cpp @@ -325,7 +325,7 @@ namespace Danbooru { m_currentPosts = postList.length(); - Q_FOREACH(const QVariant& element, postList) { + for (auto element: postList) { QVariantMap map = element.toMap(); @@ -405,6 +405,7 @@ namespace Danbooru { SLOT(downloadThumbnail(KJob*))); } + } } @@ -437,7 +438,7 @@ namespace Danbooru { return; } - Q_FOREACH(const QVariant& element, tagList) { + for (auto element: tagList) { QVariantMap map = element.toMap(); DanbooruTag* tag = new DanbooruTag(map); Q_EMIT(tagDownloaded(tag)); @@ -485,7 +486,7 @@ namespace Danbooru { continue; } - Q_FOREACH(const QVariant& tag, tags) { + for (auto tag: tags) { // We get the first element in the list, the second is // the ID which is useless (no API methods in Danbooru) QString tagName = tag.toList()[0].toString(); @@ -522,7 +523,7 @@ namespace Danbooru { return; } - Q_FOREACH(const QVariant& element, poolList) { + for (auto element: poolList) { QVariantMap map = element.toMap(); DanbooruPool* pool = new DanbooruPool(map); diff --git a/src/libdanbooru/utils.cpp b/src/libdanbooru/utils.cpp index b96ed1f..74383c4 100644 --- a/src/libdanbooru/utils.cpp +++ b/src/libdanbooru/utils.cpp @@ -25,7 +25,7 @@ // Qt #include -#include +#include // KDE @@ -137,7 +137,7 @@ namespace Danbooru { // qDebug() << attributes; - Q_FOREACH(const QXmlStreamAttribute& attribute, attributes) { + for (auto attribute: attributes) { values.insert(attribute.name().toString(), attribute.value().toString()); }