diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp index 7676d4d386..66904de130 100644 --- a/components/files/configurationmanager.cpp +++ b/components/files/configurationmanager.cpp @@ -22,9 +22,9 @@ namespace Files namespace { #if defined(_WIN32) || defined(__WINDOWS__) - constexpr auto applicationName = "OpenMW"; + constexpr auto sApplicationName = "OpenMW"; #else - constexpr auto applicationName = "openmw"; + constexpr auto sApplicationName = "openmw"; #endif using GetPath = const std::filesystem::path& (Files::FixedPath<>::*)() const; @@ -37,7 +37,7 @@ namespace Files } ConfigurationManager::ConfigurationManager(bool silent) - : mFixedPath(applicationName) + : mFixedPath(sApplicationName) , mSilent(silent) { // Initialize with fixed paths, will be overridden in `readConfiguration`. diff --git a/components/files/fixedpath.hpp b/components/files/fixedpath.hpp index 76e8574fa7..4496e83899 100644 --- a/components/files/fixedpath.hpp +++ b/components/files/fixedpath.hpp @@ -56,10 +56,10 @@ namespace Files /** * \brief Path constructor. * - * \param [in] application_name - Name of the application + * \param [in] applicationName - Name of the application */ - FixedPath(const std::string& application_name) - : mPath(application_name + "/") + FixedPath(const std::string& applicationName) + : mPath(applicationName + "/") , mUserConfigPath(mPath.getUserConfigPath()) , mUserDataPath(mPath.getUserDataPath()) , mGlobalConfigPath(mPath.getGlobalConfigPath())