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

diff --git a/src/nexusinterface.h b/src/nexusinterface.h
index 3fa8f564..c9a81134 100644
--- a/src/nexusinterface.h
+++ b/src/nexusinterface.h
@@ -345,6 +345,14 @@ public:
    */

   QString getModURL(int modID) const;

 

+  /**

+   * @brief Checks if the specified URL might correspond to a nexus mod

+   * @param modID

+   * @param url

+   * @return

+   */

+  bool isModURL(int modID, QString const &url) const;

+

 signals:

 

   void requestNXMDownload(const QString &url);

@@ -412,6 +420,7 @@ private:
   void nextRequest();

   void requestFinished(std::list<NXMRequestInfo>::iterator iter);

   bool requiresLogin(const NXMRequestInfo &info);

+  QString getOldModsURL() const;

 

 private: