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, 9 insertions, 34 deletions

diff --git a/src/savegamegamebyro.h b/src/savegamegamebyro.h
index af866666..b7a5ba12 100644
--- a/src/savegamegamebyro.h
+++ b/src/savegamegamebyro.h
@@ -20,17 +20,13 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef SAVEGAMEGAMEBRYO_H

 #define SAVEGAMEGAMEBRYO_H

 

-

 #include "savegame.h"

 

-#include <QString>

-#include <QObject>

 #include <QMetaType>

-#include <QFile>

-

-#define WIN32_LEAN_AND_MEAN

-#include <Windows.h>

+#include <QObject>

+#include <QString>

 

+namespace MOBase { class IPluginGame; class ISaveGame; }

 

 /**

  * @brief represents a single save game

@@ -42,30 +38,20 @@ Q_OBJECT
 public:

 

   /**

-   * @brief construct an empty object

-   **/

-  SaveGameGamebryo(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

    **/

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

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

 

+  /*

 

   SaveGameGamebryo(const SaveGameGamebryo &reference);

 

   SaveGameGamebryo &operator=(const SaveGameGamebryo &reference);

 

   ~SaveGameGamebryo();

-

-  /**

-   * @brief read out information from a savegame

-   *

-   * @param fileName absolute path of the save game file

-   **/

-  virtual void readFile(const QString &fileName);

+  */

 

   /**

    * @return number of plugins that were enabled when the save game was created

@@ -80,23 +66,12 @@ public:
    **/

   const QString &plugin(int index) const { return m_Plugins.at(index); }

 

-

 private:

 

-  void readESSFile(QFile &saveFile);

-  void readFOSFile(QFile &saveFile, bool newVegas);

-  void readFO4File(QFile &saveFile);

-  void readSkyrimFile(QFile &saveFile);

-

-  void setCreationTime(const QString &fileName);

-

-private:

-

-  std::vector<QString> m_Plugins;

+  QStringList m_Plugins;

+  //Note: This isn't owned by us so safe to copy

+  MOBase::ISaveGame const *m_Save;

 

 };

 

-Q_DECLARE_METATYPE(SaveGameGamebryo)

-Q_DECLARE_METATYPE(SaveGameGamebryo*)

-

 #endif // SAVEGAMEGAMEBRYO_H