diff --git a/src/examples/example02_parse_account.cpp b/src/examples/example02_parse_account.cpp index 5e154df..7cc9064 100644 --- a/src/examples/example02_parse_account.cpp +++ b/src/examples/example02_parse_account.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "../mastodon-cpp.hpp" @@ -22,14 +23,15 @@ int main(int argc, char *argv[]) Mastodon::API masto(argv[1], argv[2]); std::string answer; + std::stringstream ss; std::uint16_t ret; ret = masto.get(API::v1::accounts_verify_credentials, answer); if (ret == 0) { - Json::Reader reader; + ss.str(answer); Json::Value json; - reader.parse(answer, json); + ss >> json; std::string uid = json["id"].asString(); cout << "Your ID is: " << uid << '\n'; diff --git a/src/examples/example03_mastocron.cpp b/src/examples/example03_mastocron.cpp index 6896b01..21cfe44 100644 --- a/src/examples/example03_mastocron.cpp +++ b/src/examples/example03_mastocron.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "../mastodon-cpp.hpp" @@ -33,6 +34,7 @@ int main(int argc, char *argv[]) Mastodon::API masto(argv[1], ""); string hashtag = argv[2]; string answer; + std::stringstream ss; std::uint16_t ret; Json::Value config; string lastid = "0"; @@ -40,7 +42,6 @@ int main(int argc, char *argv[]) // Read config file, get last seen toot-id try { - Json::Reader reader; std::ifstream file(filename, std::ifstream::binary); file >> config; lastid = config.get(hashtag, "0").asString(); @@ -74,9 +75,9 @@ int main(int argc, char *argv[]) cout << ornament << '\n'; Json::Value tree; - Json::Reader reader; + ss.str(answer); + ss >> tree; - reader.parse(answer, tree); for (const auto &toot : tree) { string content = toot["content"].asString(); @@ -102,8 +103,8 @@ int main(int argc, char *argv[]) lastid = tree[0]["id"].asString(); config[hashtag] = lastid; - Json::StyledWriter writer; - const string output = writer.write(config); + Json::StreamWriterBuilder wbuilder; + const string output = Json::writeString(wbuilder, config); std::ofstream outfile(filename); if (outfile.is_open()) { diff --git a/src/examples/example11_post_media.cpp b/src/examples/example11_post_media.cpp index 922cecd..b93dd43 100644 --- a/src/examples/example11_post_media.cpp +++ b/src/examples/example11_post_media.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "../mastodon-cpp.hpp" @@ -21,8 +22,8 @@ int main(int argc, char *argv[]) Mastodon::API masto(argv[1], argv[2]); std::string answer; + std::stringstream ss; Json::Value json; - Json::Reader reader; std::uint16_t ret; std::string filepath; @@ -36,7 +37,8 @@ int main(int argc, char *argv[]) ret = masto.post(API::v1::media, parameters, answer); if (ret == 0) { - reader.parse(answer, json); + ss.str(answer); + ss >> json; std::string image1_id = json["id"].asString(); std::string image1_url = json["url"].asString(); parameters = @@ -46,7 +48,8 @@ int main(int argc, char *argv[]) ret = masto.post(API::v1::media, parameters, answer); if (ret == 0) { - reader.parse(answer, json); + ss.str(answer); + ss >> json; std::string image2_id = json["id"].asString(); std::string image2_url = json["url"].asString(); parameters =