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

diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index 57bd592d..54db4648 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -35,6 +35,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFileSystemWatcher>

 #include <QSettings>

 

+namespace MOBase { class IPluginGame; }

 

 class NexusInterface;

 

@@ -328,7 +329,9 @@ public:
 

 

   virtual int startDownloadURLs(const QStringList &urls);

+  /* This doesn't appear to be used anywhere

   virtual int startDownloadNexusFile(int modID, int fileID);

+  */

   virtual QString downloadPath(int id);

 

   /**

@@ -414,6 +417,8 @@ public slots:
 

   void nxmRequestFailed(int modID, int fileID, QVariant userData, int requestID, const QString &errorString);

 

+  void managedGameChanged(MOBase::IPluginGame const *gamePlugin);

+

 private slots:

 

   void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);

@@ -501,6 +506,7 @@ private:
 

   QRegExp m_DateExpression;

 

+  MOBase::IPluginGame const *m_ManagedGame;

 };