Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2012-2016 Oracle Corporation
+ * Copyright (C) 2012-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27,5 +27,4 @@
 
 
-/* Display page constructor: */
 UIGlobalSettingsDisplay::UIGlobalSettingsDisplay()
 {
@@ -49,6 +48,4 @@
 }
 
-/* Load data to cache from corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsDisplay::loadToCacheFrom(QVariant &data)
 {
@@ -64,6 +61,4 @@
 }
 
-/* Load data to corresponding widgets from cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsDisplay::getFromCache()
 {
@@ -91,10 +86,7 @@
         m_pResolutionHeightSpin->setValue(iHeight);
     }
-    /* Set state for corresponding check-box: */
     m_pCheckBoxActivateOnMouseHover->setChecked(m_cache.m_fActivateHoveredMachineWindow);
 }
 
-/* Save data from corresponding widgets to cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsDisplay::putToCache()
 {
@@ -117,10 +109,7 @@
         m_cache.m_strMaxGuestResolution = QString("%1,%2").arg(m_pResolutionWidthSpin->value()).arg(m_pResolutionHeightSpin->value());
     }
-    /* Acquire state from corresponding check-box: */
     m_cache.m_fActivateHoveredMachineWindow = m_pCheckBoxActivateOnMouseHover->isChecked();
 }
 
-/* Save data from cache to corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsDisplay::saveFromCacheTo(QVariant &data)
 {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2012-2016 Oracle Corporation
+ * Copyright (C) 2012-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,19 +16,23 @@
  */
 
-#ifndef __UIGlobalSettingsDisplay_h__
-#define __UIGlobalSettingsDisplay_h__
+#ifndef ___UIGlobalSettingsDisplay_h___
+#define ___UIGlobalSettingsDisplay_h___
 
-/* Local includes: */
+/* GUI includes: */
 #include "UISettingsPage.h"
 #include "UIGlobalSettingsDisplay.gen.h"
 
-/* Global settings / Display page / Cache: */
+
+/** Global settings: Display page cache structure. */
 struct UISettingsCacheGlobalDisplay
 {
+    /** Holds the maximum guest resolution or preset name. */
     QString m_strMaxGuestResolution;
+    /** Holds whether we should automatically activate machine window under the mouse cursor. */
     bool m_fActivateHoveredMachineWindow;
 };
 
-/* Global settings / Display page: */
+
+/** Global settings: Display page. */
 class UIGlobalSettingsDisplay : public UISettingsPageGlobal, public Ui::UIGlobalSettingsDisplay
 {
@@ -76,4 +80,4 @@
 };
 
-#endif // __UIGlobalSettingsDisplay_h__
+#endif /* !___UIGlobalSettingsDisplay_h___ */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2010-2016 Oracle Corporation
+ * Copyright (C) 2010-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -63,5 +63,5 @@
         if (m_data.m_strVersion.contains(QRegExp("[-_]")))
             strAppend = m_data.m_strVersion.section(QRegExp("[-_]"), 1, -1, QString::SectionIncludeLeadingSep);
-        setText(2, QString("%1r%2%3").arg(strVersion).arg(m_data.m_strRevision).arg(strAppend));
+        setText(2, QString("%1r%2%3").arg(strVersion).arg(m_data.m_uRevision).arg(strAppend));
 
         /* Tool-tip: */
@@ -97,5 +97,5 @@
 };
 
-/* Extension page constructor: */
+
 UIGlobalSettingsExtension::UIGlobalSettingsExtension()
     : m_pActionAdd(0), m_pActionRemove(0)
@@ -237,6 +237,4 @@
 }
 
