Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp	(revision 65629)
@@ -54,6 +54,6 @@
 
     /* API: Get/return data to/form items: */
-    void fetchNetworkData(const UIDataNetworkNAT &data);
-    void uploadNetworkData(UIDataNetworkNAT &data);
+    void fetchNetworkData(const UIDataSettingsGlobalNetworkNAT &data);
+    void uploadNetworkData(UIDataSettingsGlobalNetworkNAT &data);
 
     /* API: Validation stuff: */
@@ -74,5 +74,5 @@
 
     /* Variable: Network data: */
-    UIDataNetworkNAT m_data;
+    UIDataSettingsGlobalNetworkNAT m_data;
 };
 
@@ -87,6 +87,6 @@
 
     /* API: Get/return data to/form items: */
-    void fetchNetworkData(const UIDataNetworkHost &data);
-    void uploadNetworkData(UIDataNetworkHost &data);
+    void fetchNetworkData(const UIDataSettingsGlobalNetworkHost &data);
+    void uploadNetworkData(UIDataSettingsGlobalNetworkHost &data);
 
     /* API: Validation stuff: */
@@ -102,5 +102,5 @@
 
     /* Variable: Network data: */
-    UIDataNetworkHost m_data;
+    UIDataSettingsGlobalNetworkHost m_data;
 };
 
@@ -111,5 +111,5 @@
 }
 
-void UIItemNetworkNAT::fetchNetworkData(const UIDataNetworkNAT &data)
+void UIItemNetworkNAT::fetchNetworkData(const UIDataSettingsGlobalNetworkNAT &data)
 {
     /* Get from cache: */
@@ -120,5 +120,5 @@
 }
 
-void UIItemNetworkNAT::uploadNetworkData(UIDataNetworkNAT &data)
+void UIItemNetworkNAT::uploadNetworkData(UIDataSettingsGlobalNetworkNAT &data)
 {
     /* Put to cache: */
@@ -233,5 +233,5 @@
 }
 
-void UIItemNetworkHost::fetchNetworkData(const UIDataNetworkHost &data)
+void UIItemNetworkHost::fetchNetworkData(const UIDataSettingsGlobalNetworkHost &data)
 {
     /* Get from cache: */
@@ -242,5 +242,5 @@
 }
 
