Changed for-loop to std::transform.

This commit is contained in:
tastytea 2019-03-31 00:02:02 +01:00
parent 94651f8dba
commit 6690d2bd0b
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
1 changed files with 13 additions and 16 deletions

View File

@ -15,6 +15,7 @@
*/ */
#include <iostream> #include <iostream>
#include <algorithm>
#include <jsoncpp/json/json.h> #include <jsoncpp/json/json.h>
#include "status.hpp" #include "status.hpp"
@ -99,10 +100,9 @@ const std::vector<Easy::Emoji> Status::emojis() const
if (node.isArray()) if (node.isArray())
{ {
std::vector<Easy::Emoji> vec; std::vector<Easy::Emoji> vec;
for (const Json::Value &value : node) std::transform(node.begin(), node.end(), std::back_inserter(vec),
{ [](const Json::Value &value)
vec.push_back(Easy::Emoji(value.toStyledString())); { return Easy::Emoji(value); });
}
return vec; return vec;
} }
@ -157,10 +157,9 @@ const std::vector<Easy::Attachment> Status::media_attachments() const
if (node.isArray()) if (node.isArray())
{ {
std::vector<Easy::Attachment> vec; std::vector<Easy::Attachment> vec;
for (const Json::Value &value : node) std::transform(node.begin(), node.end(), std::back_inserter(vec),
{ [](const Json::Value &value)
vec.push_back(Easy::Attachment(value.toStyledString())); { return Easy::Attachment(value); });
}
return vec; return vec;
} }
@ -187,10 +186,9 @@ const std::vector<Easy::Mention> Status::mentions() const
if (node.isArray()) if (node.isArray())
{ {
std::vector<Easy::Mention> vec; std::vector<Easy::Mention> vec;
for (const Json::Value &value : node) std::transform(node.begin(), node.end(), std::back_inserter(vec),
{ [](const Json::Value &value)
vec.push_back(Easy::Mention(value.toStyledString())); { return Easy::Mention(value); });
}
return vec; return vec;
} }
@ -261,10 +259,9 @@ const std::vector<Easy::Tag> Status::tags() const
if (node.isArray()) if (node.isArray())
{ {
std::vector<Easy::Tag> vec; std::vector<Easy::Tag> vec;
for (const Json::Value &value : node) std::transform(node.begin(), node.end(), std::back_inserter(vec),
{ [](const Json::Value &value)
vec.push_back(Easy::Tag(value.toStyledString())); { return Easy::Tag(value); });
}
return vec; return vec;
} }