Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 4 insertions, 6 deletions

diff --git a/src/transfersavesdialog.h b/src/transfersavesdialog.h
index b9265b6a..e2c556b4 100644
--- a/src/transfersavesdialog.h
+++ b/src/transfersavesdialog.h
@@ -22,11 +22,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 #include "tutorabledialog.h"

 #include "profile.h"

-#include <iplugingame.h>

 

-namespace Ui {

-class TransferSavesDialog;

-}

+namespace Ui { class TransferSavesDialog; }

+namespace MOBase { class IPluginGame; }

 

 class SaveGame;

 

@@ -35,7 +33,7 @@ class TransferSavesDialog : public MOBase::TutorableDialog
   Q_OBJECT

   

 public:

-  explicit TransferSavesDialog(const Profile &profile, MOBase::IPluginGame *gamePlugin, QWidget *parent = 0);

+  explicit TransferSavesDialog(const Profile &profile, MOBase::IPluginGame const *gamePlugin, QWidget *parent = 0);

   ~TransferSavesDialog();

   

 private slots:

@@ -76,7 +74,7 @@ private:
 

   Profile m_Profile;

 

-  MOBase::IPluginGame *m_GamePlugin;

+  MOBase::IPluginGame const *m_GamePlugin;

 

   std::vector<SaveGame*> m_GlobalSaves;

   std::vector<SaveGame*> m_LocalSaves;