Ref T419, use version from IDatastoreObject in CArtifact

* add QVersion
* remove version parts from CArtifact

src/blackmisc/db/artifact.cpp

@@ -25,10 +25,11 @@ namespace BlackMisc
         CArtifact::CArtifact(
             const QString &name, const QString &version, const QString &md5,
             CArtifact::ArtifactType type, int size, bool existing, const CPlatform &platform):
-            m_name(name.trimmed()), m_version(trimVersionString(version)),
+            m_name(name.trimmed()),
             m_md5(md5), m_type(static_cast<int>(type)), m_size(size), m_existing(existing),
             m_platform(platform)
         {
+            this->setVersion(trimVersionString(version));
             if (!name.isEmpty() && version.isEmpty())
             {
                 m_version = versionNumberFromFilename(name);
@@ -84,15 +85,10 @@ namespace BlackMisc
             return rf;
         }
 
-        QVersionNumber CArtifact::getQVersion() const
-        {
-            return QVersionNumber::fromString(getVersionString());
-        }
-
         bool CArtifact::isNewerThanCurrentBuild() const
         {
             if (this->isUnknown()) { return false; }
-            if (this->getVersionString().isEmpty()) { return false; }
+            if (!this->hasVersion()) { return false; }
             return this->getQVersion() > CBuildConfig::getVersion();
         }
 

src/blackmisc/db/artifact.h

@@ -16,7 +16,6 @@
 #include "blackmisc/platform.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/network/remotefile.h"
-#include <QVersionNumber>
 #include <QString>
 
 namespace BlackMisc
@@ -59,9 +58,6 @@ namespace BlackMisc
             CArtifact(const QString &name, const QString &version, const QString &md5,
                       ArtifactType type, int size, bool existing, const CPlatform &platform);
 
-            //! Destructor.
-            ~CArtifact() {}
-
             //! Having name?
             bool hasName() const { return !m_name.isEmpty(); }
 
@@ -74,12 +70,6 @@ namespace BlackMisc
             //! Matching name?
             bool matchesName(const QString &name, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
 
-            //! Having a version string?
-            bool hasVersionString() const { return !m_version.isEmpty(); }
-
-            //! Version for platform
-            const QString &getVersionString() const { return m_version; }
-
             //! Get type
             ArtifactType getType() const { return static_cast<ArtifactType>(m_type); }
 
@@ -132,9 +122,6 @@ namespace BlackMisc
             //! \note requires distributions
             Network::CRemoteFile asRemoteFile() const;
 
-            //! Version as QVersion
-            QVersionNumber getQVersion() const;
-
             //! Newer tahn the current build
             bool isNewerThanCurrentBuild() const;
 
@@ -158,7 +145,6 @@ namespace BlackMisc
 
         private:
             QString m_name;    //!< channel the files belong to
-            QString m_version; //!< version string
             QString m_md5;     //!< MD5 checksum
             int  m_type = static_cast<int>(UnknownArtifact); //!< artifact type
             int  m_size = -1;        //!< size

src/blackmisc/db/artifactlist.cpp

@@ -150,9 +150,9 @@ namespace BlackMisc
             return rfs;
         }
 
-        QString CArtifactList::getLatestVersionString() const
+        QString CArtifactList::getLatestVersion() const
         {
-            return this->getLatestArtifactOrDefault().getVersionString();
+            return this->getLatestArtifactOrDefault().getVersion();
         }
 
         QVersionNumber CArtifactList::getLatestQVersion() const
@@ -182,9 +182,9 @@ namespace BlackMisc
             QStringList versions;
             for (const CArtifact &artifact : as_const(copy))
             {
-                if (artifact.hasVersionString())
+                if (artifact.hasVersion())
                 {
-                    versions.push_back(artifact.getVersionString());
+                    versions.push_back(artifact.getVersion());
                 }
             }
             return versions;

src/blackmisc/db/artifactlist.h

@@ -88,7 +88,7 @@ namespace BlackMisc
             Network::CRemoteFileList asRemoteFiles() const;
 
             //! Latest version
-            QString getLatestVersionString() const;
+            QString getLatestVersion() const;
 
             //! Latest version
             QVersionNumber getLatestQVersion() const;

src/blackmisc/db/datastore.cpp

@@ -19,6 +19,11 @@ namespace BlackMisc
 {
     namespace Db
     {
+        QVersionNumber IDatastoreObject::getQVersion() const
+        {
+            return QVersionNumber::fromString(this->getVersion());
+        }
+
         void IDatastoreObject::setTimestampVersionFromDatabaseJson(const QJsonObject &json, const QString &prefix)
         {
             // we check 2 formats, the DB format and the backend object format

src/blackmisc/db/datastore.h

@@ -19,8 +19,9 @@
 
 #include <QJsonObject>
 #include <QJsonValue>
-#include <QObject>
+#include <QVersionNumber>
 #include <QString>
+#include <QObject>
 
 namespace BlackMisc
 {
@@ -52,6 +53,12 @@ namespace BlackMisc
             //! Version info
             const QString &getVersion() const { return m_version; }
 
+            //! Version as QVersion
+            QVersionNumber getQVersion() const;
+
+            //! Having a version?s
+            bool hasVersion() const { return !m_version.isEmpty(); }
+
             //! Version info
             void setVersion(const QString &version) { m_version = version; }
 

src/swiftlauncher/swiftlauncher.cpp

@@ -229,7 +229,7 @@ void CSwiftLauncher::setHeaderInfo(const CArtifact &latestArtifact)
     {
         static const QString t("New version '%1' ['%2'/'%3']");
         ui->lbl_HeaderInfo->setText(
-            t.arg(latestArtifact.getVersionString(), latestArtifact.getPlatform().getPlatformName(),
+            t.arg(latestArtifact.getVersion(), latestArtifact.getPlatform().getPlatformName(),
                   latestArtifact.getMostStableDistribution().getChannel()));
         ui->lbl_HeaderInfo->setStyleSheet("background: red; color: yellow;");
     }