From 3cdd37d429162bc9647f01d3c94a5607c39d57b9 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Thu, 19 Mar 2020 14:42:49 +0100 Subject: [PATCH] Rename variable igdrclHkeyType -> hkeyType Change-Id: I2ea5339e459cd3fbf0c2643874f999af14fa0d22 Signed-off-by: Mateusz Jablonski --- .../unit_test/os_interface/windows/registry_reader_tests.h | 2 +- .../source/os_interface/windows/debug_registry_reader.cpp | 6 +++--- shared/source/os_interface/windows/debug_registry_reader.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.h b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.h index 54243ebcf6..5665da365b 100644 --- a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.h +++ b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.h @@ -15,7 +15,7 @@ class TestedRegistryReader : public RegistryReader { TestedRegistryReader(bool userScope) : RegistryReader(userScope, oclRegPath){}; TestedRegistryReader(std::string regKey) : RegistryReader(false, regKey){}; HKEY getHkeyType() const { - return igdrclHkeyType; + return hkeyType; } using RegistryReader::getSetting; diff --git a/shared/source/os_interface/windows/debug_registry_reader.cpp b/shared/source/os_interface/windows/debug_registry_reader.cpp index c5b99d8f98..e530966832 100644 --- a/shared/source/os_interface/windows/debug_registry_reader.cpp +++ b/shared/source/os_interface/windows/debug_registry_reader.cpp @@ -20,7 +20,7 @@ SettingsReader *SettingsReader::createOsReader(bool userScope, const std::string } RegistryReader::RegistryReader(bool userScope, const std::string ®Key) : registryReadRootKey(regKey) { - igdrclHkeyType = userScope ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE; + hkeyType = userScope ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE; setUpProcessName(); } @@ -47,7 +47,7 @@ int32_t RegistryReader::getSetting(const char *settingName, int32_t defaultValue DWORD value = defaultValue; DWORD success = ERROR_SUCCESS; - success = RegOpenKeyExA(igdrclHkeyType, + success = RegOpenKeyExA(hkeyType, registryReadRootKey.c_str(), 0, KEY_READ, @@ -80,7 +80,7 @@ std::string RegistryReader::getSetting(const char *settingName, const std::strin DWORD success = ERROR_SUCCESS; std::string keyValue = value; - success = RegOpenKeyExA(igdrclHkeyType, + success = RegOpenKeyExA(hkeyType, registryReadRootKey.c_str(), 0, KEY_READ, diff --git a/shared/source/os_interface/windows/debug_registry_reader.h b/shared/source/os_interface/windows/debug_registry_reader.h index 9b94b2a549..497f955768 100644 --- a/shared/source/os_interface/windows/debug_registry_reader.h +++ b/shared/source/os_interface/windows/debug_registry_reader.h @@ -25,7 +25,7 @@ class RegistryReader : public SettingsReader { const char *appSpecificLocation(const std::string &name) override; protected: - HKEY igdrclHkeyType; + HKEY hkeyType; std::string registryReadRootKey; void setUpProcessName(); std::string processName;