diff options
| author | Bastien Bouclet | 2018-04-05 20:25:28 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2018-05-10 08:35:46 +0200 |
| commit | 955e18c64874203b6f7156835d7d8458b6fb54de (patch) | |
| tree | 8a165d5aabdb7acbfabd0ca7286485f3980d4014 /common/config-manager.cpp | |
| parent | 82296866b4f79798d1fd5085bfd91fa2fb829d6a (diff) | |
| download | scummvm-rg350-955e18c64874203b6f7156835d7d8458b6fb54de.tar.gz scummvm-rg350-955e18c64874203b6f7156835d7d8458b6fb54de.tar.bz2 scummvm-rg350-955e18c64874203b6f7156835d7d8458b6fb54de.zip | |
COMMON: Use nullptr instead of NULL or 0 where appropriate
Diffstat (limited to 'common/config-manager.cpp')
| -rw-r--r-- | common/config-manager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 082f261f51..e3f0831b47 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -52,7 +52,7 @@ char const *const ConfigManager::kCloudDomain = "cloud"; #pragma mark - -ConfigManager::ConfigManager() : _activeDomain(0) { +ConfigManager::ConfigManager() : _activeDomain(nullptr) { } void ConfigManager::defragment() { @@ -386,7 +386,7 @@ const ConfigManager::Domain *ConfigManager::getDomain(const String &domName) con if (_miscDomains.contains(domName)) return &_miscDomains[domName]; - return 0; + return nullptr; } ConfigManager::Domain *ConfigManager::getDomain(const String &domName) { @@ -410,7 +410,7 @@ ConfigManager::Domain *ConfigManager::getDomain(const String &domName) { if (_miscDomains.contains(domName)) return &_miscDomains[domName]; - return 0; + return nullptr; } @@ -620,7 +620,7 @@ void ConfigManager::registerDefault(const String &key, bool value) { void ConfigManager::setActiveDomain(const String &domName) { if (domName.empty()) { - _activeDomain = 0; + _activeDomain = nullptr; } else { assert(isValidDomainName(domName)); _activeDomain = &_gameDomains[domName]; @@ -654,7 +654,7 @@ void ConfigManager::removeGameDomain(const String &domName) { assert(isValidDomainName(domName)); if (domName == _activeDomainName) { _activeDomainName.clear(); - _activeDomain = 0; + _activeDomain = nullptr; } _gameDomains.erase(domName); } |