Merge remote-tracking branch 'remotes/TanninOne/master' into issue/356

Conflicts:
	src/downloadmanager.cpp
	src/mainwindow.cpp
	src/modinfo.cpp
	src/modinfo.h
	src/selfupdater.cpp
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h

1 files changed, 15 insertions, 33 deletions

diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp
index 8fb204d8..11478fbc 100644
--- a/src/selfupdater.cpp
+++ b/src/selfupdater.cpp
@@ -72,9 +72,9 @@ SelfUpdater::SelfUpdater(NexusInterface *nexusInterface)
 

   CreateArchiveType CreateArchiveFunc = resolveFunction<CreateArchiveType>(archiveLib, "CreateArchive");

 

-  m_CurrentArchive = CreateArchiveFunc();

-  if (!m_CurrentArchive->isValid()) {

-    throw MyException(InstallationManager::getErrorString(m_CurrentArchive->getLastError()));

+  m_ArchiveHandler = CreateArchiveFunc();

+  if (!m_ArchiveHandler->isValid()) {

+    throw MyException(InstallationManager::getErrorString(m_ArchiveHandler->getLastError()));

   }

 

   connect(m_Progress, SIGNAL(canceled()), this, SLOT(downloadCancel()));

@@ -89,7 +89,7 @@ SelfUpdater::SelfUpdater(NexusInterface *nexusInterface)
 

 SelfUpdater::~SelfUpdater()

 {

-  delete m_CurrentArchive;

+  delete m_ArchiveHandler;

 }

 

 void SelfUpdater::setUserInterface(QWidget *widget)

@@ -249,26 +249,25 @@ void SelfUpdater::installUpdate()
   QDir().mkdir(backupPath);

 

   // rename files that are currently open so we can unpack the update

-  if (!m_CurrentArchive->open(ToWString(QDir::toNativeSeparators(m_UpdateFile.fileName())).c_str(),

-          new MethodCallback<SelfUpdater, void, LPSTR>(this, &SelfUpdater::queryPassword))) {

+  if (!m_ArchiveHandler->open(m_UpdateFile.fileName(), nullptr)) {

     throw MyException(tr("failed to open archive \"%1\": %2")

                       .arg(m_UpdateFile.fileName())

-                      .arg(InstallationManager::getErrorString(m_CurrentArchive->getLastError())));

+                      .arg(InstallationManager::getErrorString(m_ArchiveHandler->getLastError())));

   }

 

   // move all files contained in the archive out of the way,

   // otherwise we can't overwrite everything

   FileData* const *data;

   size_t size;

-  m_CurrentArchive->getFileList(data, size);

+  m_ArchiveHandler->getFileList(data, size);

 

   for (size_t i = 0; i < size; ++i) {

-    QString outputName = ToQString(data[i]->getFileName());

+    QString outputName = data[i]->getFileName();

     if (outputName.startsWith("ModOrganizer\\", Qt::CaseInsensitive)) {

       outputName = outputName.mid(13);

-      data[i]->addOutputFileName(ToWString(outputName).c_str());

+      data[i]->addOutputFileName(outputName);

     } else if (outputName != "ModOrganizer") {

-      data[i]->addOutputFileName(ToWString(outputName).c_str());

+      data[i]->addOutputFileName(outputName);

     }

     QFileInfo file(mopath + "/" + outputName);

     if (file.exists() && file.isFile()) {

@@ -281,14 +280,12 @@ void SelfUpdater::installUpdate()
   }

 

   // now unpack the archive into the mo directory

-  if (!m_CurrentArchive->extract(QDir::toNativeSeparators(mopath).toStdWString().c_str(),

-         new MethodCallback<SelfUpdater, void, float>(this, &SelfUpdater::updateProgress),

-         new MethodCallback<SelfUpdater, void, LPCWSTR>(this, &SelfUpdater::updateProgressFile),

-         new MethodCallback<SelfUpdater, void, LPCWSTR>(this, &SelfUpdater::report7ZipError))) {

+  if (!m_ArchiveHandler->extract(mopath, nullptr, nullptr,

+         new MethodCallback<SelfUpdater, void, QString const &>(this, &SelfUpdater::report7ZipError))) {

     throw std::runtime_error("extracting failed");

   }

 

-  m_CurrentArchive->close();

+  m_ArchiveHandler->close();

 

   m_UpdateFile.remove();

 

@@ -303,24 +300,9 @@ void SelfUpdater::installUpdate()
   emit restart();

 }

 

-void SelfUpdater::queryPassword(LPSTR)

+void SelfUpdater::report7ZipError(QString const &errorMessage)

 {

-  // nop

-}

-

-void SelfUpdater::updateProgress(float)

-{

-  // nop

-}

-

-void SelfUpdater::updateProgressFile(LPCWSTR)

-{

-  // nop

-}

-

-void SelfUpdater::report7ZipError(LPCWSTR errorMessage)

-{

-  QMessageBox::critical(m_Parent, tr("Error"), ToQString(errorMessage));

+  QMessageBox::critical(m_Parent, tr("Error"), errorMessage);

 }