zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code Quality: Use enum class instead of enum to make sure enum members can only be accessed when scoped to the enum

Browse Source
This commit is contained in:
Jan 2019-10-02 12:48:58 +02:00
parent 2c611a1368
commit 9d1b7325a2
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Crypto/Crypto.h
View File

@ -6,7 +6,7 @@
class Crypto class Crypto
{ {
public: public:
enum RSAPaddingMode enum class RSAPaddingMode
{ {
RSA_PADDING_PKS1, RSA_PADDING_PKS1,
RSA_PADDING_PSS, RSA_PADDING_PSS,

2
src/Crypto/IPublicKeyAlgorithm.h
View File

@ -5,7 +5,7 @@
class IPublicKeyAlgorithm class IPublicKeyAlgorithm
{ {
public: public:
enum HashingAlgorithm enum class HashingAlgorithm
{ {
RSA_HASH_SHA256, RSA_HASH_SHA256,
RSA_HASH_SHA512 RSA_HASH_SHA512

8
src/Crypto/Impl/AlgorithmRSA.cpp
View File

@ -13,11 +13,11 @@ class AlgorithmRSA::AlgorithmRSAImpl
{ {
switch(m_hash) switch(m_hash)
{ {
case RSA_HASH_SHA256: case HashingAlgorithm::RSA_HASH_SHA256:
return &sha256_desc; return &sha256_desc;
default: default:
case RSA_HASH_SHA512: case HashingAlgorithm::RSA_HASH_SHA512:
return &sha512_desc; return &sha512_desc;
} }
} }
@ -26,11 +26,11 @@ class AlgorithmRSA::AlgorithmRSAImpl
{ {
switch(m_padding) switch(m_padding)
{ {
case Crypto::RSA_PADDING_PKS1: case Crypto::RSAPaddingMode::RSA_PADDING_PKS1:
return LTC_PKCS_1_V1_5; return LTC_PKCS_1_V1_5;
default: default:
case Crypto::RSA_PADDING_PSS: case Crypto::RSAPaddingMode::RSA_PADDING_PSS:
return LTC_PKCS_1_PSS; return LTC_PKCS_1_PSS;
} }
} }

4
src/Utils/Utils/FileAPI.cpp
View File

@ -35,11 +35,11 @@ FileAPI::File FileAPI::Open(const std::string& filename, const Mode mode)
switch(mode) switch(mode)
{ {
default: default:
case MODE_READ: case Mode::MODE_READ:
modeStr = "rb"; modeStr = "rb";
break; break;
case MODE_WRITE: case Mode::MODE_WRITE:
modeStr = "wb"; modeStr = "wb";
break; break;
} }

2
src/Utils/Utils/FileAPI.h
View File

@ -6,7 +6,7 @@
class FileAPI class FileAPI
{ {
public: public:
enum Mode enum class Mode
{ {
MODE_READ = 0, MODE_READ = 0,
MODE_WRITE = 1 MODE_WRITE = 1

2
src/ZoneCommon/Zone/XBlock.h
View File

@ -4,7 +4,7 @@
class XBlock class XBlock
{ {
public: public:
enum Type enum class Type
{ {
BLOCK_TYPE_TEMP, BLOCK_TYPE_TEMP,
BLOCK_TYPE_RUNTIME, BLOCK_TYPE_RUNTIME,

18
src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
View File

@ -133,14 +133,14 @@ class ZoneLoaderFactoryT6::ZoneLoaderFactoryT6Impl
{ {
#define XBLOCK_DEF(name, type) new XBlock(STR(name), name, type) #define XBLOCK_DEF(name, type) new XBlock(STR(name), name, type)
zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_TEMP, XBlock::BLOCK_TYPE_TEMP)); zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_TEMP, XBlock::Type::BLOCK_TYPE_TEMP));
zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_RUNTIME_VIRTUAL, XBlock::BLOCK_TYPE_RUNTIME)); zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_RUNTIME_VIRTUAL, XBlock::Type::BLOCK_TYPE_RUNTIME));
zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_RUNTIME_PHYSICAL, XBlock::BLOCK_TYPE_RUNTIME)); zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_RUNTIME_PHYSICAL, XBlock::Type::BLOCK_TYPE_RUNTIME));
zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_DELAY_VIRTUAL, XBlock::BLOCK_TYPE_DELAY)); zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_DELAY_VIRTUAL, XBlock::Type::BLOCK_TYPE_DELAY));
zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_DELAY_PHYSICAL, XBlock::BLOCK_TYPE_DELAY)); zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_DELAY_PHYSICAL, XBlock::Type::BLOCK_TYPE_DELAY));
zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_VIRTUAL, XBlock::BLOCK_TYPE_NORMAL)); zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_VIRTUAL, XBlock::Type::BLOCK_TYPE_NORMAL));
zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_PHYSICAL, XBlock::BLOCK_TYPE_NORMAL)); zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_PHYSICAL, XBlock::Type::BLOCK_TYPE_NORMAL));
zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_STREAMER_RESERVE, XBlock::BLOCK_TYPE_NORMAL)); zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_STREAMER_RESERVE, XBlock::Type::BLOCK_TYPE_NORMAL));
#undef XBLOCK_DEF #undef XBLOCK_DEF
} }
@ -149,7 +149,7 @@ class ZoneLoaderFactoryT6::ZoneLoaderFactoryT6Impl
{ {
if(isOfficial) if(isOfficial)
{ {
auto* rsa = Crypto::CreateRSA(IPublicKeyAlgorithm::RSA_HASH_SHA256, Crypto::RSA_PADDING_PSS); auto* rsa = Crypto::CreateRSA(IPublicKeyAlgorithm::HashingAlgorithm::RSA_HASH_SHA256, Crypto::RSAPaddingMode::RSA_PADDING_PSS);
if(!rsa->SetKey(RSA_PUBLIC_KEY_TREYARCH, sizeof(RSA_PUBLIC_KEY_TREYARCH))) if(!rsa->SetKey(RSA_PUBLIC_KEY_TREYARCH, sizeof(RSA_PUBLIC_KEY_TREYARCH)))
{ {

2
src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.cpp
View File

@ -66,7 +66,7 @@ block_t XBlockInputStream::PopBlock()
m_block_in_stack[poppedBlock->m_index]--; m_block_in_stack[poppedBlock->m_index]--;
// If the temp block is not used anymore right now, reset it to the buffer start since as the name suggests, the data inside is temporary. // If the temp block is not used anymore right now, reset it to the buffer start since as the name suggests, the data inside is temporary.
if(poppedBlock->m_type == XBlock::BLOCK_TYPE_TEMP && m_block_in_stack[poppedBlock->m_index] == 0) if(poppedBlock->m_type == XBlock::Type::BLOCK_TYPE_TEMP && m_block_in_stack[poppedBlock->m_index] == 0)
{ {
m_block_offsets[poppedBlock->m_index] = 0; m_block_offsets[poppedBlock->m_index] = 0;
} }

2
src/ZoneLoading/ZoneLoading.cpp
View File

@ -10,7 +10,7 @@ IZoneLoaderFactory* zoneLoaderFactories[]
Zone* ZoneLoading::LoadZone(const std::string& path) Zone* ZoneLoading::LoadZone(const std::string& path)
{ {
std::string zoneName = utils::Path::GetFilenameWithoutExtension(path); std::string zoneName = utils::Path::GetFilenameWithoutExtension(path);
FileAPI::File file = FileAPI::Open(path, FileAPI::MODE_READ); FileAPI::File file = FileAPI::Open(path, FileAPI::Mode::MODE_READ);
if(!file.IsOpen()) if(!file.IsOpen())
{ {