-/* Load data to cache from corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsExtension::loadToCacheFrom(QVariant &data)
 {
@@ -254,6 +252,4 @@
 }
 
-/* Load data to corresponding widgets from cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsExtension::getFromCache()
 {
@@ -268,13 +264,9 @@
 }
 
-/* Save data from corresponding widgets to cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsExtension::putToCache()
 {
-    /* Nothing to put to cache... */
-}
-
-/* Save data from cache to corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
+    /* Nothing to upload to cache... */
+}
+
 void UIGlobalSettingsExtension::saveFromCacheTo(QVariant &data)
 {
@@ -467,5 +459,5 @@
     item.m_strDescription = package.GetDescription();
     item.m_strVersion = package.GetVersion();
-    item.m_strRevision = package.GetRevision();
+    item.m_uRevision = package.GetRevision();
     item.m_fIsUsable = package.GetUsable();
     if (!item.m_fIsUsable)
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2010-2016 Oracle Corporation
+ * Copyright (C) 2010-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,29 +16,39 @@
  */
 
-#ifndef __UIGlobalSettingsExtension_h__
-#define __UIGlobalSettingsExtension_h__
+#ifndef ___UIGlobalSettingsExtension_h___
+#define ___UIGlobalSettingsExtension_h___
 
-/* Local includes */
+/* GUI includes: */
 #include "UISettingsPage.h"
 #include "UIGlobalSettingsExtension.gen.h"
 
-/* Global settings / Extension page / Cache Item: */
+
+/** Global settings: Extension page item cache structure. */
 struct UISettingsCacheGlobalExtensionItem
 {
+    /** Holds the extension item name. */
     QString m_strName;
+    /** Holds the extension item description. */
     QString m_strDescription;
+    /** Holds the extension item version. */
     QString m_strVersion;
-    ULONG m_strRevision;
+    /** Holds the extension item revision. */
+    ULONG m_uRevision;
+    /** Holds whether the extension item usable. */
     bool m_fIsUsable;
+    /** Holds why the extension item is unusable. */
     QString m_strWhyUnusable;
 };
 
-/* Global settings / Extension page / Cache: */
+
+/** Global settings: Extension page cache structure. */
 struct UISettingsCacheGlobalExtension
 {
+    /** Holds the extension items. */
     QList<UISettingsCacheGlobalExtensionItem> m_items;
 };
 
-/* Global settings / Extension page: */
+
+/** Global settings: Extension page. */
 class UIGlobalSettingsExtension : public UISettingsPageGlobal, public Ui::UIGlobalSettingsExtension
 {
@@ -97,4 +107,4 @@
 };
 
-#endif // __UIGlobalSettingsExtension_h__
+#endif /* !___UIGlobalSettingsExtension_h___ */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -48,6 +48,4 @@
 }
 
-/* Load data to cache from corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsGeneral::loadToCacheFrom(QVariant &data)
 {
@@ -64,6 +62,4 @@
 }
 
-/* Load data to corresponding widgets from cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsGeneral::getFromCache()
 {
@@ -74,6 +70,4 @@
 }
 
-/* Save data from corresponding widgets to cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsGeneral::putToCache()
 {
@@ -84,6 +78,4 @@
 }
 
-/* Save data from cache to corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsGeneral::saveFromCacheTo(QVariant &data)
 {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,20 +16,25 @@
  */
 
-#ifndef __UIGlobalSettingsGeneral_h__
-#define __UIGlobalSettingsGeneral_h__
+#ifndef ___UIGlobalSettingsGeneral_h___
+#define ___UIGlobalSettingsGeneral_h___
 
-/* Local includes */
+/* GUI includes: */
 #include "UISettingsPage.h"
 #include "UIGlobalSettingsGeneral.gen.h"
 
-/* Global settings / General page / Cache: */
+
+/** Global settings: General page cache structure. */
 struct UISettingsCacheGlobalGeneral
 {
+    /** Holds the default machine folder path. */
     QString m_strDefaultMachineFolder;
+    /** Holds the VRDE authentication library name. */
     QString m_strVRDEAuthLibrary;
+    /** Holds whether host screen-saver should be disabled. */
     bool m_fHostScreenSaverDisabled;
 };
 
-/* Global settings / General page: */
+
+/** Global settings: General page. */
 class UIGlobalSettingsGeneral : public UISettingsPageGlobal, public Ui::UIGlobalSettingsGeneral
 {
@@ -69,3 +74,4 @@
 };
 
