From 8b9e31d8e47daf1f94098667567ad2b47848dd27 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 26 Dec 2013 14:34:51 +0100 Subject: [PATCH] Convert to C++11 style for loops --- src/libdanbooru/danboorupool.cpp | 3 ++- src/libdanbooru/danboorupost.cpp | 1 + src/libdanbooru/utils.cpp | 18 ++++++------------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/libdanbooru/danboorupool.cpp b/src/libdanbooru/danboorupool.cpp index c87e62b..9d3f0c2 100644 --- a/src/libdanbooru/danboorupool.cpp +++ b/src/libdanbooru/danboorupool.cpp @@ -70,7 +70,8 @@ void DanbooruPool::addPosts(QList< int > posts) void DanbooruPool::addPosts(const QStringList& posts) { - foreach (const QString& post, posts) { + + for (auto post: posts) { m_posts.append(post.toInt()); } } diff --git a/src/libdanbooru/danboorupost.cpp b/src/libdanbooru/danboorupost.cpp index 0a77362..c049572 100644 --- a/src/libdanbooru/danboorupost.cpp +++ b/src/libdanbooru/danboorupost.cpp @@ -84,6 +84,7 @@ namespace Danbooru { const QMap< QString, Rating > DanbooruPost::initRatingMap() { + QMap map; map.insert("s", Safe); map.insert("q", Questionable); diff --git a/src/libdanbooru/utils.cpp b/src/libdanbooru/utils.cpp index 74383c4..11a4652 100644 --- a/src/libdanbooru/utils.cpp +++ b/src/libdanbooru/utils.cpp @@ -45,12 +45,9 @@ namespace Danbooru { if (!parameters.isEmpty()) { - QMap::const_iterator iter; - - for (iter = parameters.constBegin(); iter!= parameters.constEnd(); - ++iter) { - danbooruUrl.addQueryItem(iter.key(), iter.value()); - } + for (auto key: parameters.keys()) { + danbooruUrl.addQueryItem(key, parameters.value(key)); + } } @@ -80,12 +77,9 @@ namespace Danbooru { if (!parameters.isEmpty()) { - QMap::const_iterator iter; - - for (iter = parameters.constBegin(); iter!= parameters.constEnd(); - ++iter) { - danbooruUrl.addQueryItem(iter.key(), iter.value()); - } + for (auto key: parameters.keys()) { + danbooruUrl.addQueryItem(key, parameters.value(key)); + } }