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, 5 insertions, 15 deletions

diff --git a/src/savegame.h b/src/savegame.h
index 1fd2f7ab..d1bf4691 100644
--- a/src/savegame.h
+++ b/src/savegame.h
@@ -31,6 +31,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #define WIN32_LEAN_AND_MEAN

 #include <Windows.h>

 

+namespace MOBase { class IPluginGame; }

 

 /**

  * @brief represents a single save game

@@ -42,22 +43,13 @@ Q_OBJECT
 public:

 

   /**

-   * @brief construct an empty object

-   **/

-  SaveGame(QObject *parent = 0);

-

-  /**

    * @brief construct a save game and immediately read out information from the file

    *

    * @param filename absolute path of the save game file

    **/

-  SaveGame(QObject *parent, const QString &filename);

-

-  SaveGame(const SaveGame& reference);

-

-  SaveGame& operator=(const SaveGame &reference);

+  SaveGame(QObject *parent, const QString &filename, MOBase::IPluginGame const *game);

 

-  ~SaveGame();

+  virtual ~SaveGame();

 

   /**

    * @brief read out information from a savegame

@@ -111,10 +103,6 @@ public:
    **/

   const QImage &screenshot() const { return m_Screenshot; }

 

-private:

-

-  void setCreationTime(const QString &fileName);

-

 protected:

 

   QString m_FileName;

@@ -125,6 +113,8 @@ protected:
   SYSTEMTIME m_CreationTime;

   QImage m_Screenshot;

 

+private:

+  MOBase::IPluginGame const * const m_Game;

 };