-#endif // __UIGlobalSettingsGeneral_h__
+#endif /* !___UIGlobalSettingsGeneral_h___ */
+
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30,4 +30,5 @@
 # include "QIStyledItemDelegate.h"
 # include "QITableView.h"
+# include "UIActionPool.h"
 # include "UIGlobalSettingsInput.h"
 # include "UIShortcutPool.h"
@@ -53,5 +54,5 @@
 
 
-/** Global settings / Input page / Shortcut table cell. */
+/** Global settings: Input page: Shortcut cell cache structure. */
 class UIShortcutCacheCell : public QITableViewCell
 {
@@ -78,5 +79,5 @@
 
 
-/** Global settings / Input page / Shortcut table row. */
+/** Global settings: Input page: Shortcut cache structure. */
 class UIShortcutCacheRow : public QITableViewRow
 {
@@ -214,11 +215,8 @@
     QPair<UIShortcutCacheCell*, UIShortcutCacheCell*> m_cells;
 };
-
-
-/** Global settings / Input page / Cache / Shortcut cache. */
 typedef QList<UIShortcutCacheRow> UIShortcutCache;
 
 
-/** Global settings / Input page / Cache. */
+/** Global settings: Input page cache structure. */
 class UISettingsCacheGlobalInput : public QObject
 {
@@ -251,5 +249,5 @@
 
 
-/** Global settings / Input page / Cache / Shortcut cache item sort functor. */
+/** Global settings: Input page: Shortcut cache sort functor. */
 class UIShortcutCacheItemFunctor
 {
@@ -869,6 +867,4 @@
 }
 
-/* Load data to cache from corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsInput::loadToCacheFrom(QVariant &data)
 {
@@ -876,7 +872,6 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Load host-combo shortcut to cache: */
+    /* Load to cache: */
     m_pCache->shortcuts() << UIShortcutCacheRow(m_pMachineTable, UIHostCombo::hostComboCacheKey(), tr("Host Key Combination"),  m_settings.hostCombo(), QString());
-    /* Load all other shortcuts to cache: */
     const QMap<QString, UIShortcut>& shortcuts = gShortcutPool->shortcuts();
     const QList<QString> shortcutKeys = shortcuts.keys();
@@ -891,5 +886,4 @@
                                                     shortcut.defaultSequence().toString(QKeySequence::NativeText));
     }
-    /* Load other things to cache: */
     m_pCache->setAutoCapture(m_settings.autoCapture());
 
@@ -898,6 +892,4 @@
 }
 
-/* Load data to corresponding widgets from cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsInput::getFromCache()
 {
@@ -911,6 +903,4 @@
 }
 
-/* Save data from corresponding widgets to cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsInput::putToCache()
 {
@@ -921,6 +911,4 @@
 }
 
-/* Save data from cache to corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsInput::saveFromCacheTo(QVariant &data)
 {
@@ -928,16 +916,13 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Save host-combo shortcut from cache: */
+    /* Save from cache: */
     UIShortcutCacheRow fakeHostComboItem(0, UIHostCombo::hostComboCacheKey(), QString(), QString(), QString());
     int iIndexOfHostComboItem = m_pCache->shortcuts().indexOf(fakeHostComboItem);
     if (iIndexOfHostComboItem != -1)
         m_settings.setHostCombo(m_pCache->shortcuts()[iIndexOfHostComboItem].currentSequence());
-    /* Iterate over cached shortcuts: */
     QMap<QString, QString> sequences;
     foreach (const UIShortcutCacheRow &item, m_pCache->shortcuts())
         sequences.insert(item.key(), item.currentSequence());
-    /* Save shortcut sequences from cache: */
     gShortcutPool->setOverrides(sequences);
-    /* Save other things from cache: */
     m_settings.setAutoCapture(m_pCache->autoCapture());
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,14 +16,10 @@
  */
 
