mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-09-14 13:56:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Missed a few replacements of content.find

Browse Source
This commit is contained in:
IceCryptonym 2020-03-24 19:04:44 +10:00
parent 5122206d83
commit 7baa77ef7e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/WallpaperEngine/Core/CProject.cpp
View File

@ -18,9 +18,9 @@ CProject* CProject::fromFile (const irr::io::path& filename)
{ {
json content = json::parse (WallpaperEngine::FileSystem::loadFullFile (filename)); json content = json::parse (WallpaperEngine::FileSystem::loadFullFile (filename));
auto title = jsonFindValueRequired (&content, "title", "Project title missing"); auto title = jsonFindRequired (&content, "title", "Project title missing");
auto type = jsonFindValueRequired (&content, "title", "Project type missing"); auto type = jsonFindRequired (&content, "title", "Project type missing");
auto file = jsonFindValueRequired (&content, "title", "Project's main file missing"); auto file = jsonFindRequired (&content, "title", "Project's main file missing");
auto general = content.find ("general"); auto general = content.find ("general");
CProject* project = new CProject ( CProject* project = new CProject (

2
src/WallpaperEngine/Core/Core.cpp
View File

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