1 files changed, 12 insertions, 9 deletions
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index d0eb58a6..4a44c067 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -86,7 +86,7 @@ void NexusBridge::nxmFilesAvailable(int modID, QVariant userData, QVariant resul
 
     QVariantList resultList = resultData.toList();
 
-    foreach(QVariant file, resultList) {
+    for (const QVariant &file : resultList) {
       ModRepositoryFileInfo temp;
       QVariantMap fileInfo = file.toMap();
       temp.uri = fileInfo["uri"].toString();
@@ -193,7 +193,7 @@ void NexusInterface::loginCompleted()
 void NexusInterface::interpretNexusFileName(const QString &fileName, QString &modName, int &modID, bool query)
 {
   //Look for something along the lines of modulename-Vn-m + any old rubbish.
-  static std::regex exp("^([a-zA-Z0-9_'\"\\- ]*?)([-_ ][VvRr]?[0-9_]+)?-([1-9][0-9]+).*");
+  static std::regex exp("^([a-zA-Z0-9_'\"\\-.() ]*?)([-_ ][VvRr]?[0-9_]+)?-([1-9][0-9]+).*\\.(zip|rar|7z)");
   static std::regex simpleexp("^([a-zA-Z0-9_]+)");
 
   QByteArray fileNameUTF8 = fileName.toUtf8();
@@ -206,11 +206,12 @@ void NexusInterface::interpretNexusFileName(const QString &fileName, QString &mo
     std::string candidate2 = result[2].str();
     if (candidate2.length() != 0 && (candidate2.find_last_of("VvRr") == std::string::npos)) {
       // well, that second match might be an id too...
-      unsigned offset = strspn(candidate2.c_str(), "-_ ");
+      size_t offset = strspn(candidate2.c_str(), "-_ ");
       if (offset < candidate2.length() && query) {
         SelectionDialog selection(tr("Failed to guess mod id for \"%1\", please pick the correct one").arg(fileName));
         QString r2Highlight(fileName);
-        r2Highlight.insert(result.position(2) + result.length(2), "* ").insert(result.position(2) + offset, " *");
+        r2Highlight.insert(result.position(2) + result.length(2), "* ")
+            .insert(result.position(2) + static_cast<int>(offset), " *");
         QString r3Highlight(fileName);
         r3Highlight.insert(result.position(3) + result.length(3), "* ").insert(result.position(3), " *");
 
@@ -264,14 +265,14 @@ QString NexusInterface::getModURL(int modID) const
   return QString("%1/mods/%2").arg(getGameURL()).arg(modID);
 }
 
-bool NexusInterface::isModURL(int modID, QString const &url) const
+bool NexusInterface::isModURL(int modID, const QString &url) const
 {
-  if (url == getModURL(modID)) {
+  if (QUrl(url) == QUrl(getModURL(modID))) {
     return true;
   }
   //Try the alternate (old style) mod name
   QString alt = QString("%1/%2").arg(getOldModsURL()).arg(modID);
-  return alt == url;
+  return QUrl(alt) == QUrl(url);
 }
 
 int NexusInterface::requestDescription(int modID, QObject *receiver, QVariant userData,
@@ -564,8 +565,10 @@ void NexusInterface::requestError(QNetworkReply::NetworkError)
     return;
   }
 
-  qCritical("request (%s) error: %s",
-            qPrintable(reply->url().toString()), qPrintable(reply->errorString()));
+  qCritical("request (%s) error: %s (%d)",
+            qPrintable(reply->url().toString()),
+            qPrintable(reply->errorString()),
+            reply->error());
 }