-#ifndef __UIGlobalSettingsInput_h__
-#define __UIGlobalSettingsInput_h__
-
-/* Qt includes: */
-#include <QAbstractTableModel>
+#ifndef ___UIGlobalSettingsInput_h___
+#define ___UIGlobalSettingsInput_h___
 
 /* GUI includes: */
 #include "UISettingsPage.h"
 #include "UIGlobalSettingsInput.gen.h"
-#include "UIActionPool.h"
 
 /* Forward declartions: */
@@ -35,5 +31,5 @@
 
 
-/* Global settings / Input page: */
+/** Global settings: Input page. */
 class UIGlobalSettingsInput : public UISettingsPageGlobal, public Ui::UIGlobalSettingsInput
 {
@@ -94,4 +90,4 @@
 };
 
-#endif // __UIGlobalSettingsInput_h__
+#endif /* !___UIGlobalSettingsInput_h___ */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -46,4 +46,5 @@
 extern const char *gVBoxLangIDRegExp;
 extern const char *gVBoxBuiltInLangName;
+
 
 /* Language item: */
@@ -176,4 +177,5 @@
 };
 
+
 /* Language page constructor: */
 UIGlobalSettingsLanguage::UIGlobalSettingsLanguage()
@@ -203,6 +205,4 @@
 }
 
-/* Load data to cache from corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsLanguage::loadToCacheFrom(QVariant &data)
 {
@@ -217,6 +217,4 @@
 }
 
-/* Load data to corresponding widgets from cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsLanguage::getFromCache()
 {
@@ -225,6 +223,4 @@
 }
 
-/* Save data from corresponding widgets to cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsLanguage::putToCache()
 {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.h	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.h	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,6 +16,6 @@
  */
 
-#ifndef __UIGlobalSettingsLanguage_h__
-#define __UIGlobalSettingsLanguage_h__
+#ifndef ___UIGlobalSettingsLanguage_h___
+#define ___UIGlobalSettingsLanguage_h___
 
 /* GUI includes: */
@@ -23,11 +23,14 @@
 #include "UIGlobalSettingsLanguage.gen.h"
 
-/* Global settings / Language page / Cache: */
+
+/** Global settings: Language page cache structure. */
 struct UISettingsCacheGlobalLanguage
 {
+    /** Holds the current language id. */
     QString m_strLanguageId;
 };
 
-/* Global settings / Language page: */
+
+/** Global settings: Language page. */
 class UIGlobalSettingsLanguage : public UISettingsPageGlobal, public Ui::UIGlobalSettingsLanguage
 {
@@ -86,3 +89,4 @@
 };
 
-#endif // __UIGlobalSettingsLanguage_h__
+#endif /* !___UIGlobalSettingsLanguage_h___ */
+
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2009-2016 Oracle Corporation
+ * Copyright (C) 2009-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -41,6 +41,6 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+/* COM includes: */
 #include "CDHCPServer.h"
-
 
 
@@ -517,11 +517,9 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Load NAT networks to cache: */
+    /* Load to cache: */
     m_cache.m_networksNAT.clear();
     const CNATNetworkVector &networks = vboxGlobal().virtualBox().GetNATNetworks();
     foreach (const CNATNetwork &network, networks)
         m_cache.m_networksNAT << generateDataNetworkNAT(network);
-
-    /* Load Host networks to cache: */
     m_cache.m_networksHost.clear();
     const CHostNetworkInterfaceVector &interfaces = vboxGlobal().host().GetNetworkInterfaces();
