mirror of
https://github.com/J-D-K/JKSV.git
synced 2026-04-25 16:15:11 -05:00
Fix json header issue.
This commit is contained in:
parent
c677189452
commit
98c00ff858
|
|
@ -1,5 +1,5 @@
|
|||
#pragma once
|
||||
#include "JSON.hpp"
|
||||
#include "json.hpp"
|
||||
#include "remote/Storage.hpp"
|
||||
|
||||
#include <ctime>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#include "config/ConfigContext.hpp"
|
||||
|
||||
#include "JSON.hpp"
|
||||
#include "config/keys.hpp"
|
||||
#include "error.hpp"
|
||||
#include "json.hpp"
|
||||
#include "logging/logger.hpp"
|
||||
#include "stringutil.hpp"
|
||||
|
||||
|
|
@ -201,9 +201,7 @@ bool config::ConfigContext::load_config_file()
|
|||
else if (scaling) { m_animationScaling = json_object_get_double(value); }
|
||||
else if (favorites) { ConfigContext::read_array_to_set(m_favorites, value); }
|
||||
else if (blacklist) { ConfigContext::read_array_to_set(m_blacklist, value); }
|
||||
else {
|
||||
m_configMap[key] = json_object_get_uint64(value);
|
||||
}
|
||||
else { m_configMap[key] = json_object_get_uint64(value); }
|
||||
|
||||
json_object_iter_next(&configIter);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include "fs/PathFilter.hpp"
|
||||
|
||||
#include "JSON.hpp"
|
||||
#include "json.hpp"
|
||||
|
||||
fs::PathFilter::PathFilter(const fslib::Path &filePath)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#include "remote/WebDav.hpp"
|
||||
|
||||
#include "JSON.hpp"
|
||||
#include "curl/curl.hpp"
|
||||
#include "error.hpp"
|
||||
#include "json.hpp"
|
||||
#include "logging/logger.hpp"
|
||||
#include "remote/remote.hpp"
|
||||
#include "strings/strings.hpp"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#include "strings/strings.hpp"
|
||||
|
||||
#include "JSON.hpp"
|
||||
#include "config/config.hpp"
|
||||
#include "error.hpp"
|
||||
#include "fslib.hpp"
|
||||
#include "json.hpp"
|
||||
#include "logging/logger.hpp"
|
||||
#include "stringutil.hpp"
|
||||
#include "sys/defines.hpp"
|
||||
|
|
@ -121,9 +121,7 @@ static fslib::Path get_file_path()
|
|||
const bool codeError = error::libnx(setGetLanguageCode(&languageCode));
|
||||
const bool langError = !codeError && error::libnx(setMakeLanguage(languageCode, &language));
|
||||
if (forceEnglish || codeError || langError) { returnPath /= PATH_ARRAY[SetLanguage_ENUS]; }
|
||||
else {
|
||||
returnPath /= PATH_ARRAY[language];
|
||||
}
|
||||
else { returnPath /= PATH_ARRAY[language]; }
|
||||
|
||||
return returnPath;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user