mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-24 00:39:49 +00:00
Code Issues Projects Releases Wiki Activity

name convention and spelling fixes

Browse Source
This commit is contained in:
Marc Zinnschlag 2014-10-16 14:24:17 +02:00
parent e27da6a0d4
commit 799cd87b52
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/opencs/model/settings/usersettings.cpp
View File

@ -30,14 +30,14 @@ namespace boost
} /* namespace boost */ } /* namespace boost */
#endif /* (BOOST_VERSION <= 104600) */ #endif /* (BOOST_VERSION <= 104600) */
CSMSettings::UserSettings *CSMSettings::UserSettings::mUserSettingsInstance = 0; CSMSettings::UserSettings *CSMSettings::UserSettings::sUserSettingsInstance = 0;
CSMSettings::UserSettings::UserSettings (const Files::ConfigurationManager& configurationManager) CSMSettings::UserSettings::UserSettings (const Files::ConfigurationManager& configurationManager)
: mCfgMgr (configurationManager) : mCfgMgr (configurationManager)
, mSettingDefinitions(NULL) , mSettingDefinitions(NULL)
{ {
assert(!mUserSettingsInstance); assert(!sUserSettingsInstance);
mUserSettingsInstance = this; sUserSettingsInstance = this;
buildSettingModelDefaults(); buildSettingModelDefaults();
} }
@ -318,7 +318,7 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
CSMSettings::UserSettings::~UserSettings() CSMSettings::UserSettings::~UserSettings()
{ {
mUserSettingsInstance = 0; sUserSettingsInstance = 0;
} }
void CSMSettings::UserSettings::loadSettings (const QString &fileName) void CSMSettings::UserSettings::loadSettings (const QString &fileName)
@ -349,7 +349,7 @@ void CSMSettings::UserSettings::loadSettings (const QString &fileName)
(QSettings::IniFormat, QSettings::UserScope, "opencs", QString(), this); (QSettings::IniFormat, QSettings::UserScope, "opencs", QString(), this);
} }
// if the key is not found create one with a defaut value // if the key is not found create one with a default value
QString CSMSettings::UserSettings::setting(const QString &viewKey, const QString &value) QString CSMSettings::UserSettings::setting(const QString &viewKey, const QString &value)
{ {
if(mSettingDefinitions->contains(viewKey)) if(mSettingDefinitions->contains(viewKey))
@ -396,8 +396,8 @@ QString CSMSettings::UserSettings::settingValue (const QString &settingKey)
CSMSettings::UserSettings& CSMSettings::UserSettings::instance() CSMSettings::UserSettings& CSMSettings::UserSettings::instance()
{ {
assert(mUserSettingsInstance); assert(sUserSettingsInstance);
return *mUserSettingsInstance; return *sUserSettingsInstance;
} }
void CSMSettings::UserSettings::updateUserSetting(const QString &settingKey, void CSMSettings::UserSettings::updateUserSetting(const QString &settingKey,

4
apps/opencs/model/settings/usersettings.hpp
View File

@ -32,7 +32,7 @@ namespace CSMSettings {
Q_OBJECT Q_OBJECT
static UserSettings *mUserSettingsInstance; static UserSettings *sUserSettingsInstance;
const Files::ConfigurationManager& mCfgMgr; const Files::ConfigurationManager& mCfgMgr;
QSettings *mSettingDefinitions; QSettings *mSettingDefinitions;
@ -67,7 +67,7 @@ namespace CSMSettings {
void removeSetting void removeSetting
(const QString &pageName, const QString &settingName); (const QString &pageName, const QString &settingName);
///Retreive a map of the settings, keyed by page name ///Retrieve a map of the settings, keyed by page name
SettingPageMap settingPageMap() const; SettingPageMap settingPageMap() const;
///Returns a string list of defined vlaues for the specified setting ///Returns a string list of defined vlaues for the specified setting