@@ -536,5 +534,5 @@
 void UIGlobalSettingsNetwork::getFromCache()
 {
-    /* Fetch NAT networks from cache: */
+    /* Fetch from cache: */
     foreach (const UIDataSettingsGlobalNetworkNAT &network, m_cache.m_networksNAT)
         createTreeItemNetworkNAT(network);
@@ -542,6 +540,4 @@
     m_pTreeNetworkNAT->setCurrentItem(m_pTreeNetworkNAT->topLevelItem(0));
     sltHandleCurrentItemChangeNetworkNAT();
-
-    /* Fetch Host networks from cache: */
     foreach (const UIDataSettingsGlobalNetworkHost &network, m_cache.m_networksHost)
         createTreeItemNetworkHost(network);
@@ -556,5 +552,5 @@
 void UIGlobalSettingsNetwork::putToCache()
 {
-    /* Upload NAT networks to cache: */
+    /* Upload to cache: */
     m_cache.m_networksNAT.clear();
     for (int iNetworkIndex = 0; iNetworkIndex < m_pTreeNetworkNAT->topLevelItemCount(); ++iNetworkIndex)
@@ -565,6 +561,4 @@
         m_cache.m_networksNAT << data;
     }
-
-    /* Upload Host networks to cache: */
     m_cache.m_networksHost.clear();
     for (int iNetworkIndex = 0; iNetworkIndex < m_pTreeNetworkHost->topLevelItemCount(); ++iNetworkIndex)
@@ -586,9 +580,7 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Save NAT networks from cache: */
+    /* Save from cache: */
     foreach (const UIDataSettingsGlobalNetworkNAT &data, m_cache.m_networksNAT)
         saveCacheItemNetworkNAT(data);
-
-    /* Save Host networks from cache: */
     foreach (const UIDataSettingsGlobalNetworkHost &data, m_cache.m_networksHost)
         saveCacheItemNetworkHost(data);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h	(revision 65678)
@@ -1,3 +1,3 @@
-/* $Id: $ */
+/* $Id$ */
 /** @file
  * VBox Qt GUI - UIGlobalSettingsNetwork class declaration.
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2009-2016 Oracle Corporation
+ * Copyright (C) 2009-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,6 +16,6 @@
  */
 
-#ifndef __UIGlobalSettingsNetwork_h__
-#define __UIGlobalSettingsNetwork_h__
+#ifndef ___UIGlobalSettingsNetwork_h___
+#define ___UIGlobalSettingsNetwork_h___
 
 /* GUI includes: */
@@ -29,96 +29,136 @@
 
 
-/* Global settings / Network page / NAT network data: */
+/** Global settings: Network page: NAT network cache structure. */
 struct UIDataSettingsGlobalNetworkNAT
 {
-    /* NAT Network: */
+    /** Holds whether this network enabled. */
     bool m_fEnabled;
+    /** Holds network name. */
     QString m_strName;
+    /** Holds new network name. */
     QString m_strNewName;
+    /** Holds network CIDR. */
     QString m_strCIDR;
+    /** Holds whether this network supports DHCP. */
     bool m_fSupportsDHCP;
+    /** Holds whether this network supports IPv6. */
     bool m_fSupportsIPv6;
+    /** Holds whether this network advertised as default IPv6 route. */
     bool m_fAdvertiseDefaultIPv6Route;
+    /** Holds IPv4 port forwarding rules. */
     UIPortForwardingDataList m_ipv4rules;
+    /** Holds IPv6 port forwarding rules. */
     UIPortForwardingDataList m_ipv6rules;
+
+    /** Returns whether the @a other passed data is equal to this one. */
     bool operator==(const UIDataSettingsGlobalNetworkNAT &other) const
     {
-        return m_fEnabled == other.m_fEnabled &&
-               m_strName == other.m_strName &&
-               m_strNewName == other.m_strNewName &&
-               m_strCIDR == other.m_strCIDR &&
-               m_fSupportsDHCP == other.m_fSupportsDHCP &&
-               m_fSupportsIPv6 == other.m_fSupportsIPv6 &&
-               m_fAdvertiseDefaultIPv6Route == other.m_fAdvertiseDefaultIPv6Route &&
-               m_ipv4rules == other.m_ipv4rules &&
-               m_ipv6rules == other.m_ipv6rules;
-    }
-};
-
-
-/* Global settings / Network page / Host interface data: */
+        return true
+               && (m_fEnabled == other.m_fEnabled)
+               && (m_strName == other.m_strName)
+               && (m_strNewName == other.m_strNewName)
+               && (m_strCIDR == other.m_strCIDR)
+               && (m_fSupportsDHCP == other.m_fSupportsDHCP)
+               && (m_fSupportsIPv6 == other.m_fSupportsIPv6)
+               && (m_fAdvertiseDefaultIPv6Route == other.m_fAdvertiseDefaultIPv6Route)
+               && (m_ipv4rules == other.m_ipv4rules)
+               && (m_ipv6rules == other.m_ipv6rules)
+               ;
+    }
+};
+
+
+/** Global settings: Network page: Host interface cache structure. */
 struct UIDataSettingsGlobalNetworkHostInterface
 {
-    /* Host Interface: */
+    /** Holds host interface name. */
     QString m_strName;
+    /** Holds whether DHCP client enabled. */
     bool m_fDhcpClientEnabled;
+    /** Holds IPv4 interface address. */
     QString m_strInterfaceAddress;
+    /** Holds IPv4 interface mask. */
     QString m_strInterfaceMask;
+    /** Holds whether IPv6 protocol supported. */
     bool m_fIpv6Supported;
+    /** Holds IPv6 interface address. */
     QString m_strInterfaceAddress6;
+    /** Holds IPv6 interface mask length. */
     QString m_strInterfaceMaskLength6;
+
+    /** Returns whether the @a other passed data is equal to this one. */
     bool operator==(const UIDataSettingsGlobalNetworkHostInterface &other) const
     {
-        return m_strName == other.m_strName &&
-               m_fDhcpClientEnabled == other.m_fDhcpClientEnabled &&
-               m_strInterfaceAddress == other.m_strInterfaceAddress &&
-               m_strInterfaceMask == other.m_strInterfaceMask &&
-               m_fIpv6Supported == other.m_fIpv6Supported &&
-               m_strInterfaceAddress6 == other.m_strInterfaceAddress6 &&
-               m_strInterfaceMaskLength6 == other.m_strInterfaceMaskLength6;
-    }
-};
-
-/* Global settings / Network page / Host DHCP server data: */
+        return true
+               && (m_strName == other.m_strName)
+               && (m_fDhcpClientEnabled == other.m_fDhcpClientEnabled)
+               && (m_strInterfaceAddress == other.m_strInterfaceAddress)
+               && (m_strInterfaceMask == other.m_strInterfaceMask)
+               && (m_fIpv6Supported == other.m_fIpv6Supported)
+               && (m_strInterfaceAddress6 == other.m_strInterfaceAddress6)
+               && (m_strInterfaceMaskLength6 == other.m_strInterfaceMaskLength6)
+               ;
+    }
+};
+
+
+/** Global settings: Network page: DHCP server cache structure. */
 struct UIDataSettingsGlobalNetworkDHCPServer
 {
-    /* DHCP Server: */
+    /** Holds whether DHCP server enabled. */
     bool m_fDhcpServerEnabled;
+    /** Holds DHCP server address. */
     QString m_strDhcpServerAddress;
+    /** Holds DHCP server mask. */
     QString m_strDhcpServerMask;
+    /** Holds DHCP server lower address. */
     QString m_strDhcpLowerAddress;
+    /** Holds DHCP server upper address. */
     QString m_strDhcpUpperAddress;
+
+    /** Returns whether the @a other passed data is equal to this one. */
     bool operator==(const UIDataSettingsGlobalNetworkDHCPServer &other) const
     {
-        return m_fDhcpServerEnabled == other.m_fDhcpServerEnabled &&
-               m_strDhcpServerAddress == other.m_strDhcpServerAddress &&
-               m_strDhcpServerMask == other.m_strDhcpServerMask &&
-               m_strDhcpLowerAddress == other.m_strDhcpLowerAddress &&
-               m_strDhcpUpperAddress == other.m_strDhcpUpperAddress;
-    }
-};
-
-/* Global settings / Network page / Host network data: */
+        return true
+               && (m_fDhcpServerEnabled == other.m_fDhcpServerEnabled)
+               && (m_strDhcpServerAddress == other.m_strDhcpServerAddress)
+               && (m_strDhcpServerMask == other.m_strDhcpServerMask)
+               && (m_strDhcpLowerAddress == other.m_strDhcpLowerAddress)
+               && (m_strDhcpUpperAddress == other.m_strDhcpUpperAddress)
+               ;
+    }
+};
+
+
+/** Global settings: Network page: Host network cache structure. */
 struct UIDataSettingsGlobalNetworkHost
 {
+    /** Holds the host interface data. */
     UIDataSettingsGlobalNetworkHostInterface m_interface;
+    /** Holds the DHCP server data. */
     UIDataSettingsGlobalNetworkDHCPServer m_dhcpserver;
+
+    /** Returns whether the @a other passed data is equal to this one. */
     bool operator==(const UIDataSettingsGlobalNetworkHost &other) const
     {
-        return m_interface == other.m_interface &&
-               m_dhcpserver == other.m_dhcpserver;
-    }
-};
-
-
-/* Global settings / Network page / Global network cache: */
+        return true
+               && (m_interface == other.m_interface)
+               && (m_dhcpserver == other.m_dhcpserver)
+               ;
+    }
+};
+
+
+/** Global settings: Network page cache structure. */
 struct UISettingsCacheGlobalNetwork
 {
+    /** Holds the NAT network data. */
     QList<UIDataSettingsGlobalNetworkNAT> m_networksNAT;
+    /** Holds the host network data. */
     QList<UIDataSettingsGlobalNetworkHost> m_networksHost;
 };
 
 
