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, 6 deletions

diff --git a/src/selfupdater.h b/src/selfupdater.h
index bb9804e8..0a31b0f3 100644
--- a/src/selfupdater.h
+++ b/src/selfupdater.h
@@ -31,6 +31,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 #include <windows.h>

 

+namespace MOBase { class IPluginGame; }

 

 class NexusInterface;

 

@@ -68,7 +69,7 @@ public:
    * @param parent parent widget

    * @todo passing the nexus interface is unneccessary

    **/

-  SelfUpdater(NexusInterface *nexusInterface);

+  explicit SelfUpdater(NexusInterface *nexusInterface);

 

   virtual ~SelfUpdater();

 

@@ -85,6 +86,9 @@ public:
    **/

   MOBase::VersionInfo getVersion() const { return m_MOVersion; }

 

+  /** Set the game check for updates */

+  void setNexusDownload(MOBase::IPluginGame const *game);

+

 public slots:

 

   /**

@@ -118,10 +122,7 @@ private:
 

   void download(const QString &downloadLink, const QString &fileName);

   void installUpdate();

-  void queryPassword(LPSTR password);

-  void updateProgress(float percentage);

-  void updateProgressFile(LPCWSTR fileName);

-  void report7ZipError(LPCWSTR errorMessage);

+  void report7ZipError(const QString &errorMessage);

   QString retrieveNews(const QString &description);

   void showProgress();

   void closeProgress();

@@ -146,8 +147,9 @@ private:
   bool m_Canceled;

   int m_Attempts;

 

-  Archive *m_CurrentArchive;

+  Archive *m_ArchiveHandler;

 

+  MOBase::IPluginGame const *m_NexusDownload;

 };