Merge

1 files changed, 87 insertions, 65 deletions

diff --git a/src/savegame.cpp b/src/savegame.cpp
index 0ddd5fd2..06e028e2 100644
--- a/src/savegame.cpp
+++ b/src/savegame.cpp
@@ -17,68 +17,90 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "savegame.h"

-#include <QFile>

-#include <QBuffer>

-#include <set>

-#include "gameinfo.h"

-#include <QFileInfo>

-#include <QDateTime>

-#include <limits>

-

-

-SaveGame::SaveGame(QObject *parent)

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

-{

-}

-

-

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

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

-{

-}

-

-

-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)

-{

-}

-

-

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

-{

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

-{

-}

-

-

-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());

-}

+#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()
+{
+}
+
+
+SaveGame::SaveGame(QObject *parent, const QString &filename)
+  : QObject(parent), m_FileName(filename), m_PCName(), m_PCLevel(0), m_PCLocation(), m_SaveNumber(0), m_Screenshot()
+{
+}
+
+
+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)
+{
+}
+
+
+SaveGame& SaveGame::operator=(const SaveGame &reference)
+{
+  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()
+{
+}
+
+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());
+    }
+  }
+
+  return result;
+}
+
+QStringList SaveGame::saveFiles() const
+{
+  QStringList result = attachedFiles();
+  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());
+}