-/* Global settings / Network page: */
+/** Global settings: Network page. */
 class UIGlobalSettingsNetwork : public UISettingsPageGlobal, public Ui::UIGlobalSettingsNetwork
 {
@@ -211,3 +251,4 @@
 };
 
-#endif // __UIGlobalSettingsNetwork_h__
+#endif /* !___UIGlobalSettingsNetwork_h___ */
+
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2011-2016 Oracle Corporation
+ * Copyright (C) 2011-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20,8 +20,8 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Global includes */
+/* Qt includes: */
 # include <QRegExpValidator>
 
-/* Local includes */
+/* GUI includes: */
 # include "QIWidgetValidator.h"
 # include "UIGlobalSettingsProxy.h"
@@ -31,5 +31,4 @@
 
 
-/* General page constructor: */
 UIGlobalSettingsProxy::UIGlobalSettingsProxy()
 {
@@ -55,6 +54,4 @@
 }
 
-/* Load data to cache from corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsProxy::loadToCacheFrom(QVariant &data)
 {
@@ -72,6 +69,4 @@
 }
 
-/* Load data to corresponding widgets from cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsProxy::getFromCache()
 {
@@ -91,6 +86,4 @@
 }
 
-/* Save data from corresponding widgets to cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsProxy::putToCache()
 {
@@ -103,6 +96,4 @@
 }
 
-/* Save data from cache to corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsProxy::saveFromCacheTo(QVariant &data)
 {
@@ -110,4 +101,5 @@
     UISettingsPageGlobal::fetchData(data);
 
+    /* Save from cache: */
     UIProxyManager proxyManager;
     proxyManager.setProxyState(m_cache.m_enmProxyState);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.h	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.h	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2011-2016 Oracle Corporation
