refactor(core,util): replace Util::Version with QVersionNumber

zealdocs · Apr 9, 2019 · b22ad78 · b22ad78
1 parent 79ad7f2
commit b22ad78
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 180 deletions.
diff --git a/src/libs/core/application.cpp b/src/libs/core/application.cpp
@@ -30,7 +30,6 @@
 #include <registry/docsetregistry.h>
 #include <registry/searchquery.h>
 #include <ui/mainwindow.h>
-#include <util/version.h>
 
 #include <QCoreApplication>
 #include <QJsonArray>
@@ -134,6 +133,11 @@ FileManager *Application::fileManager() const
     return m_fileManager;
 }
 
+QVersionNumber Application::version()
+{
+    return QVersionNumber::fromString(QCoreApplication::applicationVersion());
+}
+
 void Application::executeQuery(const Registry::SearchQuery &query, bool preventActivation)
 {
     m_mainWindow->search(query);
@@ -193,12 +197,14 @@ void Application::checkForUpdates(bool quiet)
             return;
         }
 
-        const QJsonObject latestVersionInfo = jsonDoc.array().first().toObject();
-        const Util::Version latestVersion = latestVersionInfo[QStringLiteral("version")].toString();
-        if (latestVersion > Util::Version(QCoreApplication::applicationVersion()))
+        const QJsonObject versionInfo = jsonDoc.array().first().toObject(); // Latest is the first.
+        const auto latestVersion
+                = QVersionNumber::fromString(versionInfo[QLatin1String("version")].toString());
+        if (latestVersion > version()) {
             emit updateCheckDone(latestVersion.toString());
-        else if (!quiet)
+        } else if (!quiet) {
             emit updateCheckDone();
+        }
     });
 }
 

diff --git a/src/libs/core/application.h b/src/libs/core/application.h
@@ -24,6 +24,7 @@
 #define ZEAL_CORE_APPLICATION_H
 
 #include <QObject>
+#include <QVersionNumber>
 
 class QNetworkAccessManager;
 class QNetworkReply;
@@ -64,6 +65,8 @@ class Application final : public QObject
     Registry::DocsetRegistry *docsetRegistry();
     FileManager *fileManager() const;
 
+    static QVersionNumber version();
+
 public slots:
     void executeQuery(const Registry::SearchQuery &query, bool preventActivation);
     void extract(const QString &filePath, const QString &destination, const QString &root = QString());

diff --git a/src/libs/core/settings.cpp b/src/libs/core/settings.cpp
@@ -22,6 +22,7 @@
 
 #include "settings.h"
 
+#include "application.h"
 #include "filemanager.h"
 
 #include <QCoreApplication>
@@ -250,7 +251,7 @@ void Settings::save()
     settings->beginGroup(GroupInternal);
     settings->setValue(QStringLiteral("install_id"), installId);
     // Version of configuration file format, should match Zeal version. Used for migration rules.
-    settings->setValue(QStringLiteral("version"), QCoreApplication::applicationVersion());
+    settings->setValue(QStringLiteral("version"), Application::version().toString());
     settings->endGroup();
 
     settings->sync();
@@ -269,8 +270,7 @@ void Settings::save()
 void Settings::migrate(QSettings *settings) const
 {
     settings->beginGroup(GroupInternal);
-    // TODO: [Qt 5.6] Use QVersionNumber.
-    const QString version = settings->value(QStringLiteral("version")).toString();
+    const auto version = QVersionNumber::fromString(settings->value(QStringLiteral("version")).toString());
     settings->endGroup();
 
     //
@@ -279,7 +279,7 @@ void Settings::migrate(QSettings *settings) const
 
     // Unset content.default_fixed_font_size.
     // The causing bug was 0.6.1 (#903), but the incorrect setting still comes to haunt us (#1054).
-    if (version == QLatin1String("0.6.0")) {
+    if (version == QVersionNumber(0, 6, 0)) {
         settings->beginGroup(GroupContent);
         settings->remove(QStringLiteral("default_fixed_font_size"));
         settings->endGroup();
@@ -290,7 +290,7 @@ void Settings::migrate(QSettings *settings) const
     //
 
     // Rename 'browser' group into 'content'.
-    if (version < QLatin1String("0.4")) {
+    if (version < QVersionNumber(0, 4, 0)) {
         settings->beginGroup(QStringLiteral("browser"));
         const QVariant tmpMinimumFontSize = settings->value(QStringLiteral("minimum_font_size"));
         settings->endGroup();
@@ -309,7 +309,7 @@ void Settings::migrate(QSettings *settings) const
     //
 
     // Unset 'state/splitter_geometry', because custom styles were removed.
-    if (version < QLatin1String("0.3")) {
+    if (version < QVersionNumber(0, 3, 0)) {
         settings->beginGroup(GroupState);
         settings->remove(QStringLiteral("splitter_geometry"));
         settings->endGroup();

diff --git a/src/libs/util/CMakeLists.txt b/src/libs/util/CMakeLists.txt
@@ -5,7 +5,6 @@ add_library(Util STATIC
     caseinsensitivemap.h
     plist.cpp
     sqlitedatabase.cpp
-    version.cpp
 )
 
 find_package(Qt5Core REQUIRED)

diff --git a/src/libs/util/version.cpp b/src/libs/util/version.cpp
diff --git a/src/libs/util/version.h b/src/libs/util/version.h