Merge pull request #372 from ThosRTanner/issue/356

Refactor gameinfo & 'shared' library to use game plugins (9 of 17)

1 files changed, 9 insertions, 10 deletions

diff --git a/src/organizercore.h b/src/organizercore.h
index 85f0e0c4..5cfbaca4 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -73,7 +73,7 @@ public:
   void connectPlugins(PluginContainer *container);

   void disconnectPlugins();

 

-  void setManagedGame(const QString &gameName, const QString &gamePath);

+  void setManagedGame(const MOBase::IPluginGame *game);

 

   void updateExecutablesList(QSettings &settings);

 

@@ -99,7 +99,7 @@ public:
   ModListSortProxy *createModListProxyModel();

   PluginListSortProxy *createPluginListProxyModel();

 

-  MOBase::IPluginGame *managedGame() const;

+  MOBase::IPluginGame const *managedGame() const;

 

   bool isArchivesInit() const { return m_ArchivesInit; }

 

@@ -126,13 +126,12 @@ public:
   MOBase::DelayedFileWriter &pluginsWriter() { return m_PluginListsWriter; }

 

 public:

-  MOBase::IGameInfo &gameInfo() const;

   MOBase::IModRepositoryBridge *createNexusBridge() const;

   QString profileName() const;

   QString profilePath() const;

   QString downloadsPath() const;

   MOBase::VersionInfo appVersion() const;

-  MOBase::IModInterface *getMod(const QString &name);

+  MOBase::IModInterface *getMod(const QString &name) const;

   MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name);

   bool removeMod(MOBase::IModInterface *mod);

   void modDataChanged(MOBase::IModInterface *mod);

@@ -157,7 +156,7 @@ public:
   bool onFinishedRun(const std::function<void (const QString &, unsigned int)> &func);

   void refreshModList(bool saveChanges = true);

 

-  std::vector<std::pair<QString, QString> > fileMapping();

+  //std::vector<std::pair<QString, QString> > fileMapping();

 

 public: // IPluginDiagnose interface

 

@@ -194,7 +193,7 @@ signals:
    */

   void modInstalled(const QString &modName);

 

-  void managedGameChanged(MOBase::IPluginGame *gamePlugin);

+  void managedGameChanged(MOBase::IPluginGame const *gamePlugin);

 

 private:

 

@@ -210,9 +209,11 @@ private:
 

   bool testForSteam();

 

-  std::vector<std::pair<QString, QString>> fileMapping(const QString &dataPath,

+  /*

+   * std::vector<std::pair<QString, QString>> fileMapping(const QString &dataPath,

                                                        const MOShared::DirectoryEntry *base,

                                                        const MOShared::DirectoryEntry *directoryEntry);

+*/

 

 private slots:

 

@@ -229,12 +230,10 @@ private:
 

 private:

 

-  MOBase::IGameInfo *m_GameInfo;

-

   IUserInterface *m_UserInterface;

   PluginContainer *m_PluginContainer;

   QString m_GameName;

-  MOBase::IPluginGame *m_GamePlugin;

+  MOBase::IPluginGame const *m_GamePlugin;

 

   Profile *m_CurrentProfile;