Changeset 94738 in vbox for trunk/src

Timestamp:

Apr 28, 2022 5:13:37 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:10205: Reworking UIUpdateDefs; Reordering and a bit of cleanup (more to go).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• networking/UIUpdateDefs.cpp (modified) (3 diffs)
• networking/UIUpdateDefs.h (modified) (2 diffs)
• settings/editors/UIUpdateSettingsEditor.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateDefs.cpp

@@ -70 +70 @@
     , m_enmUpdateChannel(KUpdateChannel_Stable)
 {
-    decode();
-}
-
-VBoxUpdateData::VBoxUpdateData(UpdatePeriodType enmUpdatePeriod, KUpdateChannel enmUpdateChannel)
-    : m_strData(QString())
-    , m_enmUpdatePeriod(enmUpdatePeriod)
-    , m_enmUpdateChannel(enmUpdateChannel)
-{
-    encode();
-}
-
-bool VBoxUpdateData::isNoNeedToCheck() const
-{
-    /* No need to check if Period == Never: */
-    return m_enmUpdatePeriod == UpdatePeriodType_Never;
-}
-
-bool VBoxUpdateData::isNeedToCheck() const
-{
-    /* Return 'false' if there is no need to check: */
-    if (isNoNeedToCheck())
-        return false;
-
-    /* Return 'true' if date of next check is today or missed: */
-    if (QDate::currentDate() >= m_date)
-        return true;
-
-    /* Return 'true' if saved version value is NOT valid or NOT equal to current: */
-    if (!version().isValid() || version() != UIVersion(uiCommon().vboxVersionStringNormalized()))
-        return true;
-
-    /* Return 'false' in all other cases: */
-    return false;
-}
-
-QString VBoxUpdateData::data() const
-{
-    return m_strData;
-}
-
-UpdatePeriodType VBoxUpdateData::updatePeriod() const
-{
-    return m_enmUpdatePeriod;
-}
-
-QString VBoxUpdateData::date() const
-{
-    return isNoNeedToCheck() ? QCoreApplication::translate("UIUpdateManager", "Never")
-                             : QLocale::system().toString(m_date, QLocale::ShortFormat);
-}
-
-QDate VBoxUpdateData::internalDate() const
-{
-    return m_date;
-}
-
-KUpdateChannel VBoxUpdateData::updateChannel() const
-{
-    return m_enmUpdateChannel;
-}
-
-QString VBoxUpdateData::updateChannelName() const
-{
-    return updateChannelToInternalString(m_enmUpdateChannel);
-}
-
-UIVersion VBoxUpdateData::version() const
-{
-    return m_version;
-}
-
-bool VBoxUpdateData::isEqual(const VBoxUpdateData &another) const
-{
-    return    true
-           && (m_strData == another.data())
-           && (m_enmUpdatePeriod == another.updatePeriod())
-           && (m_date == another.internalDate())
-           && (m_enmUpdateChannel == another.updateChannel())
-           && (m_version == another.version())
-              ;
-}
-
-bool VBoxUpdateData::operator==(const VBoxUpdateData &another) const
-{
-    return isEqual(another);
-}
-
-bool VBoxUpdateData::operator!=(const VBoxUpdateData &another) const
-{
-    return !isEqual(another);
-}
-
-/* static */
-QString VBoxUpdateData::updateChannelToInternalString(KUpdateChannel enmUpdateChannel)
-{
-    switch (enmUpdateChannel)
-    {
-        case KUpdateChannel_WithTesting: return "withtesting";
-        case KUpdateChannel_WithBetas: return "withbetas";
-        case KUpdateChannel_All: return "allrelease";
-        default: return "stable";
-    }
-}
-
-/* static */
-KUpdateChannel VBoxUpdateData::updateChannelFromInternalString(const QString &strUpdateChannel)
-{
-    QMap<QString, KUpdateChannel> pairs;
-    pairs["withtesting"] = KUpdateChannel_WithTesting;
-    pairs["withbetas"] = KUpdateChannel_WithBetas;
-    pairs["allrelease"] = KUpdateChannel_All;
-    return pairs.value(strUpdateChannel, KUpdateChannel_Stable);
-}
-
-void VBoxUpdateData::decode()
-{
     /* Parse standard values: */
     if (m_strData == "never")
@@ -228 +112 @@
 }
 
-void VBoxUpdateData::encode()
+VBoxUpdateData::VBoxUpdateData(UpdatePeriodType enmUpdatePeriod, KUpdateChannel enmUpdateChannel)
+    : m_strData(QString())
+    , m_enmUpdatePeriod(enmUpdatePeriod)
+    , m_enmUpdateChannel(enmUpdateChannel)
 {
     /* Encode standard values: */
@@ -263 +150 @@
 }
 
