Skip to content

Commit 46101fc

Browse files
Refactoring Registry class
1 parent d69a3a8 commit 46101fc

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/Logger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ using namespace std;
167167
#pragma region Support methods
168168
const string Logger::GetWindowsBit() const
169169
{
170-
if (Windows::Registry::GetWindowsBit() == Windows::Registry::WindowsBit::Win32)
170+
if (Windows::Registry::GetWindowsBit() == Windows::Registry::Arch::Win32)
171171
return "32-bit";
172172
else
173173
return "64-bit";

src/Windows/Registry.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ using namespace std;
1010

1111
namespace Windows
1212
{
13-
Registry::WindowsBit Registry::GetWindowsBit()
13+
Registry::Arch Registry::GetWindowsBit()
1414
{
1515
HKEY rKey;
16-
WindowsBit windowsBit;
16+
Arch windowsBit;
1717

1818
if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\WOW6432Node"), 0, KEY_QUERY_VALUE, &rKey) == ERROR_SUCCESS)
19-
windowsBit = WindowsBit::Win64;
19+
windowsBit = Arch::Win64;
2020
else
21-
windowsBit = WindowsBit::Win32;
21+
windowsBit = Arch::Win32;
2222

2323
RegCloseKey(rKey);
2424

@@ -103,8 +103,8 @@ namespace Windows
103103

104104
QString Registry::ToQString(Games game) { return QString::fromStdString(Registry::ToString(game)); }
105105

106-
bool Registry::IsWindow64bit() { return GetWindowsBit() == WindowsBit::Win64; }
107-
bool Registry::IsWindow32bit() { return GetWindowsBit() == WindowsBit::Win32; }
106+
bool Registry::IsWindow64bit() { return GetWindowsBit() == Arch::Win64; }
107+
bool Registry::IsWindow32bit() { return GetWindowsBit() == Arch::Win32; }
108108

109109
#pragma region Logger methods
110110
string Registry::GetCurrentUserLanguage()

src/Windows/Registry.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Windows
88
class Registry final
99
{
1010
public: // Data
11-
enum class WindowsBit
11+
enum class Arch
1212
{
1313
Win32,
1414
Win64
@@ -27,12 +27,12 @@ namespace Windows
2727
};
2828

2929
/// @brief Paths in Window's registry to the C&C: Generals and C&C: Generals — Zero Hour
30-
inline static const std::map<Games, std::map<WindowsBit, std::wstring>> PATHS_TO_GAMES =
30+
inline static const std::map<Games, std::map<Arch, std::wstring>> PATHS_TO_GAMES =
3131
{
32-
{Games::Generals, {{WindowsBit::Win32, L"SOFTWARE\\Electronic Arts\\EA Games\\Generals"},
33-
{WindowsBit::Win64, L"SOFTWARE\\WOW6432Node\\Electronic Arts\\EA Games\\Generals"}}},
34-
{Games::GeneralsZeroHour, {{WindowsBit::Win32, L"SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour"},
35-
{WindowsBit::Win64, L"SOFTWARE\\WOW6432Node\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour"}}},
32+
{Games::Generals, {{Arch::Win32, L"SOFTWARE\\Electronic Arts\\EA Games\\Generals"},
33+
{Arch::Win64, L"SOFTWARE\\WOW6432Node\\Electronic Arts\\EA Games\\Generals"}}},
34+
{Games::GeneralsZeroHour, {{Arch::Win32, L"SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour"},
35+
{Arch::Win64, L"SOFTWARE\\WOW6432Node\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour"}}},
3636
};
3737

3838
public: // Methods
@@ -43,7 +43,7 @@ namespace Windows
4343
/// @brief Returns equal string for enum class value.
4444
static QString ToQString(Games game);
4545
/// @brief Returns actual Windows bit like a enum value.
46-
static WindowsBit GetWindowsBit();
46+
static Arch GetWindowsBit();
4747

4848
/// @brief Returns REG_SZ string value from MS Windows registry.
4949
static std::string GetTextFromKeyA(RootFolder Folder, const char* pPathToFolder, const char* pKeyName);

0 commit comments

Comments
 (0)