removed a redundant (and unsufficiently configured) copy of ConfigurationManager

apps/opencs/editor.cpp

@@ -20,7 +20,7 @@
 #include "model/world/data.hpp"
 
 CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
-: mDocumentManager (mCfgMgr), mViewManager (mDocumentManager),
+: mUserSettings (mCfgMgr), mDocumentManager (mCfgMgr), mViewManager (mDocumentManager),
   mIpcServerName ("org.openmw.OpenCS")
 {
     std::pair<Files::PathContainer, std::vector<std::string> > config = readConfig();

apps/opencs/model/settings/usersettings.cpp

@@ -28,7 +28,8 @@ namespace boost
 
 CSMSettings::UserSettings *CSMSettings::UserSettings::mUserSettingsInstance = 0;
 
-CSMSettings::UserSettings::UserSettings()
+CSMSettings::UserSettings::UserSettings (const Files::ConfigurationManager& configurationManager)
+: mCfgMgr (configurationManager)
 {
     assert(!mUserSettingsInstance);
     mUserSettingsInstance = this;

apps/opencs/model/settings/usersettings.hpp

@@ -30,7 +30,7 @@ namespace CSMSettings {
         Q_OBJECT
 
         static UserSettings *mUserSettingsInstance;
-        Files::ConfigurationManager mCfgMgr;
+        const Files::ConfigurationManager& mCfgMgr;
 
         QSettings *mSettingDefinitions;
         QList <Setting *> mSettings;
@@ -40,11 +40,11 @@ namespace CSMSettings {
         /// Singleton implementation
         static UserSettings& instance();
 
-        UserSettings();
+        UserSettings (const Files::ConfigurationManager& configurationManager);
         ~UserSettings();
 
-        UserSettings (UserSettings const &);        //not implemented
+        UserSettings (UserSettings const &); //not implemented
-        void operator= (UserSettings const &);      //not implemented
+        UserSettings& operator= (UserSettings const &); //not implemented
 
         /// Retrieves the settings file at all three levels (global, local and user).
         void loadSettings (const QString &fileName);