mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-30 05:34:33 +00:00
Code Issues Releases Wiki Activity

New warning from !4980

Browse source 
It didn't like snake case, and then MSVC wasn't happened that it shadowed the constexpr value with the same name
This commit is contained in:
AnyOldName3 2025-11-10 19:08:09 +00:00
parent f8553f2e8a
commit 9d0a8eb8c4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/files/configurationmanager.cpp
View file

@ -22,9 +22,9 @@ namespace Files
namespace namespace
{ {
#if defined(_WIN32) || defined(__WINDOWS__) #if defined(_WIN32) || defined(__WINDOWS__)
constexpr auto applicationName = "OpenMW"; constexpr auto sApplicationName = "OpenMW";
#else #else
constexpr auto applicationName = "openmw"; constexpr auto sApplicationName = "openmw";
#endif #endif
using GetPath = const std::filesystem::path& (Files::FixedPath<>::*)() const; using GetPath = const std::filesystem::path& (Files::FixedPath<>::*)() const;
@ -37,7 +37,7 @@ namespace Files
} }
ConfigurationManager::ConfigurationManager(bool silent) ConfigurationManager::ConfigurationManager(bool silent)
: mFixedPath(applicationName) : mFixedPath(sApplicationName)
, mSilent(silent) , mSilent(silent)
{ {
// Initialize with fixed paths, will be overridden in `readConfiguration`. // Initialize with fixed paths, will be overridden in `readConfiguration`.

6
components/files/fixedpath.hpp
View file

@ -56,10 +56,10 @@ namespace Files
/** /**
* \brief Path constructor. * \brief Path constructor.
* *
* \param [in] application_name - Name of the application * \param [in] applicationName - Name of the application
*/ */
FixedPath(const std::string& application_name) FixedPath(const std::string& applicationName)
: mPath(application_name + "/") : mPath(applicationName + "/")
, mUserConfigPath(mPath.getUserConfigPath()) , mUserConfigPath(mPath.getUserConfigPath())
, mUserDataPath(mPath.getUserDataPath()) , mUserDataPath(mPath.getUserDataPath())
, mGlobalConfigPath(mPath.getGlobalConfigPath()) , mGlobalConfigPath(mPath.getGlobalConfigPath())