+ * Copyright (C) 2011-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,24 +16,33 @@
  */
 
-#ifndef __UIGlobalSettingsProxy_h__
-#define __UIGlobalSettingsProxy_h__
+#ifndef ___UIGlobalSettingsProxy_h___
+#define ___UIGlobalSettingsProxy_h___
 
-/* Local includes */
-#include "VBoxUtils.h"
+/* GUI includes: */
 #include "UISettingsPage.h"
 #include "UIGlobalSettingsProxy.gen.h"
+#include "VBoxUtils.h"
 
-/* Global settings / Proxy page / Cache: */
+
+/** Global settings: Proxy page cache structure. */
 struct UISettingsCacheGlobalProxy
 {
+    /** Constructs data. */
     UISettingsCacheGlobalProxy()
         : m_enmProxyState(UIProxyManager::ProxyState_Auto)
+        , m_strProxyHost(QString())
+        , m_strProxyPort(QString())
     {}
+
+    /** Holds the proxy state. */
     UIProxyManager::ProxyState m_enmProxyState;
+    /** Holds the proxy host. */
     QString m_strProxyHost;
+    /** Holds the proxy port. */
     QString m_strProxyPort;
 };
 
-/* Global settings / Proxy page: */
+
+/** Global settings: Proxy page. */
 class UIGlobalSettingsProxy : public UISettingsPageGlobal, public Ui::UIGlobalSettingsProxy
 {
@@ -81,4 +90,4 @@
 };
 
