diff options
Diffstat (limited to 'rbutil/rbutilqt/base/rbsettings.cpp')
| -rw-r--r-- | rbutil/rbutilqt/base/rbsettings.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp index 512341b84c..827c0f96fd 100644 --- a/rbutil/rbutilqt/base/rbsettings.cpp +++ b/rbutil/rbutilqt/base/rbsettings.cpp @@ -82,11 +82,11 @@ const static struct { }; //! pointer to setting object to NULL -QSettings* RbSettings::userSettings = NULL; +QSettings* RbSettings::userSettings = nullptr; void RbSettings::ensureRbSettingsExists() { - if(userSettings == NULL) + if(userSettings == nullptr) { // portable installation: // check for a configuration file in the program folder. @@ -96,13 +96,13 @@ void RbSettings::ensureRbSettingsExists() if(config.isFile()) { userSettings = new QSettings(QCoreApplication::instance()->applicationDirPath() - + "/RockboxUtility.ini", QSettings::IniFormat, NULL); + + "/RockboxUtility.ini", QSettings::IniFormat, nullptr); LOG_INFO() << "configuration: portable"; } else { userSettings = new QSettings(QSettings::IniFormat, - QSettings::UserScope, "rockbox.org", "RockboxUtility",NULL); + QSettings::UserScope, "rockbox.org", "RockboxUtility",nullptr); LOG_INFO() << "configuration: system"; } } @@ -123,7 +123,7 @@ void RbSettings::sync() { char* realuser = getenv("SUDO_UID"); char* realgroup = getenv("SUDO_GID"); - if(realuser != NULL && realgroup != NULL) + if(realuser != nullptr && realgroup != nullptr) { int realuid = atoi(realuser); int realgid = atoi(realgroup); |