Switch VersionInfo -> Version for ModOrganizer2. (#2063)

ModOrganizer2 · Aug 5, 2024 · 948d09f · 948d09f
1 parent 15dab98
commit 948d09f
Show file tree

Hide file tree

Showing 18 changed files with 392 additions and 906 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,8 +24,8 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.7.0
-          modules:
+          version: 6.7.1
+          modules: qtpositioning qtwebchannel qtwebengine qtwebsockets
           cache: true
 
       - uses: actions/checkout@v4

diff --git a/src/env.cpp b/src/env.cpp
@@ -1081,7 +1081,7 @@ std::wstring safeVersion()
 {
   try {
     // this can throw
-    return MOShared::createVersionInfo().displayString(3).toStdWString() + L"-";
+    return MOShared::createVersionInfo().string().toStdWString() + L"-";
   } catch (...) {
     return {};
   }

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -639,9 +639,10 @@ MainWindow::~MainWindow()
 void MainWindow::updateWindowTitle(const APIUserAccount& user)
 {
   //"\xe2\x80\x93" is an "em dash", a longer "-"
-  QString title = QString("%1 \xe2\x80\x93 Mod Organizer v%2")
-                      .arg(m_OrganizerCore.managedGame()->displayGameName(),
-                           m_OrganizerCore.getVersion().displayString(3));
+  QString title =
+      QString("%1 \xe2\x80\x93 Mod Organizer v%2")
+          .arg(m_OrganizerCore.managedGame()->displayGameName(),
+               m_OrganizerCore.getVersion().string(Version::FormatCondensed));
 
   if (!user.name().isEmpty()) {
     const QString premium = (user.type() == APIUserAccountTypes::Premium ? "*" : "");
@@ -1039,7 +1040,8 @@ void MainWindow::checkForProblemsImpl()
 
 void MainWindow::about()
 {
-  AboutDialog(m_OrganizerCore.getVersion().displayString(3), this).exec();
+  AboutDialog(m_OrganizerCore.getVersion().string(Version::FormatCondensed), this)
+      .exec();
 }
 
 void MainWindow::createEndorseMenu()
@@ -2163,8 +2165,9 @@ void MainWindow::processUpdates()
   auto& settings      = m_OrganizerCore.settings();
   const auto earliest = QVersionNumber::fromString("2.1.2").normalized();
 
-  const auto lastVersion    = settings.version().value_or(earliest);
-  const auto currentVersion = m_OrganizerCore.getVersion().asQVersionNumber();
+  const auto lastVersion = settings.version().value_or(earliest);
+  const auto currentVersion =
+      QVersionNumber::fromString(m_OrganizerCore.getVersion().string()).normalized();
 
   m_LastVersion = lastVersion;
 
@@ -2967,8 +2970,7 @@ void MainWindow::actionEndorseMO()
           QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
     NexusInterface::instance().requestToggleEndorsement(
         game->gameShortName(), game->nexusModOrganizerID(),
-        m_OrganizerCore.getVersion().canonicalString(), true, this, QVariant(),
-        QString());
+        m_OrganizerCore.getVersion().string(), true, this, QVariant(), QString());
   }
 }
 
@@ -2989,8 +2991,7 @@ void MainWindow::actionWontEndorseMO()
           QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
     NexusInterface::instance().requestToggleEndorsement(
         game->gameShortName(), game->nexusModOrganizerID(),
-        m_OrganizerCore.getVersion().canonicalString(), false, this, QVariant(),
-        QString());
+        m_OrganizerCore.getVersion().string(), false, this, QVariant(), QString());
   }
 }
 

diff --git a/src/moapplication.cpp b/src/moapplication.cpp
@@ -203,8 +203,8 @@ int MOApplication::setup(MOMultiProcess& multiProcess, bool forceSelect)
   log::debug("command line: '{}'", QString::fromWCharArray(GetCommandLineW()));
 
   log::info("starting Mod Organizer version {} revision {} in {}, usvfs: {}",
-            createVersionInfo().displayString(3), GITID,
-            QCoreApplication::applicationDirPath(), MOShared::getUsvfsVersionString());
+            createVersionInfo().string(), GITID, QCoreApplication::applicationDirPath(),
+            MOShared::getUsvfsVersionString());
 
   if (multiProcess.secondary()) {
     log::debug("another instance of MO is running but --multiple was given");

diff --git a/src/modinfo.h b/src/modinfo.h
@@ -732,7 +732,7 @@ class ModInfo : public QObject, public MOBase::IModInterface
    *
    * @note Currently, this changes the color of the cell under the "Notes" column.
    */
-  virtual void setColor(QColor color) {}
+  virtual void setColor([[maybe_unused]] QColor color) {}
 
   /**
    * @brief Adds the information that a file has been installed into this mod.

diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
@@ -274,9 +274,8 @@ NexusInterface::NexusInterface(Settings* s) : m_PluginContainer(nullptr)
   g_instance = this;
 
   m_User.limits(defaultAPILimits());
-  m_MOVersion = createVersionInfo();
 
-  m_AccessManager = new NXMAccessManager(this, s, m_MOVersion.displayString(3));
+  m_AccessManager = new NXMAccessManager(this, s, createVersionInfo().string());
 
   m_DiskCache = new QNetworkDiskCache(this);
 

diff --git a/src/nexusinterface.h b/src/nexusinterface.h
@@ -681,7 +681,6 @@ private slots:
   NXMAccessManager* m_AccessManager;
   std::list<NXMRequestInfo> m_ActiveRequest;
   QQueue<NXMRequestInfo> m_RequestQueue;
-  MOBase::VersionInfo m_MOVersion;
   PluginContainer* m_PluginContainer;
   APIUserAccount m_User;
 };