Merge branch 'master' into issue/344

# Conflicts:
#	src/gameinfoimpl.cpp
#	src/gameinfoimpl.h
#	src/shared/fallout3info.h
#	src/shared/falloutnvinfo.h
#	src/shared/gameinfo.h
#	src/shared/oblivioninfo.h
#	src/shared/skyriminfo.h

1 files changed, 22 insertions, 59 deletions

diff --git a/src/savegame.cpp b/src/savegame.cpp
index 1cdabb2d..2b125575 100644
--- a/src/savegame.cpp
+++ b/src/savegame.cpp
@@ -18,50 +18,28 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "savegame.h"

-#include <QFile>

-#include <QBuffer>

-#include <set>

-#include <QFileInfo>

-#include <QDateTime>

-#include <utility.h>

-#include <limits>

-#include "gameinfo.h"

-

-

-SaveGame::SaveGame(QObject *parent)

-  : QObject(parent), m_FileName(), m_PCName(), m_PCLevel(0), m_PCLocation(), m_SaveNumber(0), m_Screenshot()

-{

-}

 

+#include "iplugingame.h"

+#include "scriptextender.h"

+#include "utility.h"

 

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

-  : QObject(parent), m_FileName(filename), m_PCName(), m_PCLevel(0), m_PCLocation(), m_SaveNumber(0), m_Screenshot()

-{

-}

-

+#include <QApplication>

+#include <QDateTime>

+#include <QFile>

+#include <QFileInfo>

 

-SaveGame::SaveGame(const SaveGame& reference)

-  : m_FileName(reference.m_FileName), m_PCName(reference.m_PCName), m_PCLevel(reference.m_PCLevel),

-    m_PCLocation(reference.m_PCLocation), m_SaveNumber(reference.m_SaveNumber),

-    m_Screenshot(reference.m_Screenshot)

-{

-}

+#include <limits>

+#include <set>

 

+using namespace MOBase;

 

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

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

+  : QObject(parent)

+  , m_FileName(filename)

+  , m_Game(game)

 {

-  if (&reference != this) {

-    m_FileName = reference.m_FileName;

-    m_PCName = reference.m_PCName;

-    m_PCLevel = reference.m_PCLevel;

-    m_PCLocation = reference.m_PCLocation;

-    m_SaveNumber = reference.m_SaveNumber;

-    m_Screenshot = reference.m_Screenshot;

-  }

-  return *this;

 }

 

-

 SaveGame::~SaveGame()

 {

 }

@@ -69,11 +47,14 @@ SaveGame::~SaveGame()
 QStringList SaveGame::attachedFiles() const

 {

   QStringList result;

-  foreach (const std::wstring &ext, MOShared::GameInfo::instance().getSavegameAttachmentExtensions()) {

-    QFileInfo fi(fileName());

-    fi.setFile(fi.canonicalPath() + "/" + fi.completeBaseName() + "." + MOBase::ToQString(ext));

-    if (fi.exists()) {

-      result.append(fi.filePath());

+  ScriptExtender const *extender = m_Game->feature<ScriptExtender>();

+  if (extender != nullptr) {

+    for (QString const &ext : extender->saveGameAttachmentExtensions()) {

+      QFileInfo fi(fileName());

+      fi.setFile(fi.canonicalPath() + "/" + fi.completeBaseName() + "." + ext);

+      if (fi.exists()) {

+        result.append(fi.filePath());

+      }

     }

   }

 

@@ -86,21 +67,3 @@ QStringList SaveGame::saveFiles() const
   result.append(fileName());

   return result;

 }

-

-

-void SaveGame::setCreationTime(const QString &fileName)

-{

-  QFileInfo creationTime(fileName);

-  QDateTime modified = creationTime.lastModified();

-  memset(&m_CreationTime, 0, sizeof(SYSTEMTIME));

-

-  m_CreationTime.wDay = static_cast<WORD>(modified.date().day());

-  m_CreationTime.wDayOfWeek = static_cast<WORD>(modified.date().dayOfWeek());

-  m_CreationTime.wMonth = static_cast<WORD>(modified.date().month());

-  m_CreationTime.wYear =static_cast<WORD>( modified.date().year());

-

-  m_CreationTime.wHour = static_cast<WORD>(modified.time().hour());

-  m_CreationTime.wMinute = static_cast<WORD>(modified.time().minute());

-  m_CreationTime.wSecond = static_cast<WORD>(modified.time().second());

-  m_CreationTime.wMilliseconds = static_cast<WORD>(modified.time().msec());

-}