Merge with branch1.2

1 files changed, 7 insertions, 4 deletions

diff --git a/src/executableslist.h b/src/executableslist.h
index c09c8f72..888dbfe1 100644
--- a/src/executableslist.h
+++ b/src/executableslist.h
@@ -25,6 +25,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFileInfo>

 #include <QMetaType>

 #include <gameinfo.h>

+#include <iplugingame.h>

 

 

 /*!

@@ -34,7 +35,7 @@ struct Executable {
   QString m_Title;

   QFileInfo m_BinaryInfo;

   QString m_Arguments;

-  MOShared::CloseMOStyle m_CloseMO;

+  MOBase::ExecutableInfo::CloseMOStyle m_CloseMO;

   QString m_SteamAppID;

   QString m_WorkingDirectory;

 

@@ -64,7 +65,7 @@ public:
   /**

    * @brief initialise the list with the executables preconfigured for this game

    **/

-  void init();

+  void init(MOBase::IPluginGame *game);

 

   /**

    * @brief retrieve an executable by index

@@ -123,7 +124,7 @@ public:
    * @param closeMO if true, MO will be closed when the binary is started

    **/

   void addExecutable(const QString &title, const QString &executableName, const QString &arguments,

-                     const QString &workingDirectory, MOShared::CloseMOStyle closeMO, const QString &steamAppID,

+                     const QString &workingDirectory, MOBase::ExecutableInfo::CloseMOStyle closeMO, const QString &steamAppID,

                      bool custom, bool toolbar, int pos = -1);

 

   /**

@@ -162,7 +163,9 @@ private:
 

   std::vector<Executable>::iterator findExe(const QString &title);

 

-  void addExecutableInternal(const QString &title, const QString &executableName, const QString &arguments, const QString &workingDirectory, MOShared::CloseMOStyle closeMO, const QString &steamAppID);

+  void addExecutableInternal(const QString &title, const QString &executableName, const QString &arguments,

+                             const QString &workingDirectory, MOBase::ExecutableInfo::CloseMOStyle closeMO,

+                             const QString &steamAppID);

 

 private: