piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

SignatureDB: Move two functions into the cpp file

Browse Source 
These are implementation details.
This commit is contained in:
Lioncash 2017-05-21 17:18:11 -04:00
parent e328b13ae2
commit 3c94962332
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp
View File

@ -18,15 +18,9 @@
#include "Core/PowerPC/SignatureDB/DSYSignatureDB.h" #include "Core/PowerPC/SignatureDB/DSYSignatureDB.h"
#include "Core/PowerPC/SignatureDB/MEGASignatureDB.h" #include "Core/PowerPC/SignatureDB/MEGASignatureDB.h"
SignatureDB::SignatureDB(SignatureDB::HandlerType handler) : m_handler(CreateFormatHandler(handler)) namespace
{ {
} SignatureDB::HandlerType GetHandlerType(const std::string& file_path)
SignatureDB::SignatureDB(const std::string& file_path) : SignatureDB(GetHandlerType(file_path))
{
}
SignatureDB::HandlerType SignatureDB::GetHandlerType(const std::string& file_path)
{ {
if (StringEndsWith(file_path, ".csv")) if (StringEndsWith(file_path, ".csv"))
return SignatureDB::HandlerType::CSV; return SignatureDB::HandlerType::CSV;
@ -35,8 +29,7 @@ SignatureDB::HandlerType SignatureDB::GetHandlerType(const std::string& file_pat
return SignatureDB::HandlerType::DSY; return SignatureDB::HandlerType::DSY;
} }
std::unique_ptr<SignatureDBFormatHandler> std::unique_ptr<SignatureDBFormatHandler> CreateFormatHandler(SignatureDB::HandlerType handler)
SignatureDB::CreateFormatHandler(SignatureDB::HandlerType handler) const
{ {
switch (handler) switch (handler)
{ {
@ -49,6 +42,15 @@ SignatureDB::CreateFormatHandler(SignatureDB::HandlerType handler) const
return std::make_unique<MEGASignatureDB>(); return std::make_unique<MEGASignatureDB>();
} }
} }
} // Anonymous namespace
SignatureDB::SignatureDB(SignatureDB::HandlerType handler) : m_handler(CreateFormatHandler(handler))
{
}
SignatureDB::SignatureDB(const std::string& file_path) : SignatureDB(GetHandlerType(file_path))
{
}
void SignatureDB::Clear() void SignatureDB::Clear()
{ {

3
Source/Core/Core/PowerPC/SignatureDB/SignatureDB.h
View File

@ -27,8 +27,6 @@ public:
explicit SignatureDB(HandlerType handler); explicit SignatureDB(HandlerType handler);
explicit SignatureDB(const std::string& file_path); explicit SignatureDB(const std::string& file_path);
static HandlerType GetHandlerType(const std::string& file_path);
void Clear(); void Clear();
// Does not clear. Remember to clear first if that's what you want. // Does not clear. Remember to clear first if that's what you want.
bool Load(const std::string& file_path); bool Load(const std::string& file_path);
@ -41,7 +39,6 @@ public:
bool Add(u32 start_addr, u32 size, const std::string& name); bool Add(u32 start_addr, u32 size, const std::string& name);
private: private:
std::unique_ptr<SignatureDBFormatHandler> CreateFormatHandler(HandlerType handler) const;
std::unique_ptr<SignatureDBFormatHandler> m_handler; std::unique_ptr<SignatureDBFormatHandler> m_handler;
}; };