From ca54ee2e9a8f1d49d81d5c3b66a860b9b16992d6 Mon Sep 17 00:00:00 2001
From: Thomas Tanner <trtanner@btinternet.com>
Date: Thu, 26 Nov 2015 21:22:47 +0000
Subject: Renamed getNexusName to getGameShortName as previously because it
 hopefully isn't too nexus related.

---
 src/downloadmanager.cpp | 2 +-
 src/mainwindow.cpp      | 2 +-
 src/nexusinterface.cpp  | 6 +++---
 src/organizercore.cpp   | 4 ++--
 src/settings.cpp        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 4a6769b1..e95a315f 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -450,7 +450,7 @@ void DownloadManager::addNXMDownload(const QString &url)
 {
   NXMUrl nxmInfo(url);
 
-  QString managedGame = m_ManagedGame->getNexusName();
+  QString managedGame = m_ManagedGame->getGameShortName();
   qDebug("add nxm download: %s", qPrintable(url));
   if (nxmInfo.game().compare(managedGame, Qt::CaseInsensitive) != 0) {
     qDebug("download requested for wrong game (game: %s, url: %s)", qPrintable(managedGame), qPrintable(nxmInfo.game()));
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index dd5a1b01..152baee7 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -4401,7 +4401,7 @@ void MainWindow::on_bossButton_clicked()
     parameters << "--unattended"
                << "--stdout"
                << "--noreport"
-               << "--game" << m_OrganizerCore.managedGame()->getNexusName()
+               << "--game" << m_OrganizerCore.managedGame()->getGameShortName()
                << "--gamePath" << QString("\"%1\"").arg(m_OrganizerCore.managedGame()->gameDirectory().absolutePath())
                << "--out" << outPath;
 
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index 7a0b0a17..aadfdc1e 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -244,12 +244,12 @@ bool NexusInterface::isURLGameRelated(const QUrl &url) const
 {
   QString const name(url.toString());
   return name.startsWith(getGameURL() + "/") ||
-         name.startsWith("http://" + m_Game->getNexusName().toLower() + ".nexusmods.com/mods/");
+         name.startsWith("http://" + m_Game->getGameShortName().toLower() + ".nexusmods.com/mods/");
 }
 
 QString NexusInterface::getGameURL() const
 {
-  return "http://www.nexusmods.com/" + m_Game->getNexusName().toLower();
+  return "http://www.nexusmods.com/" + m_Game->getGameShortName().toLower();
 }
 
 QString NexusInterface::getModURL(int modID) const
@@ -576,7 +576,7 @@ void NexusInterface::managedGameChanged(IPluginGame const *game)
 namespace {
   QString get_management_url(MOBase::IPluginGame const *game)
   {
-    return "http://nmm.nexusmods.com/" + game->getNexusName().toLower();
+    return "http://nmm.nexusmods.com/" + game->getGameShortName().toLower();
   }
 }
 
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 66a3799a..042a9f1e 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -401,8 +401,8 @@ void OrganizerCore::connectPlugins(PluginContainer *container)
   }
   //Do this the hard way
   for (const IPluginGame * const game : container->plugins<IPluginGame>()) {
-    QString n = game->getNexusName();
-    if (game->getNexusName() == "Skyrim") {
+    QString n = game->getGameShortName();
+    if (game->getGameShortName() == "Skyrim") {
       m_Updater.setNexusDownload(game);
       break;
     }
diff --git a/src/settings.cpp b/src/settings.cpp
index 95462c82..e175b210 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -108,7 +108,7 @@ void Settings::registerAsNXMHandler(bool force)
   std::wstring nxmPath = ToWString(QCoreApplication::applicationDirPath() + "/nxmhandler.exe");
   std::wstring executable = ToWString(QCoreApplication::applicationFilePath());
   std::wstring mode = force ? L"forcereg" : L"reg";
-  std::wstring parameters = mode + L" " + m_GamePlugin->getNexusName().toStdWString() + L" \"" + executable + L"\"";
+  std::wstring parameters = mode + L" " + m_GamePlugin->getGameShortName().toStdWString() + L" \"" + executable + L"\"";
   HINSTANCE res = ::ShellExecuteW(nullptr, L"open", nxmPath.c_str(), parameters.c_str(), nullptr, SW_SHOWNORMAL);
   if ((int)res <= 32) {
     QMessageBox::critical(nullptr, tr("Failed"),
-- 
cgit v1.3.1