Changeset 70824 in vbox

Timestamp:

Jan 31, 2018 11:45:40 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120629

Message:

FE/Qt: bugref:9104: Reworking VBoxVersion stuff: Renaming to UIVersion first of all.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIVersion.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxVersion.h ) (5 diffs)
• net/UIUpdateDefs.cpp (modified) (4 diffs)
• net/UIUpdateDefs.h (modified) (4 diffs)
• net/UIUpdateManager.cpp (modified) (1 diff)
• precomp.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVersion.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - VBoxVersion class declaration.
+ * VBox Qt GUI - UIVersion class declaration/implementation.
  */
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef ___VBoxVersion_h___
-#define ___VBoxVersion_h___
+#ifndef ___UIVersion_h___
+#define ___UIVersion_h___
 
 /**
  *  Represents VirtualBox version wrapper
  */
-class VBoxVersion
+class UIVersion
 {
 public:
 
-    VBoxVersion() : m_x(-1), m_y(-1), m_z(-1) {}
+    UIVersion() : m_x(-1), m_y(-1), m_z(-1) {}
 
-    VBoxVersion(const QString &strVersion)
+    UIVersion(const QString &strVersion)
         : m_x(-1), m_y(-1), m_z(-1)
     {
@@ -40 +40 @@
     }
 
-    VBoxVersion& operator=(const VBoxVersion &other) { m_x = other.x(); m_y = other.y(); m_z = other.z(); return *this; }
+    UIVersion& operator=(const UIVersion &other) { m_x = other.x(); m_y = other.y(); m_z = other.z(); return *this; }
 
     bool isValid() const { return m_x != -1 && m_y != -1 && m_z != -1; }
 
-    bool equal(const VBoxVersion &other) const { return (m_x == other.m_x) && (m_y == other.m_y) && (m_z == other.m_z); }
-    bool operator==(const VBoxVersion &other) const { return equal(other); }
-    bool operator!=(const VBoxVersion &other) const { return !equal(other); }
+    bool equal(const UIVersion &other) const { return (m_x == other.m_x) && (m_y == other.m_y) && (m_z == other.m_z); }
+    bool operator==(const UIVersion &other) const { return equal(other); }
+    bool operator!=(const UIVersion &other) const { return !equal(other); }
 
-    bool operator<(const VBoxVersion &other) const
+    bool operator<(const UIVersion &other) const
     {
         return (m_x <  other.m_x) ||
@@ -54 +54 @@
                (m_x == other.m_x && m_y == other.m_y && m_z <  other.m_z);
     }
-    bool operator>(const VBoxVersion &other) const
+    bool operator>(const UIVersion &other) const
     {
         return (m_x >  other.m_x) ||
@@ -77 +77 @@
 };
 
-#endif // !___VBoxVersion_h___
+#endif /* !___UIVersion_h___ */
 

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

@@ -102 +102 @@
 
     /* Return 'true' if saved version value is NOT valid or NOT equal to current: */
-    if (!version().isValid() || version() != VBoxVersion(vboxGlobal().vboxVersionStringNormalized()))
+    if (!version().isValid() || version() != UIVersion(vboxGlobal().vboxVersionStringNormalized()))
         return true;
 
@@ -143 +143 @@
 }
 
-VBoxVersion VBoxUpdateData::version() const
+UIVersion VBoxUpdateData::version() const
 {
     return m_version;
@@ -185 +185 @@
         if (parser.size() > 3)
         {
-            m_version = VBoxVersion(parser[3]);
+            m_version = UIVersion(parser[3]);
         }
     }
@@ -219 +219 @@
 
         /* Encode 'version' value: */
-        QString versionValue = VBoxVersion(vboxGlobal().vboxVersionStringNormalized()).toString();
+        QString versionValue = UIVersion(vboxGlobal().vboxVersionStringNormalized()).toString();
 
         /* Composite m_strData: */

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

@@ -19 +19 @@
 #define ___UIUpdateDefs_h___
 
-/* Global includes: */
+/* Qt includes: */
 #include <QDate>
 
-/* Local includes: */
-#include "VBoxVersion.h"
+/* GUI includes: */
+#include "UIVersion.h"
+
 
 /* This structure is used to store retranslated reminder values. */
@@ -37 +38 @@
 };
 typedef QList<VBoxUpdateDay> VBoxUpdateDayList;
+
 
 /* This class is used to encode/decode update data. */
@@ -84 +86 @@
     BranchType branchIndex() const;
     QString branchName() const;
-    VBoxVersion version() const;
+    UIVersion version() const;
 
 private:
@@ -98 +100 @@
     QDate m_date;
     BranchType m_branchIndex;
-    VBoxVersion m_version;
+    UIVersion m_version;
 };
 
-#endif // !___UIUpdateDefs_h___
+#endif /* !___UIUpdateDefs_h___ */
 

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -368 +368 @@
         QString strVBoxVersion(vboxGlobal().vboxVersionStringNormalized());
         QByteArray abVBoxVersion = strVBoxVersion.toUtf8();
-        VBoxVersion vboxVersion(strVBoxVersion);
+        UIVersion vboxVersion(strVBoxVersion);
 
         /* Get extension pack version: */

trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

@@ -658 +658 @@
          the redefinitions, just prevent the inclusion of the header! */
 #include "VBoxUtils.h"
-#include "VBoxVersion.h"
+#include "UIVersion.h"
 #ifdef VBOX_WS_X11
 # include "VBoxX11Helper.h"