-void UIItemNetworkHost::uploadNetworkData(UIDataNetworkHost &data)
+void UIItemNetworkHost::uploadNetworkData(UIDataSettingsGlobalNetworkHost &data)
 {
     /* Put to cache: */
@@ -537,5 +537,5 @@
 {
     /* Fetch NAT networks from cache: */
-    foreach (const UIDataNetworkNAT &network, m_cache.m_networksNAT)
+    foreach (const UIDataSettingsGlobalNetworkNAT &network, m_cache.m_networksNAT)
         createTreeItemNetworkNAT(network);
     m_pTreeNetworkNAT->sortByColumn(1, Qt::AscendingOrder);
@@ -544,5 +544,5 @@
 
     /* Fetch Host networks from cache: */
-    foreach (const UIDataNetworkHost &network, m_cache.m_networksHost)
+    foreach (const UIDataSettingsGlobalNetworkHost &network, m_cache.m_networksHost)
         createTreeItemNetworkHost(network);
     m_pTreeNetworkHost->sortByColumn(0, Qt::AscendingOrder);
@@ -560,5 +560,5 @@
     for (int iNetworkIndex = 0; iNetworkIndex < m_pTreeNetworkNAT->topLevelItemCount(); ++iNetworkIndex)
     {
-        UIDataNetworkNAT data;
+        UIDataSettingsGlobalNetworkNAT data;
         UIItemNetworkNAT *pItem = static_cast<UIItemNetworkNAT*>(m_pTreeNetworkNAT->topLevelItem(iNetworkIndex));
         pItem->uploadNetworkData(data);
@@ -570,5 +570,5 @@
     for (int iNetworkIndex = 0; iNetworkIndex < m_pTreeNetworkHost->topLevelItemCount(); ++iNetworkIndex)
     {
-        UIDataNetworkHost data;
+        UIDataSettingsGlobalNetworkHost data;
         UIItemNetworkHost *pItem = static_cast<UIItemNetworkHost*>(m_pTreeNetworkHost->topLevelItem(iNetworkIndex));
         pItem->uploadNetworkData(data);
@@ -587,9 +587,9 @@
 
     /* Save NAT networks from cache: */
-    foreach (const UIDataNetworkNAT &data, m_cache.m_networksNAT)
+    foreach (const UIDataSettingsGlobalNetworkNAT &data, m_cache.m_networksNAT)
         saveCacheItemNetworkNAT(data);
 
     /* Save Host networks from cache: */
-    foreach (const UIDataNetworkHost &data, m_cache.m_networksHost)
+    foreach (const UIDataSettingsGlobalNetworkHost &data, m_cache.m_networksHost)
         saveCacheItemNetworkHost(data);
 
@@ -783,5 +783,5 @@
 
     /* Edit current item data: */
-    UIDataNetworkNAT data;
+    UIDataSettingsGlobalNetworkNAT data;
     pItem->uploadNetworkData(data);
     UIGlobalSettingsNetworkDetailsNAT details(this, data);
@@ -887,5 +887,5 @@
 
     /* Edit current item data: */
-    UIDataNetworkHost data;
+    UIDataSettingsGlobalNetworkHost data;
     pItem->uploadNetworkData(data);
     UIGlobalSettingsNetworkDetailsHost details(this, data);
@@ -953,8 +953,8 @@
 }
 
-UIDataNetworkNAT UIGlobalSettingsNetwork::generateDataNetworkNAT(const CNATNetwork &network)
+UIDataSettingsGlobalNetworkNAT UIGlobalSettingsNetwork::generateDataNetworkNAT(const CNATNetwork &network)
 {
     /* Prepare data: */
-    UIDataNetworkNAT data;
+    UIDataSettingsGlobalNetworkNAT data;
 
     /* Load NAT network settings: */
@@ -1019,5 +1019,5 @@
 }
 
-void UIGlobalSettingsNetwork::saveCacheItemNetworkNAT(const UIDataNetworkNAT &data)
+void UIGlobalSettingsNetwork::saveCacheItemNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data)
 {
     /* Make sure corresponding NAT network exists: */
@@ -1055,5 +1055,5 @@
 }
 
-void UIGlobalSettingsNetwork::createTreeItemNetworkNAT(const UIDataNetworkNAT &data, bool fChooseItem)
+void UIGlobalSettingsNetwork::createTreeItemNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data, bool fChooseItem)
 {
     /* Add new item to the tree: */
@@ -1072,8 +1072,8 @@
 }
 
-UIDataNetworkHost UIGlobalSettingsNetwork::generateDataNetworkHost(const CHostNetworkInterface &iface)
+UIDataSettingsGlobalNetworkHost UIGlobalSettingsNetwork::generateDataNetworkHost(const CHostNetworkInterface &iface)
 {
     /* Prepare data: */
-    UIDataNetworkHost data;
+    UIDataSettingsGlobalNetworkHost data;
 
     /* Get DHCP server (create if necessary): */
@@ -1114,5 +1114,5 @@
 }
 
-void UIGlobalSettingsNetwork::saveCacheItemNetworkHost(const UIDataNetworkHost &data)
+void UIGlobalSettingsNetwork::saveCacheItemNetworkHost(const UIDataSettingsGlobalNetworkHost &data)
 {
     /* Make sure corresponding Host interface exists: */
@@ -1185,5 +1185,5 @@
 }
 
-void UIGlobalSettingsNetwork::createTreeItemNetworkHost(const UIDataNetworkHost &data, bool fChooseItem)
+void UIGlobalSettingsNetwork::createTreeItemNetworkHost(const UIDataSettingsGlobalNetworkHost &data, bool fChooseItem)
 {
     /* Add new item to the tree: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h	(revision 65629)
@@ -30,5 +30,5 @@
 
 /* Global settings / Network page / NAT network data: */
-struct UIDataNetworkNAT
+struct UIDataSettingsGlobalNetworkNAT
 {
     /* NAT Network: */
@@ -42,5 +42,5 @@
     UIPortForwardingDataList m_ipv4rules;
     UIPortForwardingDataList m_ipv6rules;
-    bool operator==(const UIDataNetworkNAT &other) const
+    bool operator==(const UIDataSettingsGlobalNetworkNAT &other) const
     {
         return m_fEnabled == other.m_fEnabled &&
@@ -58,5 +58,5 @@
 
 /* Global settings / Network page / Host interface data: */
-struct UIDataNetworkHostInterface
+struct UIDataSettingsGlobalNetworkHostInterface
 {
     /* Host Interface: */
@@ -68,5 +68,5 @@
     QString m_strInterfaceAddress6;
     QString m_strInterfaceMaskLength6;
-    bool operator==(const UIDataNetworkHostInterface &other) const
+    bool operator==(const UIDataSettingsGlobalNetworkHostInterface &other) const
     {
         return m_strName == other.m_strName &&
@@ -81,5 +81,5 @@
 
 /* Global settings / Network page / Host DHCP server data: */
-struct UIDataNetworkDHCPServer
+struct UIDataSettingsGlobalNetworkDHCPServer
 {
     /* DHCP Server: */
@@ -89,5 +89,5 @@
     QString m_strDhcpLowerAddress;
     QString m_strDhcpUpperAddress;
-    bool operator==(const UIDataNetworkDHCPServer &other) const
+    bool operator==(const UIDataSettingsGlobalNetworkDHCPServer &other) const
     {
         return m_fDhcpServerEnabled == other.m_fDhcpServerEnabled &&
@@ -100,9 +100,9 @@
 
 /* Global settings / Network page / Host network data: */
-struct UIDataNetworkHost
-{
-    UIDataNetworkHostInterface m_interface;
-    UIDataNetworkDHCPServer m_dhcpserver;
-    bool operator==(const UIDataNetworkHost &other) const
+struct UIDataSettingsGlobalNetworkHost
+{
+    UIDataSettingsGlobalNetworkHostInterface m_interface;
+    UIDataSettingsGlobalNetworkDHCPServer m_dhcpserver;
+    bool operator==(const UIDataSettingsGlobalNetworkHost &other) const
     {
         return m_interface == other.m_interface &&
@@ -115,6 +115,6 @@
 struct UISettingsCacheGlobalNetwork
 {
-    QList<UIDataNetworkNAT> m_networksNAT;
-    QList<UIDataNetworkHost> m_networksHost;
+    QList<UIDataSettingsGlobalNetworkNAT> m_networksNAT;
+    QList<UIDataSettingsGlobalNetworkHost> m_networksHost;
 };
 
@@ -179,17 +179,17 @@
 
     /* Helpers: NAT network cache stuff: */
-    UIDataNetworkNAT generateDataNetworkNAT(const CNATNetwork &network);
-    void saveCacheItemNetworkNAT(const UIDataNetworkNAT &data);
+    UIDataSettingsGlobalNetworkNAT generateDataNetworkNAT(const CNATNetwork &network);
+    void saveCacheItemNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data);
 
     /* Helpers: NAT network tree stuff: */
-    void createTreeItemNetworkNAT(const UIDataNetworkNAT &data, bool fChooseItem = false);
+    void createTreeItemNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data, bool fChooseItem = false);
     void removeTreeItemNetworkNAT(UIItemNetworkNAT *pItem);
 
     /* Helpers: Host network cache stuff: */
-    UIDataNetworkHost generateDataNetworkHost(const CHostNetworkInterface &iface);
-    void saveCacheItemNetworkHost(const UIDataNetworkHost &data);
+    UIDataSettingsGlobalNetworkHost generateDataNetworkHost(const CHostNetworkInterface &iface);
+    void saveCacheItemNetworkHost(const UIDataSettingsGlobalNetworkHost &data);
 
     /* Helpers: Host network tree stuff: */
-    void createTreeItemNetworkHost(const UIDataNetworkHost &data, bool fChooseItem = false);
+    void createTreeItemNetworkHost(const UIDataSettingsGlobalNetworkHost &data, bool fChooseItem = false);
     void removeTreeItemNetworkHost(UIItemNetworkHost *pItem);
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp	(revision 65629)
@@ -30,5 +30,5 @@
 
 
-UIGlobalSettingsNetworkDetailsHost::UIGlobalSettingsNetworkDetailsHost(QWidget *pParent, UIDataNetworkHost &data)
+UIGlobalSettingsNetworkDetailsHost::UIGlobalSettingsNetworkDetailsHost(QWidget *pParent, UIDataSettingsGlobalNetworkHost &data)
     : QIWithRetranslateUI2<QIDialog>(pParent)
     , m_data(data)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.h	(revision 65629)
@@ -25,5 +25,5 @@
 
 /* Forward decalrations: */
-struct UIDataNetworkHost;
+struct UIDataSettingsGlobalNetworkHost;
 
 /* Global settings / Network page / Details sub-dialog: */
@@ -35,5 +35,5 @@
 
     /* Constructor: */
-    UIGlobalSettingsNetworkDetailsHost(QWidget *pParent, UIDataNetworkHost &data);
+    UIGlobalSettingsNetworkDetailsHost(QWidget *pParent, UIDataSettingsGlobalNetworkHost &data);
 
 protected:
@@ -65,5 +65,5 @@
 
     /* Variable: External data reference: */
-    UIDataNetworkHost &m_data;
+    UIDataSettingsGlobalNetworkHost &m_data;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp	(revision 65629)
@@ -31,5 +31,5 @@
 
 
-UIGlobalSettingsNetworkDetailsNAT::UIGlobalSettingsNetworkDetailsNAT(QWidget *pParent, UIDataNetworkNAT &data)
+UIGlobalSettingsNetworkDetailsNAT::UIGlobalSettingsNetworkDetailsNAT(QWidget *pParent, UIDataSettingsGlobalNetworkNAT &data)
     : QIWithRetranslateUI2<QIDialog>(pParent)
     , m_data(data)
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h	(revision 65629)
@@ -25,5 +25,5 @@
 
 /* Forward decalrations: */
-struct UIDataNetworkNAT;
+struct UIDataSettingsGlobalNetworkNAT;
 
 /* Global settings / Network page / Details sub-dialog: */
@@ -35,5 +35,5 @@
 
     /* Constructor: */
-    UIGlobalSettingsNetworkDetailsNAT(QWidget *pParent, UIDataNetworkNAT &data);
+    UIGlobalSettingsNetworkDetailsNAT(QWidget *pParent, UIDataSettingsGlobalNetworkNAT &data);
 
 protected:
@@ -60,5 +60,5 @@
 
     /* Variable: External data reference: */
-    UIDataNetworkNAT &m_data;
+    UIDataSettingsGlobalNetworkNAT &m_data;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h	(revision 65629)
@@ -47,5 +47,5 @@
     KAudioControllerType m_audioControllerType;
 };
-typedef UISettingsCache<UIDataSettingsMachineAudio> UICacheSettingsMachineAudio;
+typedef UISettingsCache<UIDataSettingsMachineAudio> UISettingsCacheMachineAudio;
 
 /* Machine settings / Audio page: */
@@ -94,5 +94,5 @@
 
     /* Cache: */
-    UICacheSettingsMachineAudio m_cache;
+    UISettingsCacheMachineAudio m_cache;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h	(revision 65629)
@@ -121,5 +121,5 @@
     QVector<BOOL> m_screens;
 };
-typedef UISettingsCache<UIDataSettingsMachineDisplay> UICacheSettingsMachineDisplay;
+typedef UISettingsCache<UIDataSettingsMachineDisplay> UISettingsCacheMachineDisplay;
 
 /* Machine settings / Display page: */
@@ -238,5 +238,5 @@
 
     /* Cache: */
-    UICacheSettingsMachineDisplay m_cache;
+    UISettingsCacheMachineDisplay m_cache;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h	(revision 65629)
@@ -95,5 +95,5 @@
     EncryptionPasswordMap m_encryptionPasswords;
 };
-typedef UISettingsCache<UIDataSettingsMachineGeneral> UICacheSettingsMachineGeneral;
+typedef UISettingsCache<UIDataSettingsMachineGeneral> UISettingsCacheMachineGeneral;
 
 /** Machine settings: General page. */
@@ -172,5 +172,5 @@
 
     /** Holds the page cache. */
-    UICacheSettingsMachineGeneral m_cache;
+    UISettingsCacheMachineGeneral m_cache;
 
     /** Holds whether HW virtualization extension is enabled. */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h	(revision 65629)
@@ -112,5 +112,5 @@
 #endif /* !VBOX_WS_MAC */
 };
-typedef UISettingsCache<UIDataSettingsMachineInterface> UICacheSettingsMachineInterface;
+typedef UISettingsCache<UIDataSettingsMachineInterface> UISettingsCacheMachineInterface;
 
 /* Machine settings / User Interface page: */
@@ -164,5 +164,5 @@
 
     /* Cache: */
-    UICacheSettingsMachineInterface m_cache;
+    UISettingsCacheMachineInterface m_cache;
 
     /** Holds the machine ID copy. */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp	(revision 65629)
@@ -91,5 +91,5 @@
 }
 
-void UIMachineSettingsNetwork::fetchAdapterCache(const UICacheSettingsMachineNetworkAdapter &adapterCache)
+void UIMachineSettingsNetwork::fetchAdapterCache(const UISettingsCacheMachineNetworkAdapter &adapterCache)
 {
     /* Get adapter data: */
@@ -130,5 +130,5 @@
 }
 
-void UIMachineSettingsNetwork::uploadAdapterCache(UICacheSettingsMachineNetworkAdapter &adapterCache)
+void UIMachineSettingsNetwork::uploadAdapterCache(UISettingsCacheMachineNetworkAdapter &adapterCache)
 {
     /* Prepare adapter data: */
@@ -966,5 +966,5 @@
         {
             /* Check if adapter data was changed: */
-            const UICacheSettingsMachineNetworkAdapter &adapterCache = m_cache.child(iSlot);
+            const UISettingsCacheMachineNetworkAdapter &adapterCache = m_cache.child(iSlot);
             if (adapterCache.wasChanged())
             {
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.h	(revision 65629)
@@ -84,5 +84,5 @@
     UIPortForwardingDataList m_redirects;
 };
-typedef UISettingsCache<UIDataSettingsMachineNetworkAdapter> UICacheSettingsMachineNetworkAdapter;
+typedef UISettingsCache<UIDataSettingsMachineNetworkAdapter> UISettingsCacheMachineNetworkAdapter;
 
 /* Machine settings / Network page / Network data: */
@@ -95,5 +95,5 @@
     bool operator!=(const UIDataSettingsMachineNetwork& /* other */) const { return false; }
 };
-typedef UISettingsCachePool<UIDataSettingsMachineNetwork, UICacheSettingsMachineNetworkAdapter> UICacheSettingsMachineNetwork;
+typedef UISettingsCachePool<UIDataSettingsMachineNetwork, UISettingsCacheMachineNetworkAdapter> UISettingsCacheMachineNetwork;
 
 /* Machine settings / Network page / Adapter tab: */
@@ -108,6 +108,6 @@
 
     /* Load / Save API: */
-    void fetchAdapterCache(const UICacheSettingsMachineNetworkAdapter &adapterCache);
-    void uploadAdapterCache(UICacheSettingsMachineNetworkAdapter &adapterCache);
+    void fetchAdapterCache(const UISettingsCacheMachineNetworkAdapter &adapterCache);
+    void uploadAdapterCache(UISettingsCacheMachineNetworkAdapter &adapterCache);
 
     /* API: Validation stuff: */
@@ -261,5 +261,5 @@
 
     /* Cache: */
-    UICacheSettingsMachineNetwork m_cache;
+    UISettingsCacheMachineNetwork m_cache;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp	(revision 65629)
@@ -87,5 +87,5 @@
 }
 
-void UIMachineSettingsParallel::fetchPortData(const UICacheSettingsMachineParallelPort &portCache)
+void UIMachineSettingsParallel::fetchPortData(const UISettingsCacheMachineParallelPort &portCache)
 {
     /* Get port data: */
@@ -106,5 +106,5 @@
 }
 
-void UIMachineSettingsParallel::uploadPortData(UICacheSettingsMachineParallelPort &portCache)
+void UIMachineSettingsParallel::uploadPortData(UISettingsCacheMachineParallelPort &portCache)
 {
     /* Prepare port data: */
@@ -303,5 +303,5 @@
         {
             /* Check if port data was changed: */
-            const UICacheSettingsMachineParallelPort &portCache = m_cache.child(iPort);
+            const UISettingsCacheMachineParallelPort &portCache = m_cache.child(iPort);
             if (portCache.wasChanged())
             {
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.h	(revision 65629)
@@ -56,5 +56,5 @@
     QString m_strPath;
 };
-typedef UISettingsCache<UIDataSettingsMachineParallelPort> UICacheSettingsMachineParallelPort;
+typedef UISettingsCache<UIDataSettingsMachineParallelPort> UISettingsCacheMachineParallelPort;
 
 /* Machine settings / Parallel page / Ports data: */
@@ -67,5 +67,5 @@
     bool operator!=(const UIDataSettingsMachineParallel& /* other */) const { return false; }
 };
-typedef UISettingsCachePool<UIDataSettingsMachineParallel, UICacheSettingsMachineParallelPort> UICacheSettingsMachineParallel;
+typedef UISettingsCachePool<UIDataSettingsMachineParallel, UISettingsCacheMachineParallelPort> UISettingsCacheMachineParallel;
 
 class UIMachineSettingsParallel : public QIWithRetranslateUI<QWidget>,
@@ -80,6 +80,6 @@
     void polishTab();
 
-    void fetchPortData(const UICacheSettingsMachineParallelPort &portCache);
-    void uploadPortData(UICacheSettingsMachineParallelPort &portCache);
+    void fetchPortData(const UISettingsCacheMachineParallelPort &portCache);
+    void uploadPortData(UISettingsCacheMachineParallelPort &portCache);
 
     QWidget* setOrderAfter (QWidget *aAfter);
@@ -146,5 +146,5 @@
 
     /* Cache: */
-    UICacheSettingsMachineParallel m_cache;
+    UISettingsCacheMachineParallel m_cache;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp	(revision 65629)
@@ -377,5 +377,5 @@
     {
         /* Check if this shared folder data was actually changed: */
-        const UICacheSettingsSharedFolder &sharedFolderCache = m_cache.child(iSharedFolderIndex);
+        const UISettingsCacheSharedFolder &sharedFolderCache = m_cache.child(iSharedFolderIndex);
         if (sharedFolderCache.wasChanged())
         {
@@ -749,5 +749,5 @@
 }
 
-bool UIMachineSettingsSF::removeSharedFolder(const UICacheSettingsSharedFolder &folderCache)
+bool UIMachineSettingsSF::removeSharedFolder(const UISettingsCacheSharedFolder &folderCache)
 {
     /* Get shared folder data: */
@@ -804,5 +804,5 @@
 }
 
-bool UIMachineSettingsSF::createSharedFolder(const UICacheSettingsSharedFolder &folderCache)
+bool UIMachineSettingsSF::createSharedFolder(const UISettingsCacheSharedFolder &folderCache)
 {
     /* Get shared folder data: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h	(revision 65629)
@@ -62,5 +62,5 @@
     bool m_fWritable;
 };
-typedef UISettingsCache<UIDataSettingsSharedFolder> UICacheSettingsSharedFolder;
+typedef UISettingsCache<UIDataSettingsSharedFolder> UISettingsCacheSharedFolder;
 
 /* Machine settings / Shared Folders page / Shared Folders data: */
@@ -73,5 +73,5 @@
     bool operator!=(const UIDataSettingsSharedFolders& /* other */) const { return false; }
 };
-typedef UISettingsCachePool<UIDataSettingsSharedFolders, UICacheSettingsSharedFolder> UICacheSettingsSharedFolders;
+typedef UISettingsCachePool<UIDataSettingsSharedFolders, UISettingsCacheSharedFolder> UISettingsCacheSharedFolders;
 
 class UIMachineSettingsSF : public UISettingsPageMachine,
@@ -139,6 +139,6 @@
     CSharedFolderVector getSharedFolders(UISharedFolderType sharedFoldersType);
 
-    bool removeSharedFolder(const UICacheSettingsSharedFolder &folderCache);
-    bool createSharedFolder(const UICacheSettingsSharedFolder &folderCache);
+    bool removeSharedFolder(const UISettingsCacheSharedFolder &folderCache);
+    bool createSharedFolder(const UISettingsCacheSharedFolder &folderCache);
 
     QAction  *mNewAction;
@@ -150,5 +150,5 @@
 
     /* Cache: */
-    UICacheSettingsSharedFolders m_cache;
+    UISettingsCacheSharedFolders m_cache;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp	(revision 65629)
@@ -101,5 +101,5 @@
 }
 
-void UIMachineSettingsSerial::fetchPortData(const UICacheSettingsMachineSerialPort &portCache)
+void UIMachineSettingsSerial::fetchPortData(const UISettingsCacheMachineSerialPort &portCache)
 {
     /* Get port data: */
@@ -122,5 +122,5 @@
 }
 
-void UIMachineSettingsSerial::uploadPortData(UICacheSettingsMachineSerialPort &portCache)
+void UIMachineSettingsSerial::uploadPortData(UISettingsCacheMachineSerialPort &portCache)
 {
     /* Prepare port data: */
@@ -344,5 +344,5 @@
         {
             /* Check if port data was changed: */
-            const UICacheSettingsMachineSerialPort &portCache = m_cache.child(iPort);
+            const UISettingsCacheMachineSerialPort &portCache = m_cache.child(iPort);
             if (portCache.wasChanged())
             {
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h	(revision 65629)
@@ -62,5 +62,5 @@
     QString m_strPath;
 };
-typedef UISettingsCache<UIDataSettingsMachineSerialPort> UICacheSettingsMachineSerialPort;
+typedef UISettingsCache<UIDataSettingsMachineSerialPort> UISettingsCacheMachineSerialPort;
 
 /* Machine settings / Serial page / Ports data: */
@@ -73,5 +73,5 @@
     bool operator!=(const UIDataSettingsMachineSerial& /* other */) const { return false; }
 };
-typedef UISettingsCachePool<UIDataSettingsMachineSerial, UICacheSettingsMachineSerialPort> UICacheSettingsMachineSerial;
+typedef UISettingsCachePool<UIDataSettingsMachineSerial, UISettingsCacheMachineSerialPort> UISettingsCacheMachineSerial;
 
 class UIMachineSettingsSerial : public QIWithRetranslateUI<QWidget>,
@@ -86,6 +86,6 @@
     void polishTab();
 
-    void fetchPortData(const UICacheSettingsMachineSerialPort &data);
-    void uploadPortData(UICacheSettingsMachineSerialPort &data);
+    void fetchPortData(const UISettingsCacheMachineSerialPort &data);
+    void uploadPortData(UISettingsCacheMachineSerialPort &data);
 
     QWidget* setOrderAfter (QWidget *aAfter);
@@ -153,5 +153,5 @@
 
     /* Cache: */
-    UICacheSettingsMachineSerial m_cache;
+    UISettingsCacheMachineSerial m_cache;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp	(revision 65629)
@@ -2290,5 +2290,5 @@
     {
         /* Get storage controller cache: */
-        const UICacheSettingsMachineStorageController &controllerCache = m_cache.child(iControllerIndex);
+        const UISettingsCacheMachineStorageController &controllerCache = m_cache.child(iControllerIndex);
         /* Get storage controller data from cache: */
         const UIDataSettingsMachineStorageController &controllerData = controllerCache.base();
@@ -2306,5 +2306,5 @@
         {
             /* Get storage attachment cache: */
-            const UICacheSettingsMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
+            const UISettingsCacheMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
             /* Get storage controller data from cache: */
             const UIDataSettingsMachineStorageAttachment &attachmentData = attachmentCache.base();
@@ -3590,5 +3590,5 @@
             {
                 /* Get controller cache: */
-                const UICacheSettingsMachineStorageController &controllerCache = m_cache.child(iControllerIndex);
+                const UISettingsCacheMachineStorageController &controllerCache = m_cache.child(iControllerIndex);
 
                 /* Remove controllers marked for 'remove' and 'update' (if they can't be updated): */
@@ -3605,5 +3605,5 @@
                     {
                         /* Get attachment cache: */
-                        const UICacheSettingsMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
+                        const UISettingsCacheMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
 
                         /* Remove attachments marked for 'remove' and 'update' (if they can't be updated): */
@@ -3618,5 +3618,5 @@
             {
                 /* Get controller cache: */
-                const UICacheSettingsMachineStorageController &controllerCache = m_cache.child(iControllerIndex);
+                const UISettingsCacheMachineStorageController &controllerCache = m_cache.child(iControllerIndex);
 
                 /* Create controllers marked for 'create' or 'update' (if they can't be updated): */
@@ -3636,5 +3636,5 @@
 }
 
-bool UIMachineSettingsStorage::removeStorageController(const UICacheSettingsMachineStorageController &controllerCache)
+bool UIMachineSettingsStorage::removeStorageController(const UISettingsCacheMachineStorageController &controllerCache)
 {
     /* Prepare result: */
@@ -3665,5 +3665,5 @@
 }
 
-bool UIMachineSettingsStorage::createStorageController(const UICacheSettingsMachineStorageController &controllerCache)
+bool UIMachineSettingsStorage::createStorageController(const UISettingsCacheMachineStorageController &controllerCache)
 {
     /* Prepare result: */
@@ -3708,5 +3708,5 @@
                 {
                     /* Get storage attachment cache: */
-                    const UICacheSettingsMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
+                    const UISettingsCacheMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
 
                     /* Create attachment if it was not just 'removed': */
@@ -3721,5 +3721,5 @@
 }
 
-bool UIMachineSettingsStorage::updateStorageController(const UICacheSettingsMachineStorageController &controllerCache)
+bool UIMachineSettingsStorage::updateStorageController(const UISettingsCacheMachineStorageController &controllerCache)
 {
     /* Prepare result: */
@@ -3757,5 +3757,5 @@
             {
                 /* Get storage attachment cache: */
-                const UICacheSettingsMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
+                const UISettingsCacheMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
 
                 /* Create attachments marked for 'create' and 'update' (if they can't be updated): */
@@ -3775,6 +3775,6 @@
 }
 
-bool UIMachineSettingsStorage::removeStorageAttachment(const UICacheSettingsMachineStorageController &controllerCache,
-                                                       const UICacheSettingsMachineStorageAttachment &attachmentCache)
+bool UIMachineSettingsStorage::removeStorageAttachment(const UISettingsCacheMachineStorageController &controllerCache,
+                                                       const UISettingsCacheMachineStorageAttachment &attachmentCache)
 {
     /* Prepare result: */
@@ -3810,6 +3810,6 @@
 }
 
-bool UIMachineSettingsStorage::createStorageAttachment(const UICacheSettingsMachineStorageController &controllerCache,
-                                                       const UICacheSettingsMachineStorageAttachment &attachmentCache)
+bool UIMachineSettingsStorage::createStorageAttachment(const UISettingsCacheMachineStorageController &controllerCache,
+                                                       const UISettingsCacheMachineStorageAttachment &attachmentCache)
 {
     /* Prepare result: */
@@ -3899,6 +3899,6 @@
 }
 
-bool UIMachineSettingsStorage::updateStorageAttachment(const UICacheSettingsMachineStorageController &controllerCache,
-                                                       const UICacheSettingsMachineStorageAttachment &attachmentCache)
+bool UIMachineSettingsStorage::updateStorageAttachment(const UISettingsCacheMachineStorageController &controllerCache,
+                                                       const UISettingsCacheMachineStorageAttachment &attachmentCache)
 {
     /* Prepare result: */
@@ -3988,5 +3988,5 @@
 }
 
-bool UIMachineSettingsStorage::isControllerCouldBeUpdated(const UICacheSettingsMachineStorageController &controllerCache) const
+bool UIMachineSettingsStorage::isControllerCouldBeUpdated(const UISettingsCacheMachineStorageController &controllerCache) const
 {
     /* IController interface doesn't allows to change 'name' and 'bus' attributes.
@@ -4000,5 +4000,5 @@
 }
 
-bool UIMachineSettingsStorage::isAttachmentCouldBeUpdated(const UICacheSettingsMachineStorageAttachment &attachmentCache) const
+bool UIMachineSettingsStorage::isAttachmentCouldBeUpdated(const UISettingsCacheMachineStorageAttachment &attachmentCache) const
 {
     /* IMediumAttachment could be indirectly updated through IMachine
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h	(revision 65629)
@@ -627,5 +627,5 @@
     bool m_fAttachmentHotPluggable;
 };
-typedef UISettingsCache<UIDataSettingsMachineStorageAttachment> UICacheSettingsMachineStorageAttachment;
+typedef UISettingsCache<UIDataSettingsMachineStorageAttachment> UISettingsCacheMachineStorageAttachment;
 
 /* Machine settings / Storage page / Storage controller data: */
@@ -658,5 +658,5 @@
     bool m_fUseHostIOCache;
 };
-typedef UISettingsCachePool<UIDataSettingsMachineStorageController, UICacheSettingsMachineStorageAttachment> UICacheSettingsMachineStorageController;
+typedef UISettingsCachePool<UIDataSettingsMachineStorageController, UISettingsCacheMachineStorageAttachment> UISettingsCacheMachineStorageController;
 
 /* Machine settings / Storage page / Storage data: */
@@ -669,5 +669,5 @@
     bool operator!=(const UIDataSettingsMachineStorage& /* other */) const { return false; }
 };
-typedef UISettingsCachePool<UIDataSettingsMachineStorage, UICacheSettingsMachineStorageController> UICacheSettingsMachineStorage;
+typedef UISettingsCachePool<UIDataSettingsMachineStorage, UISettingsCacheMachineStorageController> UISettingsCacheMachineStorage;
 
 /* Machine settings / Storage page: */
@@ -778,15 +778,15 @@
 
     bool updateStorageData();
-    bool removeStorageController(const UICacheSettingsMachineStorageController &controllerCache);
-    bool createStorageController(const UICacheSettingsMachineStorageController &controllerCache);
-    bool updateStorageController(const UICacheSettingsMachineStorageController &controllerCache);
-    bool removeStorageAttachment(const UICacheSettingsMachineStorageController &controllerCache,
-                                 const UICacheSettingsMachineStorageAttachment &attachmentCache);
-    bool createStorageAttachment(const UICacheSettingsMachineStorageController &controllerCache,
-                                 const UICacheSettingsMachineStorageAttachment &attachmentCache);
-    bool updateStorageAttachment(const UICacheSettingsMachineStorageController &controllerCache,
-                                 const UICacheSettingsMachineStorageAttachment &attachmentCache);
-    bool isControllerCouldBeUpdated(const UICacheSettingsMachineStorageController &controllerCache) const;
-    bool isAttachmentCouldBeUpdated(const UICacheSettingsMachineStorageAttachment &attachmentCache) const;
+    bool removeStorageController(const UISettingsCacheMachineStorageController &controllerCache);
+    bool createStorageController(const UISettingsCacheMachineStorageController &controllerCache);
+    bool updateStorageController(const UISettingsCacheMachineStorageController &controllerCache);
+    bool removeStorageAttachment(const UISettingsCacheMachineStorageController &controllerCache,
+                                 const UISettingsCacheMachineStorageAttachment &attachmentCache);
+    bool createStorageAttachment(const UISettingsCacheMachineStorageController &controllerCache,
+                                 const UISettingsCacheMachineStorageAttachment &attachmentCache);
+    bool updateStorageAttachment(const UISettingsCacheMachineStorageController &controllerCache,
+                                 const UISettingsCacheMachineStorageAttachment &attachmentCache);
+    bool isControllerCouldBeUpdated(const UISettingsCacheMachineStorageController &controllerCache) const;
+    bool isAttachmentCouldBeUpdated(const UISettingsCacheMachineStorageAttachment &attachmentCache) const;
 
     /** Defines configuration access level. */
@@ -826,5 +826,5 @@
 
     /* Cache: */
-    UICacheSettingsMachineStorage m_cache;
+    UISettingsCacheMachineStorage m_cache;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h	(revision 65629)
@@ -116,5 +116,5 @@
     bool m_fEnabledNestedPaging;
 };
-typedef UISettingsCache<UIDataSettingsMachineSystem> UICacheSettingsMachineSystem;
+typedef UISettingsCache<UIDataSettingsMachineSystem> UISettingsCacheMachineSystem;
 
 /* Machine settings / System page: */
@@ -218,5 +218,5 @@
 
     /* Cache: */
-    UICacheSettingsMachineSystem m_cache;
+    UISettingsCacheMachineSystem m_cache;
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp	(revision 65629)
@@ -512,5 +512,5 @@
                 {
                     /* Check if USB filter data really changed: */
-                    const UICacheSettingsMachineUSBFilter &usbFilterCache = m_cache.child(iFilterIndex);
+                    const UISettingsCacheMachineUSBFilter &usbFilterCache = m_cache.child(iFilterIndex);
                     if (usbFilterCache.wasChanged())
                     {
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h	(revision 65628)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h	(revision 65629)
@@ -80,5 +80,5 @@
     KUSBDeviceState m_hostUSBDeviceState;
 };
-typedef UISettingsCache<UIDataSettingsMachineUSBFilter> UICacheSettingsMachineUSBFilter;
+typedef UISettingsCache<UIDataSettingsMachineUSBFilter> UISettingsCacheMachineUSBFilter;
 
 /* Common settings / USB page / USB data: */
@@ -102,5 +102,5 @@
     KUSBControllerType m_USBControllerType;
 };
-typedef UISettingsCachePool<UIDataSettingsMachineUSB, UICacheSettingsMachineUSBFilter> UICacheSettingsMachineUSB;
+typedef UISettingsCachePool<UIDataSettingsMachineUSB, UISettingsCacheMachineUSBFilter> UISettingsCacheMachineUSB;
 
 /* Common settings / USB page: */
@@ -189,5 +189,5 @@
 
     /* Cache: */
-    UICacheSettingsMachineUSB m_cache;
+    UISettingsCacheMachineUSB m_cache;
 };
 
