[General]: Fix capitalization inconsistency (#1055)

This commit is contained in:
Edo 2023-05-22 12:13:43 +01:00 committed by GitHub
parent 02c2df9bed
commit 6baca79165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 19 additions and 21 deletions

View File

@ -110,7 +110,7 @@ namespace Assets
}
catch (const nlohmann::json::parse_error& ex)
{
Components::Logger::Error(Game::ERR_FATAL, "Json Parse Error: {}. Font {} is invalid\n", ex.what(), name);
Components::Logger::Error(Game::ERR_FATAL, "JSON Parse Error: {}. Font {} is invalid\n", ex.what(), name);
return;
}

View File

@ -82,7 +82,7 @@ namespace Assets
}
}
void ILocalizeEntry::ParseLocalizedStringsJson(Components::ZoneBuilder::Zone* builder, Components::FileSystem::File& file)
void ILocalizeEntry::ParseLocalizedStringsJSON(Components::ZoneBuilder::Zone* builder, Components::FileSystem::File& file)
{
nlohmann::json localize;
try

View File

@ -11,6 +11,6 @@ namespace Assets
void save(Game::XAssetHeader header, Components::ZoneBuilder::Zone* builder) override;
static void ParseLocalizedStringsFile(Components::ZoneBuilder::Zone* builder, const std::string& name, const std::string& filename);
static void ParseLocalizedStringsJson(Components::ZoneBuilder::Zone* builder, Components::FileSystem::File& file);
static void ParseLocalizedStringsJSON(Components::ZoneBuilder::Zone* builder, Components::FileSystem::File& file);
};
}

View File

@ -1,8 +1,6 @@
#include <STDInclude.hpp>
#include "IMaterialTechniqueSet.hpp"
#include <Utils/Json.hpp>
#define IW4X_TECHSET_VERSION 1
namespace Assets

View File

@ -1,7 +1,7 @@
#include <STDInclude.hpp>
#include "Isnd_alias_list_t.hpp"
#include <Utils/Json.hpp>
#include <Utils/JSON.hpp>
namespace Assets
{

View File

@ -141,7 +141,7 @@ namespace Components
}
catch (const std::exception& ex)
{
Logger::PrintError(Game::CON_CHANNEL_ERROR, "Json Parse Error: {}\n", ex.what());
Logger::PrintError(Game::CON_CHANNEL_ERROR, "JSON Parse Error: {}\n", ex.what());
return;
}

View File

@ -89,7 +89,7 @@ namespace Components
}
catch (const nlohmann::json::parse_error& ex)
{
Logger::PrintError(Game::CON_CHANNEL_ERROR, "Json Parse Error: {}\n", ex.what());
Logger::PrintError(Game::CON_CHANNEL_ERROR, "JSON Parse Error: {}\n", ex.what());
return false;
}
@ -124,7 +124,7 @@ namespace Components
}
catch (const nlohmann::json::exception& ex)
{
Logger::PrintError(Game::CON_CHANNEL_ERROR, "Json Error: {}\n", ex.what());
Logger::PrintError(Game::CON_CHANNEL_ERROR, "JSON Error: {}\n", ex.what());
return false;
}
}

View File

@ -104,7 +104,7 @@ namespace Components::GSC
}
catch (const std::exception& ex)
{
Logger::PrintError(Game::CON_CHANNEL_ERROR, "Json Parse Error: {}. File {} is invalid\n", ex.what(), storageFile.getName());
Logger::PrintError(Game::CON_CHANNEL_ERROR, "JSON Parse Error: {}. File {} is invalid\n", ex.what(), storageFile.getName());
}
});

View File

@ -119,13 +119,13 @@ namespace Components
}
}
auto mapRotationJson = nlohmann::json
auto mapRotationJSON = nlohmann::json
{
{ "maps", mapVector },
{ "gametypes", gametypeVector },
};
return mapRotationJson;
return mapRotationJSON;
}
void MapRotation::ParseRotation(const std::string& data)

View File

@ -339,7 +339,7 @@ namespace Components
}
catch (const nlohmann::json::parse_error& ex)
{
Logger::PrintError(Game::CON_CHANNEL_ERROR, "Json Parse Error: {}\n", ex.what());
Logger::PrintError(Game::CON_CHANNEL_ERROR, "JSON Parse Error: {}\n", ex.what());
return;
}
@ -385,7 +385,7 @@ namespace Components
}
catch (const nlohmann::json::parse_error& ex)
{
Logger::PrintError(Game::CON_CHANNEL_ERROR, "Json Parse Error: {}\n", ex.what());
Logger::PrintError(Game::CON_CHANNEL_ERROR, "JSON Parse Error: {}\n", ex.what());
return;
}
@ -438,7 +438,7 @@ namespace Components
}
catch (const nlohmann::json::parse_error& ex)
{
Logger::PrintError(Game::CON_CHANNEL_ERROR, "Json Parse Error: {}\n", ex.what());
Logger::PrintError(Game::CON_CHANNEL_ERROR, "JSON Parse Error: {}\n", ex.what());
return;
}

View File

@ -202,7 +202,7 @@ namespace Components
}
catch (const nlohmann::json::parse_error& ex)
{
Logger::PrintError(Game::CON_CHANNEL_ERROR, "Json Parse Error: {}\n", ex.what());
Logger::PrintError(Game::CON_CHANNEL_ERROR, "JSON Parse Error: {}\n", ex.what());
return;
}

View File

@ -258,7 +258,7 @@ namespace Components
}
catch (const nlohmann::json::parse_error& ex)
{
Logger::PrintError(Game::CON_CHANNEL_ERROR, "Json Parse Error: {}\n", ex.what());
Logger::PrintError(Game::CON_CHANNEL_ERROR, "JSON Parse Error: {}\n", ex.what());
}
}
}

View File

@ -181,7 +181,7 @@ namespace Components
if (FileSystem::File file = std::format("localizedstrings/{}.json", filename))
{
Assets::ILocalizeEntry::ParseLocalizedStringsJson(this, file);
Assets::ILocalizeEntry::ParseLocalizedStringsJSON(this, file);
continue;
}
}

View File

@ -1,9 +1,9 @@
#include <STDInclude.hpp>
#include <bitset>
#include "Json.hpp"
#include "JSON.hpp"
namespace Utils::Json
namespace Utils::JSON
{
std::string TypeToString(const nlohmann::json::value_t type)
{

View File

@ -2,7 +2,7 @@
#include <json.hpp>
namespace Utils::Json
namespace Utils::JSON
{
std::string TypeToString(nlohmann::json::value_t type);