+bool VBoxUpdateData::isNoNeedToCheck() const
+{
+    /* No need to check if Period == Never: */
+    return m_enmUpdatePeriod == UpdatePeriodType_Never;
+}
+
+bool VBoxUpdateData::isNeedToCheck() const
+{
+    /* Return 'false' if there is no need to check: */
+    if (isNoNeedToCheck())
+        return false;
+
+    /* Return 'true' if date of next check is today or missed: */
+    if (QDate::currentDate() >= m_date)
+        return true;
+
+    /* Return 'true' if saved version value is NOT valid or NOT equal to current: */
+    if (!version().isValid() || version() != UIVersion(uiCommon().vboxVersionStringNormalized()))
+        return true;
+
+    /* Return 'false' in all other cases: */
+    return false;
+}
+
+QString VBoxUpdateData::data() const
+{
+    return m_strData;
+}
+
+UpdatePeriodType VBoxUpdateData::updatePeriod() const
+{
+    return m_enmUpdatePeriod;
+}
+
+QDate VBoxUpdateData::date() const
+{
+    return m_date;
+}
+
+QString VBoxUpdateData::dateToString() const
+{
+    return isNoNeedToCheck() ? QCoreApplication::translate("UIUpdateManager", "Never")
+                             : QLocale::system().toString(m_date, QLocale::ShortFormat);
+}
+
+KUpdateChannel VBoxUpdateData::updateChannel() const
+{
+    return m_enmUpdateChannel;
+}
+
+QString VBoxUpdateData::updateChannelName() const
+{
+    return updateChannelToInternalString(m_enmUpdateChannel);
+}
+
+UIVersion VBoxUpdateData::version() const
+{
+    return m_version;
+}
+
+bool VBoxUpdateData::isEqual(const VBoxUpdateData &another) const
+{
+    return    true
+           && (m_strData == another.data())
+           && (m_enmUpdatePeriod == another.updatePeriod())
+           && (m_date == another.date())
+           && (m_enmUpdateChannel == another.updateChannel())
+           && (m_version == another.version())
+              ;
+}
+
+bool VBoxUpdateData::operator==(const VBoxUpdateData &another) const
+{
+    return isEqual(another);
+}
+
+bool VBoxUpdateData::operator!=(const VBoxUpdateData &another) const
+{
+    return !isEqual(another);
+}
+
+/* static */
+QString VBoxUpdateData::updateChannelToInternalString(KUpdateChannel enmUpdateChannel)
+{
+    switch (enmUpdateChannel)
+    {
+        case KUpdateChannel_WithTesting: return "withtesting";
+        case KUpdateChannel_WithBetas: return "withbetas";
+        case KUpdateChannel_All: return "allrelease";
+        default: return "stable";
+    }
+}
+
+/* static */
+KUpdateChannel VBoxUpdateData::updateChannelFromInternalString(const QString &strUpdateChannel)
+{
+    QMap<QString, KUpdateChannel> pairs;
+    pairs["withtesting"] = KUpdateChannel_WithTesting;
+    pairs["withbetas"] = KUpdateChannel_WithBetas;
+    pairs["allrelease"] = KUpdateChannel_All;
+    return pairs.value(strUpdateChannel, KUpdateChannel_Stable);
+}

trunk/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateDefs.h

@@ -96 +96 @@
     UpdatePeriodType updatePeriod() const;
     /** Returns update date. */
-    QString date() const;
-    /** Returns internal update date. */
-    QDate internalDate() const;
+    QDate date() const;
+    /** Returns update date as string. */
+    QString dateToString() const;
     /** Returns update channel. */
     KUpdateChannel updateChannel() const;
@@ -124 +124 @@
 private:
 
-    /** Decodes data. */
-    void decode();
-    /** Encodes data. */
-    void encode();
-
     /** Holds the populated list of update period options. */
-    static VBoxUpdateDayList  s_days;
+    static VBoxUpdateDayList s_days;
 
     /** Holds the update data. */
-    QString           m_strData;
+    QString  m_strData;
     /** Holds the update period. */
-    UpdatePeriodType  m_enmUpdatePeriod;
+    UpdatePeriodType      m_enmUpdatePeriod;
     /** Holds the update date. */
-    QDate             m_date;
+    QDate           m_date;
     /** Holds the update channel. */
-    KUpdateChannel    m_enmUpdateChannel;
+    KUpdateChannel  m_enmUpdateChannel;
     /** Holds the update version. */
-    UIVersion         m_version;
+    UIVersion       m_version;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.cpp

@@ -141 +141 @@
 {
     if (m_pFieldUpdateDate)
-        m_pFieldUpdateDate->setText(VBoxUpdateData(updatePeriod(), updateChannel()).date());
+        m_pFieldUpdateDate->setText(VBoxUpdateData(updatePeriod(), updateChannel()).dateToString());
 }