Merge with branch1.1

1 files changed, 9 insertions, 6 deletions

diff --git a/src/nexusinterface.h b/src/nexusinterface.h
index ba2ee3cd..6067d027 100644
--- a/src/nexusinterface.h
+++ b/src/nexusinterface.h
@@ -23,7 +23,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "nxmaccessmanager.h"
 
-#include "utility.h"
+#include <utility.h>
 #include <gameinfo.h>
 #include <versioninfo.h>
 #include <imodrepositorybridge.h>
@@ -105,7 +105,7 @@ public slots:
   void nxmFileInfoAvailable(int modID, int fileID, QVariant userData, QVariant resultData, int requestID);
   void nxmDownloadURLsAvailable(int modID, int fileID, QVariant userData, QVariant resultData, int requestID);
   void nxmEndorsementToggled(int modID, QVariant userData, QVariant resultData, int requestID);
-  void nxmRequestFailed(int modID, QVariant userData, int requestID, const QString &errorMessage);
+  void nxmRequestFailed(int modID, int fileID, QVariant userData, int requestID, const QString &errorMessage);
 
 private:
 
@@ -240,7 +240,7 @@ signals:
   void nxmFileInfoAvailable(int modID, int fileID, QVariant userData, QVariant resultData, int requestID);
   void nxmDownloadURLsAvailable(int modID, int fileID, QVariant userData, QVariant resultData, int requestID);
   void nxmEndorsementToggled(int modID, QVariant userData, QVariant resultData, int requestID);
-  void nxmRequestFailed(int modID, QVariant userData, int requestID, const QString &errorString);
+  void nxmRequestFailed(int modID, int fileID, QVariant userData, int requestID, const QString &errorString);
 
 private slots:
 
@@ -270,18 +270,19 @@ private:
     QVariant m_UserData;
     QTimer *m_Timeout;
     QString m_URL;
+    bool m_Reroute;
     int m_ID;
     int m_Endorse;
 
     NXMRequestInfo(int modID, Type type, QVariant userData, const QString &url)
       : m_ModID(modID), m_FileID(0), m_Reply(NULL), m_Type(type), m_UserData(userData),
-        m_Timeout(NULL), m_ID(s_NextID.fetchAndAddAcquire(1)), m_URL(url) {}
+    m_Timeout(NULL), m_Reroute(false), m_ID(s_NextID.fetchAndAddAcquire(1)), m_URL(url) {}
     NXMRequestInfo(std::vector<int> modIDList, Type type, QVariant userData, const QString &url)
       : m_ModID(-1), m_ModIDList(modIDList), m_FileID(0), m_Reply(NULL), m_Type(type), m_UserData(userData),
-        m_Timeout(NULL), m_ID(s_NextID.fetchAndAddAcquire(1)), m_URL(url) {}
+        m_Timeout(NULL), m_Reroute(false), m_ID(s_NextID.fetchAndAddAcquire(1)), m_URL(url) {}
     NXMRequestInfo(int modID, int fileID, Type type, QVariant userData, const QString &url)
       : m_ModID(modID), m_FileID(fileID), m_Reply(NULL), m_Type(type), m_UserData(userData),
-        m_Timeout(NULL), m_ID(s_NextID.fetchAndAddAcquire(1)), m_URL(url) {}
+    m_Timeout(NULL), m_Reroute(false), m_ID(s_NextID.fetchAndAddAcquire(1)), m_URL(url) {}
 
   private:
     static QAtomicInt s_NextID;
@@ -294,6 +295,7 @@ private:
   NexusInterface();
   void nextRequest();
   void requestFinished(std::list<NXMRequestInfo>::iterator iter);
+  static void cleanup();
 
 private:
 
@@ -306,6 +308,7 @@ private:
   std::list<NXMRequestInfo> m_ActiveRequest;
   QQueue<NXMRequestInfo> m_RequestQueue;
 
+  MOBase::VersionInfo m_MOVersion;
   QString m_NMMVersion;
 
 };