Merge with branch1.2

1 files changed, 14 insertions, 1 deletions

diff --git a/src/settings.h b/src/settings.h
index 5d398f49..51e109c4 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -29,6 +29,11 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QComboBox>
 
 
+namespace MOBase {
+  class IPluginGame;
+}
+
+
 /**
  * manages the settings for Mod Organizer. The settings are not cached
  * inside the class but read/written directly from/to disc
@@ -43,7 +48,7 @@ public:
   /**
    * @brief constructor
    **/
-  Settings();
+  Settings(const QSettings &settingsSource);
 
   virtual ~Settings();
 
@@ -272,6 +277,11 @@ public:
    *              even if the user said earlier not to
    */
   void registerAsNXMHandler(bool force);
+
+public slots:
+
+  void managedGameChanged(MOBase::IPluginGame *gamePlugin);
+
 private:
 
   QString obfuscate(const QString &password) const;
@@ -281,6 +291,7 @@ private:
   void addStyles(QComboBox *styleBox);
   void readPluginBlacklist();
   void writePluginBlacklist();
+  QString getConfigurablePath(const QString &key, const QString &def) const;
 
 private slots:
 
@@ -295,6 +306,8 @@ private:
 
   static Settings *s_Instance;
 
+  MOBase::IPluginGame *m_GamePlugin;
+
   QSettings m_Settings;
 
   LoadMechanism m_LoadMechanism;