Merge remote-tracking branch 'origin/Develop' into archive_conflicts_2

1 files changed, 10 insertions, 0 deletions

diff --git a/src/editexecutablesdialog.h b/src/editexecutablesdialog.h
index 0f3dbaff..0169b8ca 100644
--- a/src/editexecutablesdialog.h
+++ b/src/editexecutablesdialog.h
@@ -25,6 +25,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTimer>

 #include "executableslist.h"

 #include "profile.h"

+#include "iplugingame.h"

 

 namespace Ui {

     class EditExecutablesDialog;

@@ -52,6 +53,7 @@ public:
   explicit EditExecutablesDialog(const ExecutablesList &executablesList,

                                  const ModList &modList,

                                  Profile *profile,

+                                 const MOBase::IPluginGame *game,

                                  QWidget *parent = 0);

 

   ~EditExecutablesDialog();

@@ -92,6 +94,10 @@ private slots:
 

   void on_executablesListBox_clicked(const QModelIndex &index);

 

+  void on_forceLoadButton_clicked();

+

+  void on_forceLoadCheckBox_toggled();

+

 private:

 

   void resetInput();

@@ -108,6 +114,10 @@ private:
   ExecutablesList m_ExecutablesList;

 

   Profile *m_Profile;

+

+  QList<MOBase::ExecutableForcedLoadSetting> m_ForcedLibraries;

+

+  const MOBase::IPluginGame *m_GamePlugin;

 };

 

 #endif // EDITEXECUTABLESDIALOG_H