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

diff --git a/src/installationmanager.h b/src/installationmanager.h
index 111b41f5..e1ebb519 100644
--- a/src/installationmanager.h
+++ b/src/installationmanager.h
@@ -59,6 +59,8 @@ public:
 

   void setParentWidget(QWidget *widget);

 

+  void setURL(const QString &url);

+

   /**

    * @brief update the directory where mods are to be installed

    * @param modsDirectory the mod directory

@@ -147,12 +149,10 @@ public:
 

 private:

 

-  void queryPassword(LPSTR password);

+  void queryPassword(QString *password);

   void updateProgress(float percentage);

-  void updateProgressFile(LPCWSTR fileName);

-  void report7ZipError(LPCWSTR errorMessage);

-

-  void dummyProgressFile(LPCWSTR) {}

+  void updateProgressFile(const QString &fileName);

+  void report7ZipError(const QString &errorMessage);

 

   MOBase::DirectoryTree *createFilesTree();

 

@@ -161,15 +161,13 @@ private:
   void mapToArchive(const MOBase::DirectoryTree::Node *baseNode);

 

   // recursive worker function for mapToArchive

-  void mapToArchive(const MOBase::DirectoryTree::Node *node, std::wstring path, FileData * const *data);

+  void mapToArchive(const MOBase::DirectoryTree::Node *node, QString path, FileData * const *data);

   bool unpackSingleFile(const QString &fileName);

 

 

   bool isSimpleArchiveTopLayer(const MOBase::DirectoryTree::Node *node, bool bainStyle);

   MOBase::DirectoryTree::Node *getSimpleArchiveBase(MOBase::DirectoryTree *dataTree);

 

-  //bool testOverwrite(const QString &modsDirectory, MOBase::GuessedValue<QString> &modName, bool *merge = nullptr);

-

   bool doInstall(MOBase::GuessedValue<QString> &modName,

                  int modID, const QString &version, const QString &newestVersion, int categoryID, const QString &repository);

 

@@ -205,13 +203,14 @@ private:
   std::vector<MOBase::IPluginInstaller*> m_Installers;

   std::set<QString, CaseInsensitive> m_SupportedExtensions;

 

-  Archive *m_CurrentArchive;

+  Archive *m_ArchiveHandler;

   QString m_CurrentFile;

 

   QProgressDialog *m_InstallationProgress { nullptr };

 

   std::set<QString> m_TempFilesToDelete;

 

+  QString m_URL;

 };