Renames jsonFindValueRequired to jsonFindRequired

src/WallpaperEngine/Core/CObject.cpp

@@ -29,12 +29,12 @@ CObject::CObject (
 
 CObject* CObject::fromJSON (json data)
 {
-    auto id_it = jsonFindValueRequired(&data, "id", "Objects must have id");
+    auto id_it = jsonFindRequired (&data, "id", "Objects must have id");
     auto visible_it = data.find ("visible");
-    auto origin_it = jsonFindValueRequired(&data, "origin", "Objects must have origin point");
+    auto origin_it = jsonFindRequired (&data, "origin", "Objects must have origin point");
-    auto scale_it = jsonFindValueRequired(&data, "scale", "Objects must have scale");
+    auto scale_it = jsonFindRequired (&data, "scale", "Objects must have scale");
-    auto angles_it = jsonFindValueRequired(&data, "angles", "Objects must have angles");
+    auto angles_it = jsonFindRequired (&data, "angles", "Objects must have angles");
-    auto name_it = jsonFindValueRequired(&data, "name", "Objects must have name");
+    auto name_it = jsonFindRequired (&data, "name", "Objects must have name");
     auto effects_it = data.find ("effects");
     auto dependencies_it = data.find ("dependencies");
 

src/WallpaperEngine/Core/CScene.cpp

@@ -50,27 +50,27 @@ CScene* CScene::fromFile (const irr::io::path& filename)
 {
     json content = json::parse (WallpaperEngine::FileSystem::loadFullFile (filename));
 
-    auto camera_it = jsonFindValueRequired(&content, "camera", "Scenes must have a defined camera");
+    auto camera_it = jsonFindRequired (&content, "camera", "Scenes must have a defined camera");
-    auto general_it = jsonFindValueRequired(&content, "general", "Scenes must have a general section");
+    auto general_it = jsonFindRequired (&content, "general", "Scenes must have a general section");
-    auto objects_it = jsonFindValueRequired(&content, "objects", "Scenes must have a list of objects to display");
+    auto objects_it = jsonFindRequired (&content, "objects", "Scenes must have a list of objects to display");
 
-    auto ambientcolor_it = jsonFindValueRequired(&(*general_it), "ambientcolor", "General section must have ambient color");
+    auto ambientcolor_it = jsonFindRequired (&(*general_it), "ambientcolor", "General section must have ambient color");
-    auto bloom_it = jsonFindValueRequired(&(*general_it), "bloom", "General section must have bloom flag");
+    auto bloom_it = jsonFindRequired (&(*general_it), "bloom", "General section must have bloom flag");
-    auto bloomstrength_it = jsonFindValueRequired(&(*general_it), "bloomstrength", "General section must have bloom strength");
+    auto bloomstrength_it = jsonFindRequired (&(*general_it), "bloomstrength", "General section must have bloom strength");
-    auto bloomthreshold_it = jsonFindValueRequired(&(*general_it), "bloomthreshold", "General section must have bloom threshold");
+    auto bloomthreshold_it = jsonFindRequired (&(*general_it), "bloomthreshold", "General section must have bloom threshold");
-    auto camerafade_it = jsonFindValueRequired(&(*general_it), "camerafade", "General section must have camera fade");
+    auto camerafade_it = jsonFindRequired (&(*general_it), "camerafade", "General section must have camera fade");
-    auto cameraparallax_it = jsonFindValueRequired(&(*general_it), "cameraparallax", "General section must have camera parallax");
+    auto cameraparallax_it = jsonFindRequired (&(*general_it), "cameraparallax", "General section must have camera parallax");
-    auto cameraparallaxamount_it = jsonFindValueRequired(&(*general_it), "cameraparallaxamount", "General section must have camera parallax amount");
+    auto cameraparallaxamount_it = jsonFindRequired (&(*general_it), "cameraparallaxamount", "General section must have camera parallax amount");
-    auto cameraparallaxdelay_it = jsonFindValueRequired(&(*general_it), "cameraparallaxdelay", "General section must have camera parallax delay");
+    auto cameraparallaxdelay_it = jsonFindRequired (&(*general_it), "cameraparallaxdelay", "General section must have camera parallax delay");
-    auto cameraparallaxmouseinfluence_it = jsonFindValueRequired(&(*general_it), "cameraparallaxmouseinfluence", "General section must have camera parallax mouse influence");
+    auto cameraparallaxmouseinfluence_it = jsonFindRequired (&(*general_it), "cameraparallaxmouseinfluence", "General section must have camera parallax mouse influence");
-    auto camerapreview_it = jsonFindValueRequired(&(*general_it), "camerapreview", "General section must have camera preview");
+    auto camerapreview_it = jsonFindRequired (&(*general_it), "camerapreview", "General section must have camera preview");
-    auto camerashake_it = jsonFindValueRequired(&(*general_it), "camerashake", "General section must have camera shake");
+    auto camerashake_it = jsonFindRequired (&(*general_it), "camerashake", "General section must have camera shake");
-    auto camerashakeamplitude_it = jsonFindValueRequired(&(*general_it), "camerashakeamplitude", "General section must have camera shake amplitude");
+    auto camerashakeamplitude_it = jsonFindRequired (&(*general_it), "camerashakeamplitude", "General section must have camera shake amplitude");
-    auto camerashakeroughness_it = jsonFindValueRequired(&(*general_it), "camerashakeroughness", "General section must have camera shake roughness");
+    auto camerashakeroughness_it = jsonFindRequired (&(*general_it), "camerashakeroughness", "General section must have camera shake roughness");
-    auto camerashakespeed_it = jsonFindValueRequired(&(*general_it), "camerashakespeed", "General section must have camera shake speed");
+    auto camerashakespeed_it = jsonFindRequired (&(*general_it), "camerashakespeed", "General section must have camera shake speed");
-    auto clearcolor_it = jsonFindValueRequired(&(*general_it), "clearcolor", "General section must have clear color");
+    auto clearcolor_it = jsonFindRequired (&(*general_it), "clearcolor", "General section must have clear color");
-    auto orthogonalprojection_it = jsonFindValueRequired(&(*general_it), "orthogonalprojection", "General section must have orthogonal projection info");
+    auto orthogonalprojection_it = jsonFindRequired (&(*general_it), "orthogonalprojection", "General section must have orthogonal projection info");
-    auto skylightcolor_it = jsonFindValueRequired(&(*general_it), "skylightcolor", "General section must have skylight color");
+    auto skylightcolor_it = jsonFindRequired (&(*general_it), "skylightcolor", "General section must have skylight color");
 
     CScene* scene = new CScene (
             Scenes::CCamera::fromJSON (*camera_it),

src/WallpaperEngine/Core/Core.cpp

@@ -60,7 +60,7 @@ irr::video::SColor Core::atoSColor (const std::string& str)
     return Core::atoSColor (str.c_str ());
 }
 
-nlohmann::detail::iter_impl<nlohmann::json> jsonFindValueRequired (nlohmann::json *data, const char *key, const char *notFoundMsg)
+nlohmann::detail::iter_impl<nlohmann::json> jsonFindRequired (nlohmann::json *data, const char *key, const char *notFoundMsg)
 {
     auto value = data->find (key);
     if (value == data->end ())

src/WallpaperEngine/Core/Core.h

@@ -18,5 +18,5 @@ namespace WallpaperEngine::Core
     irr::video::SColor atoSColor (const char *str);
     irr::video::SColor atoSColor (const std::string& str);
 
-    nlohmann::detail::iter_impl<nlohmann::json> jsonFindValueRequired (nlohmann::json *data, const char *key, const char *notFoundMsg);
+    nlohmann::detail::iter_impl<nlohmann::json> jsonFindRequired (nlohmann::json *data, const char *key, const char *notFoundMsg);
 };

src/WallpaperEngine/Core/Objects/CEffect.cpp

@@ -30,17 +30,17 @@ CEffect::CEffect (
 
 CEffect* CEffect::fromJSON (json data, Core::CObject* object)
 {
-    auto file_it = jsonFindValueRequired(&data, "file", "Object effect must have a file");
+    auto file_it = jsonFindRequired (&data, "file", "Object effect must have a file");
     auto effectpasses_it = data.find ("passes");
 
     json content = json::parse (WallpaperEngine::FileSystem::loadFullFile ((*file_it).get <std::string> ().c_str ()));
 
-    auto name_it = jsonFindValueRequired(&content, "name", "Effect must have a name");
+    auto name_it = jsonFindRequired (&content, "name", "Effect must have a name");
-    auto description_it = jsonFindValueRequired(&content, "description", "Effect must have a description");
+    auto description_it = jsonFindRequired (&content, "description", "Effect must have a description");
-    auto group_it = jsonFindValueRequired(&content, "group", "Effect must have a group");
+    auto group_it = jsonFindRequired (&content, "group", "Effect must have a group");
-    auto preview_it = jsonFindValueRequired(&content, "preview", "Effect must have a preview");
+    auto preview_it = jsonFindRequired (&content, "preview", "Effect must have a preview");
-    auto passes_it = jsonFindValueRequired(&content, "passes", "Effect must have a pass list");
+    auto passes_it = jsonFindRequired (&content, "passes", "Effect must have a pass list");
-    auto dependencies_it = jsonFindValueRequired(&content, "dependencies", "");
+    auto dependencies_it = jsonFindRequired (&content, "dependencies", "");
     auto fbos_it = content.find ("fbos");
 
     CEffect* effect = new CEffect (

src/WallpaperEngine/Core/Objects/CImage.cpp

@@ -31,11 +31,11 @@ WallpaperEngine::Core::CObject* CImage::fromJSON (
     const irr::core::vector3df& angles)
 {
     auto image_it = data.find ("image");
-    auto size_it = jsonFindValueRequired(&data, "size", "Images must have size");
+    auto size_it = jsonFindRequired (&data, "size", "Images must have size");
 
     json content = json::parse (WallpaperEngine::FileSystem::loadFullFile ((*image_it).get <std::string> ().c_str ()));
 
-    auto material_it = jsonFindValueRequired(&content, "material", "Image must have a material");
+    auto material_it = jsonFindRequired (&content, "material", "Image must have a material");
 
     return new CImage (
         Images::CMaterial::fromFile ((*material_it).get <std::string> ().c_str ()),

src/WallpaperEngine/Core/Objects/CParticle.cpp

@@ -15,10 +15,10 @@ CParticle* CParticle::fromFile (
 {
     json data = json::parse (WallpaperEngine::FileSystem::loadFullFile (filename));
     auto controlpoint_it = data.find ("controlpoint");
-    auto starttime_it = jsonFindValueRequired(&data, "starttime", "Particles must have start time");
+    auto starttime_it = jsonFindRequired (&data, "starttime", "Particles must have start time");
-    auto maxcount_it = jsonFindValueRequired(&data, "maxcount", "Particles must have maximum count");
+    auto maxcount_it = jsonFindRequired (&data, "maxcount", "Particles must have maximum count");
-    auto emitter_it = jsonFindValueRequired(&data, "emitter", "Particles must have emitters");
+    auto emitter_it = jsonFindRequired (&data, "emitter", "Particles must have emitters");
-    auto initializer_it = jsonFindValueRequired(&data, "initializer", "Particles must have initializers");
+    auto initializer_it = jsonFindRequired (&data, "initializer", "Particles must have initializers");
 
     CParticle* particle = new CParticle (
         *starttime_it,

src/WallpaperEngine/Core/Objects/CSound.cpp

@@ -27,7 +27,7 @@ WallpaperEngine::Core::CObject* CSound::fromJSON (
         const irr::core::vector3df& scale,
         const irr::core::vector3df& angles)
 {
-    auto sound_it = jsonFindValueRequired(&data, "sound", "Sound information not present");
+    auto sound_it = jsonFindRequired (&data, "sound", "Sound information not present");
 
     if ((*sound_it).is_array () == false)
     {

src/WallpaperEngine/Core/Objects/Effects/CBind.cpp

@@ -14,8 +14,8 @@ CBind::CBind (std::string name, irr::u32 index) :
 
 CBind* CBind::fromJSON (json data)
 {
-    auto name_it = jsonFindValueRequired(&data, "name", "bind must have texture name");
+    auto name_it = jsonFindRequired (&data, "name", "bind must have texture name");
-    auto index_it = jsonFindValueRequired(&data, "index", "bind must have index");
+    auto index_it = jsonFindRequired (&data, "index", "bind must have index");
 
     return new CBind (*name_it, *index_it);
 }

src/WallpaperEngine/Core/Objects/Images/CMaterial.cpp

@@ -38,7 +38,7 @@ CMaterial* CMaterial::fromJSON (json data, const std::string& target)
 
 CMaterial* CMaterial::fromJSON (json data)
 {
-    auto passes_it = jsonFindValueRequired(&data, "passes", "Material must have at least one pass");
+    auto passes_it = jsonFindRequired (&data, "passes", "Material must have at least one pass");
 
     CMaterial* material = new CMaterial ();
 

src/WallpaperEngine/Core/Objects/Images/Materials/CPass.cpp

@@ -16,11 +16,11 @@ CPass::CPass (std::string blending, std::string cullmode, std::string depthtest,
 
 CPass* CPass::fromJSON (json data)
 {
-    auto blending_it = jsonFindValueRequired(&data, "blending", "Material pass must have blending specified");
+    auto blending_it = jsonFindRequired (&data, "blending", "Material pass must have blending specified");
-    auto cullmode_it = jsonFindValueRequired(&data, "cullmode", "Material pass must have cullmode specified");
+    auto cullmode_it = jsonFindRequired (&data, "cullmode", "Material pass must have cullmode specified");
-    auto depthtest_it = jsonFindValueRequired(&data, "depthtest", "Material pass must have depthtest specified");
+    auto depthtest_it = jsonFindRequired (&data, "depthtest", "Material pass must have depthtest specified");
-    auto depthwrite_it = jsonFindValueRequired(&data, "depthwrite", "Material pass must have depthwrite specified");
+    auto depthwrite_it = jsonFindRequired (&data, "depthwrite", "Material pass must have depthwrite specified");
-    auto shader_it = jsonFindValueRequired(&data, "shader", "Material pass must have shader specified");
+    auto shader_it = jsonFindRequired (&data, "shader", "Material pass must have shader specified");
     auto textures_it = data.find ("textures");
     auto combos_it = data.find ("combos");
 

src/WallpaperEngine/Core/Objects/Particles/CControlPoint.cpp

@@ -7,7 +7,7 @@ using namespace WallpaperEngine::Core::Objects::Particles;
 CControlPoint* CControlPoint::fromJSON (json data)
 {
     auto flags_it = data.find ("flags");
-    auto id_it = jsonFindValueRequired(&data, "id", "Particle's control point must have id");
+    auto id_it = jsonFindRequired (&data, "id", "Particle's control point must have id");
     auto offset_it = data.find ("offset");
 
     CControlPoint* controlpoint = new CControlPoint (*id_it, 0);

src/WallpaperEngine/Core/Objects/Particles/CEmitter.cpp

@@ -6,13 +6,13 @@ using namespace WallpaperEngine::Core::Objects::Particles;
 
 CEmitter* CEmitter::fromJSON (json data)
 {
-    auto directions_it = jsonFindValueRequired(&data, "directions", "Particle emitter must have direction specified");
+    auto directions_it = jsonFindRequired (&data, "directions", "Particle emitter must have direction specified");
-    auto distancemax_it = jsonFindValueRequired(&data, "distancemax", "Particle emitter must have maximum distance");
+    auto distancemax_it = jsonFindRequired (&data, "distancemax", "Particle emitter must have maximum distance");
-    auto distancemin_it = jsonFindValueRequired(&data, "distancemin", "Particle emitter must have minimum distance");
+    auto distancemin_it = jsonFindRequired (&data, "distancemin", "Particle emitter must have minimum distance");
     auto id_it = data.find ("id");
-    auto name_it = jsonFindValueRequired(&data, "name", "Particle emitter must have a name");
+    auto name_it = jsonFindRequired (&data, "name", "Particle emitter must have a name");
-    auto origin_it = jsonFindValueRequired(&data, "origin", "Particle emitter must have an origin");
+    auto origin_it = jsonFindRequired (&data, "origin", "Particle emitter must have an origin");
-    auto rate_it = jsonFindValueRequired(&data, "rate", "Particle emitter must have a rate");
+    auto rate_it = jsonFindRequired (&data, "rate", "Particle emitter must have a rate");
 
     return new CEmitter (
             WallpaperEngine::Core::ato3vf (*directions_it),

src/WallpaperEngine/Core/Objects/Particles/CInitializer.cpp

@@ -14,7 +14,7 @@ using namespace WallpaperEngine::Core::Objects::Particles;
 CInitializer* CInitializer::fromJSON (json data)
 {
     auto id_it = data.find ("id");
-    auto name_it = jsonFindValueRequired(&data, "name", "Particle's initializer must have a name");
+    auto name_it = jsonFindRequired (&data, "name", "Particle's initializer must have a name");
     irr::u32 id = ((id_it == data.end ()) ? 0 : (irr::u32) (*id_it));
 
     if (*name_it == "lifetimerandom")

src/WallpaperEngine/Core/Objects/Particles/Initializers/CAlphaRandom.cpp

@@ -6,8 +6,8 @@ using namespace WallpaperEngine::Core::Objects::Particles::Initializers;
 
 CAlphaRandom* CAlphaRandom::fromJSON (json data, irr::u32 id)
 {
-    auto min_it = jsonFindValueRequired(&data, "min", "Alpharandom initializer must have a minimum value");
+    auto min_it = jsonFindRequired (&data, "min", "Alpharandom initializer must have a minimum value");
-    auto max_it = jsonFindValueRequired(&data, "max", "Alpharandom initializer must have a maximum value");
+    auto max_it = jsonFindRequired (&data, "max", "Alpharandom initializer must have a maximum value");
 
     return new CAlphaRandom (id, *min_it, *max_it);
 }

src/WallpaperEngine/Core/Objects/Particles/Initializers/CAngularVelocityRandom.cpp

@@ -6,8 +6,8 @@ using namespace WallpaperEngine::Core::Objects::Particles::Initializers;
 
 CAngularVelocityRandom* CAngularVelocityRandom::fromJSON (json data, irr::u32 id)
 {
-    auto min_it = jsonFindValueRequired(&data, "min", "Angularvelocityrandom initializer must have a minimum value");
+    auto min_it = jsonFindRequired (&data, "min", "Angularvelocityrandom initializer must have a minimum value");
-    auto max_it = jsonFindValueRequired(&data, "max", "Angularvelocityrandom initializer must have a maximum value");
+    auto max_it = jsonFindRequired (&data, "max", "Angularvelocityrandom initializer must have a maximum value");
 
     return new CAngularVelocityRandom (
             id,

src/WallpaperEngine/Core/Objects/Particles/Initializers/CColorRandom.cpp

@@ -6,8 +6,8 @@ using namespace WallpaperEngine::Core::Objects::Particles::Initializers;
 
 CColorRandom* CColorRandom::fromJSON (json data, irr::u32 id)
 {
-    auto min_it = jsonFindValueRequired(&data, "min", "Colorrandom initializer must have a minimum value");
+    auto min_it = jsonFindRequired (&data, "min", "Colorrandom initializer must have a minimum value");
-    auto max_it = jsonFindValueRequired(&data, "min", "Colorrandom initializer must have a maximum value");
+    auto max_it = jsonFindRequired (&data, "min", "Colorrandom initializer must have a maximum value");
 
     return new CColorRandom (
             id,

src/WallpaperEngine/Core/Objects/Particles/Initializers/CLifeTimeRandom.cpp

@@ -6,8 +6,8 @@ using namespace WallpaperEngine::Core::Objects::Particles::Initializers;
 
 CLifeTimeRandom* CLifeTimeRandom::fromJSON (json data, irr::u32 id)
 {
-    auto min_it = jsonFindValueRequired(&data, "min", "Lifetimerandom initializer must have a minimum value");
+    auto min_it = jsonFindRequired (&data, "min", "Lifetimerandom initializer must have a minimum value");
-    auto max_it = jsonFindValueRequired(&data, "min", "Lifetimerandom initializer must have a maximum value");
+    auto max_it = jsonFindRequired (&data, "min", "Lifetimerandom initializer must have a maximum value");
 
     return new CLifeTimeRandom (id, *min_it, *max_it);
 }

src/WallpaperEngine/Core/Objects/Particles/Initializers/CSizeRandom.cpp

@@ -6,8 +6,8 @@ using namespace WallpaperEngine::Core::Objects::Particles::Initializers;
 
 CSizeRandom* CSizeRandom::fromJSON (json data, irr::u32 id)
 {
-    auto min_it = jsonFindValueRequired(&data, "min", "Sizerandom initializer must have a minimum value");
+    auto min_it = jsonFindRequired (&data, "min", "Sizerandom initializer must have a minimum value");
-    auto max_it = jsonFindValueRequired(&data, "min", "Sizerandom initializer must have a maximum value");
+    auto max_it = jsonFindRequired (&data, "min", "Sizerandom initializer must have a maximum value");
 
     return new CSizeRandom (id, *min_it, *max_it);
 }

src/WallpaperEngine/Core/Objects/Particles/Initializers/CVelocityRandom.cpp

@@ -6,8 +6,8 @@ using namespace WallpaperEngine::Core::Objects::Particles::Initializers;
 
 CVelocityRandom* CVelocityRandom::fromJSON (json data, irr::u32 id)
 {
-    auto min_it = jsonFindValueRequired(&data, "min", "Velocityrandom initializer must have a minimum value");
+    auto min_it = jsonFindRequired (&data, "min", "Velocityrandom initializer must have a minimum value");
-    auto max_it = jsonFindValueRequired(&data, "max", "Velocityrandom initializer must have a maximum value");
+    auto max_it = jsonFindRequired (&data, "max", "Velocityrandom initializer must have a maximum value");
 
     return new CVelocityRandom (
             id,

src/WallpaperEngine/Core/Projects/CProperty.cpp

@@ -7,8 +7,8 @@ using namespace WallpaperEngine::Core::Projects;
 
 CProperty* CProperty::fromJSON (json data, const std::string& name)
 {
-    auto type = jsonFindValueRequired(&data, "type", "Project properties must have the type field");
+    auto type = jsonFindRequired (&data, "type", "Project properties must have the type field");
-    auto value = jsonFindValueRequired(&data, "value", "Project properties must have the value field");
+    auto value = jsonFindRequired (&data, "value", "Project properties must have the value field");
     auto text = data.find ("text");
 
     if (*type == CPropertyColor::Type)

src/WallpaperEngine/Core/Scenes/CCamera.cpp

@@ -27,9 +27,9 @@ const irr::core::vector3df& CCamera::getUp () const
 
 CCamera* CCamera::fromJSON (json data)
 {
-    auto center_it = jsonFindValueRequired(&data, "center", "Camera must have a center position");
+    auto center_it = jsonFindRequired (&data, "center", "Camera must have a center position");
-    auto eye_it = jsonFindValueRequired(&data, "eye", "Camera must have an eye position");
+    auto eye_it = jsonFindRequired (&data, "eye", "Camera must have an eye position");
-    auto up_it = jsonFindValueRequired(&data, "up", "Camera must have a up position");
+    auto up_it = jsonFindRequired (&data, "up", "Camera must have a up position");
 
     return new CCamera (
         WallpaperEngine::Core::ato3vf (*center_it),

src/WallpaperEngine/Core/Scenes/CProjection.cpp

@@ -21,8 +21,8 @@ const irr::u32& CProjection::getHeight () const
 
 CProjection* CProjection::fromJSON (json data)
 {
-    auto width_it = jsonFindValueRequired(&data, "width", "Projection must have width");
+    auto width_it = jsonFindRequired (&data, "width", "Projection must have width");
-    auto height_it = jsonFindValueRequired(&data, "height", "Projection must have height");
+    auto height_it = jsonFindRequired (&data, "height", "Projection must have height");
 
     return new CProjection (
         *width_it,

src/WallpaperEngine/Render/Shaders/Compiler.cpp

@@ -485,8 +485,8 @@ namespace WallpaperEngine::Render::Shaders
     void Compiler::parseComboConfiguration (const std::string& content)
     {
         json data = json::parse (content);
-        auto combo = jsonFindValueRequired(&data, "combo", "cannot parse combo information");
+        auto combo = jsonFindRequired (&data, "combo", "cannot parse combo information");
-        auto defvalue = jsonFindValueRequired(&data, "default", "cannot parse combo information");
+        auto defvalue = jsonFindRequired (&data, "default", "cannot parse combo information");
 
         // add line feed just in case
         this->m_compiledContent += "\n";