# HG changeset patch # User Sebastien Jodogne # Date 1754666193 -7200 # Node ID 122f7b1ddaa63647782b8a5bca8feda5f94b70d3 # Parent 035555a82e1438575f1cfa371f7fbaf00d26a58e removed function not generic enough: Toolbox::MergeJson() diff -r 035555a82e14 -r 122f7b1ddaa6 OrthancFramework/Sources/Toolbox.cpp --- a/OrthancFramework/Sources/Toolbox.cpp Thu Jul 24 18:59:12 2025 +0200 +++ b/OrthancFramework/Sources/Toolbox.cpp Fri Aug 08 17:16:33 2025 +0200 @@ -2700,31 +2700,6 @@ #endif } - void Toolbox::MergeJson(Json::Value &a, const Json::Value &b) - { - if (!a.isObject() || !b.isObject()) - { - return; - } - - Json::Value::Members members = b.getMemberNames(); - - for (size_t i = 0; i < members.size(); i++) - { - std::string key = members[i]; - - if (!a[key].isNull() && a[key].type() == Json::objectValue && b[key].type() == Json::objectValue) - { - MergeJson(a[key], b[key]); - } - else - { - a[key] = b[key]; - } - } - } - - void Toolbox::RemoveSurroundingQuotes(std::string& value) { if (!value.empty() && diff -r 035555a82e14 -r 122f7b1ddaa6 OrthancFramework/Sources/Toolbox.h --- a/OrthancFramework/Sources/Toolbox.h Thu Jul 24 18:59:12 2025 +0200 +++ b/OrthancFramework/Sources/Toolbox.h Fri Aug 08 17:16:33 2025 +0200 @@ -403,8 +403,6 @@ static void WriteStyledJson(std::string& target, const Json::Value& source); - static void MergeJson(Json::Value &a, const Json::Value &b); - static void RemoveSurroundingQuotes(std::string& value); class ORTHANC_PUBLIC ElapsedTimer : public boost::noncopyable