Replace GameInfo::getNexusModID with IPluginGame::getNexusModOrganizerID()

Also implement IPluginGame::getNexusGameID() but not hooked it in yet.

10 files changed, 8 insertions, 27 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1651d0c6..5856f57f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3813,7 +3813,8 @@ void MainWindow::on_actionEndorseMO_triggered()
   if (QMessageBox::question(this, tr("Endorse Mod Organizer"),

                             tr("Do you want to endorse Mod Organizer on %1 now?").arg(ToQString(GameInfo::instance().getNexusPage())),

                             QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

-    NexusInterface::instance()->requestToggleEndorsement(GameInfo::instance().getNexusModID(), true, this, QVariant(), QString());

+    NexusInterface::instance()->requestToggleEndorsement(

+          m_OrganizerCore.managedGame()->getNexusModOrganizerID(), true, this, QVariant(), QString());

   }

 }

 

@@ -3877,7 +3878,7 @@ void MainWindow::nxmUpdatesAvailable(const std::vector<int> &modIDs, QVariant us
   QVariantList resultList = resultData.toList();

   for (auto iter = resultList.begin(); iter != resultList.end(); ++iter) {

     QVariantMap result = iter->toMap();

-    if (result["id"].toInt() == GameInfo::instance().getNexusModID()) {

+    if (result["id"].toInt() == m_OrganizerCore.managedGame()->getNexusModOrganizerID()) {

       if (!result["voted_by_user"].toBool()) {

         ui->actionEndorseMO->setVisible(true);

       }

diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 59205b12..a0628bd8 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -287,7 +287,10 @@ int ModInfo::checkAllForUpdate(QObject *receiver)
   int result = 0;
   std::vector<int> modIDs;
 
-  modIDs.push_back(GameInfo::instance().getNexusModID());
+  //I ought to store this, it's used elsewhere
+  IPluginGame *game = qApp->property("managed_game").value<IPluginGame*>();
+
+  modIDs.push_back(game->getNexusModOrganizerID());
 
   for (const ModInfo::Ptr &mod : s_Collection) {
     if (mod->canBeUpdated()) {
diff --git a/src/shared/fallout3info.cpp b/src/shared/fallout3info.cpp
index 95d1d299..67dc85e0 100644
--- a/src/shared/fallout3info.cpp
+++ b/src/shared/fallout3info.cpp
@@ -92,11 +92,6 @@ std::wstring Fallout3Info::getNexusInfoUrlStatic()
   return L"http://nmm.nexusmods.com/fallout3";

 }

 

-int Fallout3Info::getNexusModIDStatic()

-{

-  return 16348;

-}

-

 bool Fallout3Info::rerouteToProfile(const wchar_t *fileName, const wchar_t*)

 {

   static LPCWSTR profileFiles[] = { L"fallout.ini", L"falloutprefs.ini", L"plugins.txt", nullptr };

diff --git a/src/shared/fallout3info.h b/src/shared/fallout3info.h
index ed130e53..3688bc2e 100644
--- a/src/shared/fallout3info.h
+++ b/src/shared/fallout3info.h
@@ -52,8 +52,6 @@ public:
   virtual std::wstring getNexusPage(bool nmmScheme = true);

   static std::wstring getNexusInfoUrlStatic();

   virtual std::wstring getNexusInfoUrl() { return getNexusInfoUrlStatic(); }

-  static int getNexusModIDStatic();

-  virtual int getNexusModID() { return getNexusModIDStatic(); }

   virtual int getNexusGameID() { return 120; }

 

   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath);

diff --git a/src/shared/falloutnvinfo.cpp b/src/shared/falloutnvinfo.cpp
index b5fb4f04..c1eea4da 100644
--- a/src/shared/falloutnvinfo.cpp
+++ b/src/shared/falloutnvinfo.cpp
@@ -94,12 +94,6 @@ std::wstring FalloutNVInfo::getNexusInfoUrlStatic()
 }

 

 

-int FalloutNVInfo::getNexusModIDStatic()

-{

-  return 42572;

-}

-

-

 bool FalloutNVInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t*)

 {

   static LPCWSTR profileFiles[] = { L"fallout.ini", L"falloutprefs.ini", L"plugins.txt", nullptr };

diff --git a/src/shared/falloutnvinfo.h b/src/shared/falloutnvinfo.h
index 75febd4c..024ad9aa 100644
--- a/src/shared/falloutnvinfo.h
+++ b/src/shared/falloutnvinfo.h
@@ -52,8 +52,6 @@ public:
   virtual std::wstring getNexusPage(bool nmmScheme = true);

   static std::wstring getNexusInfoUrlStatic();

   virtual std::wstring getNexusInfoUrl() { return getNexusInfoUrlStatic(); }

-  static int getNexusModIDStatic();

-  virtual int getNexusModID() { return getNexusModIDStatic(); }

   virtual int getNexusGameID() { return 130; }

 

   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath);

diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h
index 06b96d61..da6fb3dc 100644
--- a/src/shared/gameinfo.h
+++ b/src/shared/gameinfo.h
@@ -80,8 +80,8 @@ public:
 

   virtual std::wstring getNexusPage(bool nmmScheme = true) = 0;

   virtual std::wstring getNexusInfoUrl() = 0;

-  virtual int getNexusModID() = 0;

   virtual int getNexusGameID() = 0;

+  //**Still used: SkyrimInfo::getNexusModIDStatic

 

   //**USED ONLY IN HOOKDLL

   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath) = 0;

diff --git a/src/shared/oblivioninfo.cpp b/src/shared/oblivioninfo.cpp
index 27de1275..4cd03ae8 100644
--- a/src/shared/oblivioninfo.cpp
+++ b/src/shared/oblivioninfo.cpp
@@ -97,11 +97,6 @@ std::wstring OblivionInfo::getNexusInfoUrlStatic()
 }

 

 

-int OblivionInfo::getNexusModIDStatic()

-{

-  return 38277;

-}

-

 bool OblivionInfo::rerouteToProfile(const wchar_t *fileName, const wchar_t*)

 {

   static LPCWSTR profileFiles[] = { L"oblivion.ini", L"oblivionprefs.ini", L"plugins.txt", nullptr };

diff --git a/src/shared/oblivioninfo.h b/src/shared/oblivioninfo.h
index a9808d77..b298ed0a 100644
--- a/src/shared/oblivioninfo.h
+++ b/src/shared/oblivioninfo.h
@@ -50,8 +50,6 @@ public:
   virtual std::wstring getNexusPage(bool nmmScheme = true);

   static std::wstring getNexusInfoUrlStatic();

   virtual std::wstring getNexusInfoUrl() { return getNexusInfoUrlStatic(); }

-  static int getNexusModIDStatic();

-  virtual int getNexusModID() { return getNexusModIDStatic(); }

   virtual int getNexusGameID() { return 101; }

 

   virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath);

diff --git a/src/shared/skyriminfo.h b/src/shared/skyriminfo.h
index 13c82456..93e2a948 100644
--- a/src/shared/skyriminfo.h
+++ b/src/shared/skyriminfo.h
@@ -54,7 +54,6 @@ public:
   static std::wstring getNexusInfoUrlStatic();

   virtual std::wstring getNexusInfoUrl() { return getNexusInfoUrlStatic(); }

   static int getNexusModIDStatic();

-  virtual int getNexusModID() { return getNexusModIDStatic(); }

   static int getNexusGameIDStatic() { return 110; }

   virtual int getNexusGameID() { return getNexusGameIDStatic(); }