-#endif // __UIGlobalSettingsProxy_h__
+#endif /* !___UIGlobalSettingsProxy_h___ */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -46,6 +46,4 @@
 }
 
-/* Load data to cache from corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsUpdate::loadToCacheFrom(QVariant &data)
 {
@@ -53,5 +51,5 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Fill internal variables with corresponding values: */
+    /* Load to cache: */
     VBoxUpdateData updateData(gEDataManager->applicationUpdateData());
     m_cache.m_fCheckEnabled = !updateData.isNoNeedToCheck();
@@ -64,9 +62,7 @@
 }
 
-/* Load data to corresponding widgets from cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsUpdate::getFromCache()
 {
-    /* Apply internal variables data to QWidget(s): */
+    /* Fetch from cache: */
     m_pCheckBoxUpdate->setChecked(m_cache.m_fCheckEnabled);
     if (m_pCheckBoxUpdate->isChecked())
@@ -87,15 +83,11 @@
 }
 
-/* Save data from corresponding widgets to cache,
- * this task SHOULD be performed in GUI thread only: */
 void UIGlobalSettingsUpdate::putToCache()
 {
-    /* Gather internal variables data from QWidget(s): */
+    /* Upload to cache: */
     m_cache.m_periodIndex = periodType();
     m_cache.m_branchIndex = branchType();
 }
 
-/* Save data from cache to corresponding external object(s),
- * this task COULD be performed in other than GUI thread: */
 void UIGlobalSettingsUpdate::saveFromCacheTo(QVariant &data)
 {
@@ -107,5 +99,5 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Gather corresponding values from internal variables: */
+    /* Save from cache: */
     VBoxUpdateData newData(m_cache.m_periodIndex, m_cache.m_branchIndex);
     gEDataManager->setApplicationUpdateData(newData.data());
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h	(revision 65677)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h	(revision 65678)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,6 +16,6 @@
  */
 
-#ifndef __UIGlobalSettingsUpdate_h__
-#define __UIGlobalSettingsUpdate_h__
+#ifndef ___UIGlobalSettingsUpdate_h___
+#define ___UIGlobalSettingsUpdate_h___
 
 /* GUI includes: */
@@ -24,14 +24,20 @@
 #include "UIUpdateDefs.h"
 
-/* Global settings / Update page / Cache: */
+
+/** Global settings: Update page cache structure. */
 struct UISettingsCacheGlobalUpdate
 {
+    /** Holds whether the update check is enabled. */
     bool m_fCheckEnabled;
+    /** Holds the update check period. */
     VBoxUpdateData::PeriodType m_periodIndex;
+    /** Holds the update branch type. */
     VBoxUpdateData::BranchType m_branchIndex;
+    /** Holds the next update date. */
     QString m_strDate;
 };
 
-/* Global settings / Update page: */
+
+/** Global settings: Update page. */
 class UIGlobalSettingsUpdate : public UISettingsPageGlobal, public Ui::UIGlobalSettingsUpdate
 {
@@ -86,3 +92,4 @@
 };
 
-#endif // __UIGlobalSettingsUpdate_h__
+#endif /* !___UIGlobalSettingsUpdate_h___ */
+
