Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp	(revision 71527)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp	(revision 71528)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20,11 +20,11 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Global includes: */
+/* Qt includes: */
 # include <QCoreApplication>
 # include <QStringList>
 
-/* Local includes: */
+/* GUI includes: */
+# include "VBoxGlobal.h"
 # include "UIUpdateDefs.h"
-# include "VBoxGlobal.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -40,6 +40,7 @@
     m_dayList.clear();
 
-    /* To avoid re-translation complexity
-     * all values will be retranslated separately: */
+    // WORKAROUND:
+    // To avoid re-translation complexity
+    // all values will be retranslated separately.
 
     /* Separately retranslate each day: */
@@ -65,5 +66,5 @@
     QStringList result;
     for (int i = 0; i < m_dayList.size(); ++i)
-        result << m_dayList[i].val;
+        result << m_dayList.at(i).val;
     return result;
 }
@@ -71,14 +72,14 @@
 VBoxUpdateData::VBoxUpdateData(const QString &strData)
     : m_strData(strData)
-    , m_periodIndex(Period1Day)
-    , m_branchIndex(BranchStable)
+    , m_enmPeriodIndex(Period1Day)
+    , m_enmBranchIndex(BranchStable)
 {
     decode();
 }
 
-VBoxUpdateData::VBoxUpdateData(PeriodType periodIndex, BranchType branchIndex)
+VBoxUpdateData::VBoxUpdateData(PeriodType enmPeriodIndex, BranchType enmBranchIndex)
     : m_strData(QString())
-    , m_periodIndex(periodIndex)
-    , m_branchIndex(branchIndex)
+    , m_enmPeriodIndex(enmPeriodIndex)
+    , m_enmBranchIndex(enmBranchIndex)
 {
     encode();
@@ -88,5 +89,5 @@
 {
     /* Return 'false' if Period == Never: */
-    return m_periodIndex == PeriodNever;
+    return m_enmPeriodIndex == PeriodNever;
 }
 
@@ -116,5 +117,5 @@
 VBoxUpdateData::PeriodType VBoxUpdateData::periodIndex() const
 {
-    return m_periodIndex;
+    return m_enmPeriodIndex;
 }
 
@@ -126,10 +127,10 @@
 VBoxUpdateData::BranchType VBoxUpdateData::branchIndex() const
 {
-    return m_branchIndex;
+    return m_enmBranchIndex;
 }
 
 QString VBoxUpdateData::branchName() const
 {
-    switch (m_branchIndex)
+    switch (m_enmBranchIndex)
     {
         case BranchStable:
@@ -152,5 +153,5 @@
     /* Parse standard values: */
     if (m_strData == "never")
-        m_periodIndex = PeriodNever;
+        m_enmPeriodIndex = PeriodNever;
     /* Parse other values: */
     else
@@ -164,5 +165,5 @@
                 populate();
             PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0]));
-            m_periodIndex = index == PeriodUndefined ? Period1Day : index;
+            m_enmPeriodIndex = index == PeriodUndefined ? Period1Day : index;
         }
 
@@ -178,5 +179,5 @@
         {
             QString branch(parser[2]);
-            m_branchIndex = branch == "withbetas" ? BranchWithBetas :
+            m_enmBranchIndex = branch == "withbetas" ? BranchWithBetas :
                             branch == "allrelease" ? BranchAllRelease : BranchStable;
         }
@@ -193,5 +194,5 @@
 {
     /* Encode standard values: */
-    if (m_periodIndex == PeriodNever)
+    if (m_enmPeriodIndex == PeriodNever)
         m_strData = "never";
     /* Encode other values: */
@@ -201,5 +202,5 @@
         if (m_dayList.isEmpty())
             populate();
-        QString remindPeriod = m_dayList[m_periodIndex].key;
+        QString remindPeriod = m_dayList[m_enmPeriodIndex].key;
 
         /* Encode 'date' value: */
@@ -215,6 +216,6 @@
 
         /* Encode 'branch' value: */
-        QString branchValue = m_branchIndex == BranchWithBetas ? "withbetas" :
-                              m_branchIndex == BranchAllRelease ? "allrelease" : "stable";
+        QString branchValue = m_enmBranchIndex == BranchWithBetas ? "withbetas" :
+                              m_enmBranchIndex == BranchAllRelease ? "allrelease" : "stable";
 
         /* Encode 'version' value: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.h	(revision 71527)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.h	(revision 71528)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26,5 +26,5 @@
 
 
-/* This structure is used to store retranslated reminder values. */
+/** Structure to store retranslated reminder values. */
 struct VBoxUpdateDay
 {
@@ -40,10 +40,10 @@
 
 
-/* This class is used to encode/decode update data. */
+/** Class used to encode/decode update data. */
 class VBoxUpdateData
 {
 public:
 
-    /* Period types: */
+    /** Period types. */
     enum PeriodType
     {
@@ -62,5 +62,5 @@
     };
 
-    /* Branch types: */
+    /** Branch types. */
     enum BranchType
     {
@@ -70,36 +70,53 @@
     };
 
-    /* Public static helpers: */
+    /** Populates a set of update options. */
     static void populate();
+    /** Returns a list of update options. */
     static QStringList list();
 
-    /* Constructors: */
+    /** Constructs update description on the basis of passed @a strData. */
     VBoxUpdateData(const QString &strData);
-    VBoxUpdateData(PeriodType periodIndex, BranchType branchIndex);
+    /** Constructs update description on the basis of passed @a enmPeriodIndex and @a enmBranchIndex. */
+    VBoxUpdateData(PeriodType enmPeriodIndex, BranchType enmBranchIndex);
 
-    /* Public helpers: */
+    /** Returns whether there is no need to check. */
     bool isNoNeedToCheck() const;
+    /** Returns whether there is really need to check. */
     bool isNeedToCheck() const;
+    /** Returns update data. */
     QString data() const;
+    /** Returns period index. */
     PeriodType periodIndex() const;
+    /** Returns update date. */
     QString date() const;
+    /** Returns branch index. */
     BranchType branchIndex() const;
+    /** Returns period name. */
     QString branchName() const;
+    /** Returns version. */
     UIVersion version() const;
 
 private:
 
-    /* Private helpers: */
+    /** Decodes data. */
     void decode();
+    /** Encodes data. */
     void encode();
 
-    /* Private variables: */
+    /** Holds the populated list of update options. */
     static VBoxUpdateDayList m_dayList;
-    QString m_strData;
-    PeriodType m_periodIndex;
-    QDate m_date;
-    BranchType m_branchIndex;
-    UIVersion m_version;
+
+    /** Holds the update data. */
+    QString     m_strData;
+    /** Holds the update period index. */
+    PeriodType  m_enmPeriodIndex;
+    /** Holds the update date. */
+    QDate       m_date;
+    /** Holds the update branch index. */
+    BranchType  m_enmBranchIndex;
+    /** Holds the update version. */
+    UIVersion   m_version;
 };
+
 
 #endif /* !___UIUpdateDefs_h___ */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	(revision 71527)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	(revision 71528)
@@ -30,5 +30,4 @@
 # include "QIProcess.h"
 # include "VBoxGlobal.h"
-# include "VBoxLicenseViewer.h"
 # include "VBoxUtils.h"
 # include "UIDownloaderExtensionPack.h"