Changeset 65629 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 6, 2017 4:57:11 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Settings: A bit of refactoring to bring the code of global and machine settings to the same level of achievements.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• global/UIGlobalSettingsNetwork.cpp (modified) (21 diffs)
• global/UIGlobalSettingsNetwork.h (modified) (9 diffs)
• global/UIGlobalSettingsNetworkDetailsHost.cpp (modified) (1 diff)
• global/UIGlobalSettingsNetworkDetailsHost.h (modified) (3 diffs)
• global/UIGlobalSettingsNetworkDetailsNAT.cpp (modified) (1 diff)
• global/UIGlobalSettingsNetworkDetailsNAT.h (modified) (3 diffs)
• machine/UIMachineSettingsAudio.h (modified) (2 diffs)
• machine/UIMachineSettingsDisplay.h (modified) (2 diffs)
• machine/UIMachineSettingsGeneral.h (modified) (2 diffs)
• machine/UIMachineSettingsInterface.h (modified) (2 diffs)
• machine/UIMachineSettingsNetwork.cpp (modified) (3 diffs)
• machine/UIMachineSettingsNetwork.h (modified) (4 diffs)
• machine/UIMachineSettingsParallel.cpp (modified) (3 diffs)
• machine/UIMachineSettingsParallel.h (modified) (4 diffs)
• machine/UIMachineSettingsSF.cpp (modified) (3 diffs)
• machine/UIMachineSettingsSF.h (modified) (4 diffs)
• machine/UIMachineSettingsSerial.cpp (modified) (3 diffs)
• machine/UIMachineSettingsSerial.h (modified) (4 diffs)
• machine/UIMachineSettingsStorage.cpp (modified) (15 diffs)
• machine/UIMachineSettingsStorage.h (modified) (5 diffs)
• machine/UIMachineSettingsSystem.h (modified) (2 diffs)
• machine/UIMachineSettingsUSB.cpp (modified) (1 diff)
• machine/UIMachineSettingsUSB.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -54 +54 @@
 
     /* 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 +74 @@
 
     /* Variable: Network data: */
-    UIDataNetworkNAT m_data;
+    UIDataSettingsGlobalNetworkNAT m_data;
 };
 
@@ -87 +87 @@
 
     /* 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 +102 @@
 
     /* Variable: Network data: */
-    UIDataNetworkHost m_data;
+    UIDataSettingsGlobalNetworkHost m_data;
 };
 
@@ -111 +111 @@
 }
 
-void UIItemNetworkNAT::fetchNetworkData(const UIDataNetworkNAT &data)
+void UIItemNetworkNAT::fetchNetworkData(const UIDataSettingsGlobalNetworkNAT &data)
 {
     /* Get from cache: */
@@ -120 +120 @@
 }
 
-void UIItemNetworkNAT::uploadNetworkData(UIDataNetworkNAT &data)
+void UIItemNetworkNAT::uploadNetworkData(UIDataSettingsGlobalNetworkNAT &data)
 {
     /* Put to cache: */
@@ -233 +233 @@
 }
 
-void UIItemNetworkHost::fetchNetworkData(const UIDataNetworkHost &data)
+void UIItemNetworkHost::fetchNetworkData(const UIDataSettingsGlobalNetworkHost &data)
 {
     /* Get from cache: */
@@ -242 +242 @@
 }
 
-void UIItemNetworkHost::uploadNetworkData(UIDataNetworkHost &data)
+void UIItemNetworkHost::uploadNetworkData(UIDataSettingsGlobalNetworkHost &data)
 {
     /* Put to cache: */
@@ -537 +537 @@
 {
     /* 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 +544 @@
 
     /* 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 +560 @@
     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 +570 @@
     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 +587 @@
 
     /* 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 +783 @@
 
     /* Edit current item data: */
-    UIDataNetworkNAT data;
+    UIDataSettingsGlobalNetworkNAT data;
     pItem->uploadNetworkData(data);
     UIGlobalSettingsNetworkDetailsNAT details(this, data);
@@ -887 +887 @@
 
     /* Edit current item data: */
-    UIDataNetworkHost data;
+    UIDataSettingsGlobalNetworkHost data;
     pItem->uploadNetworkData(data);
     UIGlobalSettingsNetworkDetailsHost details(this, data);
@@ -953 +953 @@
 }
 
-UIDataNetworkNAT UIGlobalSettingsNetwork::generateDataNetworkNAT(const CNATNetwork &network)
+UIDataSettingsGlobalNetworkNAT UIGlobalSettingsNetwork::generateDataNetworkNAT(const CNATNetwork &network)
 {
     /* Prepare data: */
-    UIDataNetworkNAT data;
+    UIDataSettingsGlobalNetworkNAT data;
 
     /* Load NAT network settings: */
@@ -1019 +1019 @@
 }
 
-void UIGlobalSettingsNetwork::saveCacheItemNetworkNAT(const UIDataNetworkNAT &data)
+void UIGlobalSettingsNetwork::saveCacheItemNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data)
 {
     /* Make sure corresponding NAT network exists: */
@@ -1055 +1055 @@
 }
 
-void UIGlobalSettingsNetwork::createTreeItemNetworkNAT(const UIDataNetworkNAT &data, bool fChooseItem)
+void UIGlobalSettingsNetwork::createTreeItemNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data, bool fChooseItem)
 {
     /* Add new item to the tree: */
@@ -1072 +1072 @@
 }
 
-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 +1114 @@
 }
 
-void UIGlobalSettingsNetwork::saveCacheItemNetworkHost(const UIDataNetworkHost &data)
+void UIGlobalSettingsNetwork::saveCacheItemNetworkHost(const UIDataSettingsGlobalNetworkHost &data)
 {
     /* Make sure corresponding Host interface exists: */
@@ -1185 +1185 @@
 }
 
-void UIGlobalSettingsNetwork::createTreeItemNetworkHost(const UIDataNetworkHost &data, bool fChooseItem)
+void UIGlobalSettingsNetwork::createTreeItemNetworkHost(const UIDataSettingsGlobalNetworkHost &data, bool fChooseItem)
 {
     /* Add new item to the tree: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h

@@ -30 +30 @@
 
 /* Global settings / Network page / NAT network data: */
-struct UIDataNetworkNAT
+struct UIDataSettingsGlobalNetworkNAT
 {
     /* NAT Network: */
@@ -42 +42 @@
     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 +58 @@
 
 /* Global settings / Network page / Host interface data: */
-struct UIDataNetworkHostInterface
+struct UIDataSettingsGlobalNetworkHostInterface
 {
     /* Host Interface: */
@@ -68 +68 @@
     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 +81 @@
 
 /* Global settings / Network page / Host DHCP server data: */
-struct UIDataNetworkDHCPServer
+struct UIDataSettingsGlobalNetworkDHCPServer
 {
     /* DHCP Server: */
@@ -89 +89 @@
     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 +100 @@
 
 /* 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 +115 @@
 struct UISettingsCacheGlobalNetwork
 {
-    QList<UIDataNetworkNAT> m_networksNAT;
-    QList<UIDataNetworkHost> m_networksHost;
+    QList<UIDataSettingsGlobalNetworkNAT> m_networksNAT;
+    QList<UIDataSettingsGlobalNetworkHost> m_networksHost;
 };
 
@@ -179 +179 @@
 
     /* 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);
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp

@@ -30 +30 @@
 
 
-UIGlobalSettingsNetworkDetailsHost::UIGlobalSettingsNetworkDetailsHost(QWidget *pParent, UIDataNetworkHost &data)
+UIGlobalSettingsNetworkDetailsHost::UIGlobalSettingsNetworkDetailsHost(QWidget *pParent, UIDataSettingsGlobalNetworkHost &data)
     : QIWithRetranslateUI2<QIDialog>(pParent)
     , m_data(data)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.h

@@ -25 +25 @@
 
 /* Forward decalrations: */
-struct UIDataNetworkHost;
+struct UIDataSettingsGlobalNetworkHost;
 
 /* Global settings / Network page / Details sub-dialog: */
@@ -35 +35 @@
 
     /* Constructor: */
-    UIGlobalSettingsNetworkDetailsHost(QWidget *pParent, UIDataNetworkHost &data);
+    UIGlobalSettingsNetworkDetailsHost(QWidget *pParent, UIDataSettingsGlobalNetworkHost &data);
 
 protected:
@@ -65 +65 @@
 
     /* Variable: External data reference: */
-    UIDataNetworkHost &m_data;
+    UIDataSettingsGlobalNetworkHost &m_data;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp

@@ -31 +31 @@
 
 
-UIGlobalSettingsNetworkDetailsNAT::UIGlobalSettingsNetworkDetailsNAT(QWidget *pParent, UIDataNetworkNAT &data)
+UIGlobalSettingsNetworkDetailsNAT::UIGlobalSettingsNetworkDetailsNAT(QWidget *pParent, UIDataSettingsGlobalNetworkNAT &data)
     : QIWithRetranslateUI2<QIDialog>(pParent)
     , m_data(data)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h

@@ -25 +25 @@
 
 /* Forward decalrations: */
-struct UIDataNetworkNAT;
+struct UIDataSettingsGlobalNetworkNAT;
 
 /* Global settings / Network page / Details sub-dialog: */
@@ -35 +35 @@
 
     /* Constructor: */
-    UIGlobalSettingsNetworkDetailsNAT(QWidget *pParent, UIDataNetworkNAT &data);
+    UIGlobalSettingsNetworkDetailsNAT(QWidget *pParent, UIDataSettingsGlobalNetworkNAT &data);
 
 protected:
@@ -60 +60 @@
 
     /* Variable: External data reference: */
-    UIDataNetworkNAT &m_data;
+    UIDataSettingsGlobalNetworkNAT &m_data;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h

@@ -47 +47 @@
     KAudioControllerType m_audioControllerType;
 };
-typedef UISettingsCache<UIDataSettingsMachineAudio> UICacheSettingsMachineAudio;
+typedef UISettingsCache<UIDataSettingsMachineAudio> UISettingsCacheMachineAudio;
 
 /* Machine settings / Audio page: */
@@ -94 +94 @@
 
     /* Cache: */
-    UICacheSettingsMachineAudio m_cache;
+    UISettingsCacheMachineAudio m_cache;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h

@@ -121 +121 @@
     QVector<BOOL> m_screens;
 };
-typedef UISettingsCache<UIDataSettingsMachineDisplay> UICacheSettingsMachineDisplay;
+typedef UISettingsCache<UIDataSettingsMachineDisplay> UISettingsCacheMachineDisplay;
 
 /* Machine settings / Display page: */
@@ -238 +238 @@
 
     /* Cache: */
-    UICacheSettingsMachineDisplay m_cache;
+    UISettingsCacheMachineDisplay m_cache;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

@@ -95 +95 @@
     EncryptionPasswordMap m_encryptionPasswords;
 };
-typedef UISettingsCache<UIDataSettingsMachineGeneral> UICacheSettingsMachineGeneral;
+typedef UISettingsCache<UIDataSettingsMachineGeneral> UISettingsCacheMachineGeneral;
 
 /** Machine settings: General page. */
@@ -172 +172 @@
 
     /** Holds the page cache. */
-    UICacheSettingsMachineGeneral m_cache;
+    UISettingsCacheMachineGeneral m_cache;
 
     /** Holds whether HW virtualization extension is enabled. */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h

@@ -112 +112 @@
 #endif /* !VBOX_WS_MAC */
 };
-typedef UISettingsCache<UIDataSettingsMachineInterface> UICacheSettingsMachineInterface;
+typedef UISettingsCache<UIDataSettingsMachineInterface> UISettingsCacheMachineInterface;
 
 /* Machine settings / User Interface page: */
@@ -164 +164 @@
 
     /* Cache: */
-    UICacheSettingsMachineInterface m_cache;
+    UISettingsCacheMachineInterface m_cache;
 
     /** Holds the machine ID copy. */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -91 +91 @@
 }
 
-void UIMachineSettingsNetwork::fetchAdapterCache(const UICacheSettingsMachineNetworkAdapter &adapterCache)
+void UIMachineSettingsNetwork::fetchAdapterCache(const UISettingsCacheMachineNetworkAdapter &adapterCache)
 {
     /* Get adapter data: */
@@ -130 +130 @@
 }
 
-void UIMachineSettingsNetwork::uploadAdapterCache(UICacheSettingsMachineNetworkAdapter &adapterCache)
+void UIMachineSettingsNetwork::uploadAdapterCache(UISettingsCacheMachineNetworkAdapter &adapterCache)
 {
     /* Prepare adapter data: */
@@ -966 +966 @@
         {
             /* Check if adapter data was changed: */
-            const UICacheSettingsMachineNetworkAdapter &adapterCache = m_cache.child(iSlot);
+            const UISettingsCacheMachineNetworkAdapter &adapterCache = m_cache.child(iSlot);
             if (adapterCache.wasChanged())
             {

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.h

@@ -84 +84 @@
     UIPortForwardingDataList m_redirects;
 };
-typedef UISettingsCache<UIDataSettingsMachineNetworkAdapter> UICacheSettingsMachineNetworkAdapter;
+typedef UISettingsCache<UIDataSettingsMachineNetworkAdapter> UISettingsCacheMachineNetworkAdapter;
 
 /* Machine settings / Network page / Network data: */
@@ -95 +95 @@
     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 +108 @@
 
     /* 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 +261 @@
 
     /* Cache: */
-    UICacheSettingsMachineNetwork m_cache;
+    UISettingsCacheMachineNetwork m_cache;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp

@@ -87 +87 @@
 }
 
-void UIMachineSettingsParallel::fetchPortData(const UICacheSettingsMachineParallelPort &portCache)
+void UIMachineSettingsParallel::fetchPortData(const UISettingsCacheMachineParallelPort &portCache)
 {
     /* Get port data: */
@@ -106 +106 @@
 }
 
-void UIMachineSettingsParallel::uploadPortData(UICacheSettingsMachineParallelPort &portCache)
+void UIMachineSettingsParallel::uploadPortData(UISettingsCacheMachineParallelPort &portCache)
 {
     /* Prepare port data: */
@@ -303 +303 @@
         {
             /* Check if port data was changed: */
-            const UICacheSettingsMachineParallelPort &portCache = m_cache.child(iPort);
+            const UISettingsCacheMachineParallelPort &portCache = m_cache.child(iPort);
             if (portCache.wasChanged())
             {

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.h

@@ -56 +56 @@
     QString m_strPath;
 };
-typedef UISettingsCache<UIDataSettingsMachineParallelPort> UICacheSettingsMachineParallelPort;
+typedef UISettingsCache<UIDataSettingsMachineParallelPort> UISettingsCacheMachineParallelPort;
 
 /* Machine settings / Parallel page / Ports data: */
@@ -67 +67 @@
     bool operator!=(const UIDataSettingsMachineParallel& /* other */) const { return false; }
 };
-typedef UISettingsCachePool<UIDataSettingsMachineParallel, UICacheSettingsMachineParallelPort> UICacheSettingsMachineParallel;
+typedef UISettingsCachePool<UIDataSettingsMachineParallel, UISettingsCacheMachineParallelPort> UISettingsCacheMachineParallel;
 
 class UIMachineSettingsParallel : public QIWithRetranslateUI<QWidget>,
@@ -80 +80 @@
     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 +146 @@
 
     /* Cache: */
-    UICacheSettingsMachineParallel m_cache;
+    UISettingsCacheMachineParallel m_cache;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp

@@ -377 +377 @@
     {
         /* 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 +749 @@
 }
 
-bool UIMachineSettingsSF::removeSharedFolder(const UICacheSettingsSharedFolder &folderCache)
+bool UIMachineSettingsSF::removeSharedFolder(const UISettingsCacheSharedFolder &folderCache)
 {
     /* Get shared folder data: */
@@ -804 +804 @@
 }
 
-bool UIMachineSettingsSF::createSharedFolder(const UICacheSettingsSharedFolder &folderCache)
+bool UIMachineSettingsSF::createSharedFolder(const UISettingsCacheSharedFolder &folderCache)
 {
     /* Get shared folder data: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h

@@ -62 +62 @@
     bool m_fWritable;
 };
-typedef UISettingsCache<UIDataSettingsSharedFolder> UICacheSettingsSharedFolder;
+typedef UISettingsCache<UIDataSettingsSharedFolder> UISettingsCacheSharedFolder;
 
 /* Machine settings / Shared Folders page / Shared Folders data: */
@@ -73 +73 @@
     bool operator!=(const UIDataSettingsSharedFolders& /* other */) const { return false; }
 };
-typedef UISettingsCachePool<UIDataSettingsSharedFolders, UICacheSettingsSharedFolder> UICacheSettingsSharedFolders;
+typedef UISettingsCachePool<UIDataSettingsSharedFolders, UISettingsCacheSharedFolder> UISettingsCacheSharedFolders;
 
 class UIMachineSettingsSF : public UISettingsPageMachine,
@@ -139 +139 @@
     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 +150 @@
 
     /* Cache: */
-    UICacheSettingsSharedFolders m_cache;
+    UISettingsCacheSharedFolders m_cache;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp

@@ -101 +101 @@
 }
 
-void UIMachineSettingsSerial::fetchPortData(const UICacheSettingsMachineSerialPort &portCache)
+void UIMachineSettingsSerial::fetchPortData(const UISettingsCacheMachineSerialPort &portCache)
 {
     /* Get port data: */
@@ -122 +122 @@
 }
 
-void UIMachineSettingsSerial::uploadPortData(UICacheSettingsMachineSerialPort &portCache)
+void UIMachineSettingsSerial::uploadPortData(UISettingsCacheMachineSerialPort &portCache)
 {
     /* Prepare port data: */
@@ -344 +344 @@
         {
             /* Check if port data was changed: */
-            const UICacheSettingsMachineSerialPort &portCache = m_cache.child(iPort);
+            const UISettingsCacheMachineSerialPort &portCache = m_cache.child(iPort);
             if (portCache.wasChanged())
             {

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h

@@ -62 +62 @@
     QString m_strPath;
 };
-typedef UISettingsCache<UIDataSettingsMachineSerialPort> UICacheSettingsMachineSerialPort;
+typedef UISettingsCache<UIDataSettingsMachineSerialPort> UISettingsCacheMachineSerialPort;
 
 /* Machine settings / Serial page / Ports data: */
@@ -73 +73 @@
     bool operator!=(const UIDataSettingsMachineSerial& /* other */) const { return false; }
 };
-typedef UISettingsCachePool<UIDataSettingsMachineSerial, UICacheSettingsMachineSerialPort> UICacheSettingsMachineSerial;
+typedef UISettingsCachePool<UIDataSettingsMachineSerial, UISettingsCacheMachineSerialPort> UISettingsCacheMachineSerial;
 
 class UIMachineSettingsSerial : public QIWithRetranslateUI<QWidget>,
@@ -86 +86 @@
     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 +153 @@
 
     /* Cache: */
-    UICacheSettingsMachineSerial m_cache;
+    UISettingsCacheMachineSerial m_cache;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -2290 +2290 @@
     {
         /* 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 +2306 @@
         {
             /* 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 +3590 @@
             {
                 /* 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 +3605 @@
                     {
                         /* 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 +3618 @@
             {
                 /* 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 +3636 @@
 }
 
-bool UIMachineSettingsStorage::removeStorageController(const UICacheSettingsMachineStorageController &controllerCache)
+bool UIMachineSettingsStorage::removeStorageController(const UISettingsCacheMachineStorageController &controllerCache)
 {
     /* Prepare result: */
@@ -3665 +3665 @@
 }
 
-bool UIMachineSettingsStorage::createStorageController(const UICacheSettingsMachineStorageController &controllerCache)
+bool UIMachineSettingsStorage::createStorageController(const UISettingsCacheMachineStorageController &controllerCache)
 {
     /* Prepare result: */
@@ -3708 +3708 @@
                 {
                     /* 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 +3721 @@
 }
 
-bool UIMachineSettingsStorage::updateStorageController(const UICacheSettingsMachineStorageController &controllerCache)
+bool UIMachineSettingsStorage::updateStorageController(const UISettingsCacheMachineStorageController &controllerCache)
 {
     /* Prepare result: */
@@ -3757 +3757 @@
             {
                 /* 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 +3775 @@
 }
 
-bool UIMachineSettingsStorage::removeStorageAttachment(const UICacheSettingsMachineStorageController &controllerCache,
-                                                       const UICacheSettingsMachineStorageAttachment &attachmentCache)
+bool UIMachineSettingsStorage::removeStorageAttachment(const UISettingsCacheMachineStorageController &controllerCache,
+                                                       const UISettingsCacheMachineStorageAttachment &attachmentCache)
 {
     /* Prepare result: */
@@ -3810 +3810 @@
 }
 
-bool UIMachineSettingsStorage::createStorageAttachment(const UICacheSettingsMachineStorageController &controllerCache,
-                                                       const UICacheSettingsMachineStorageAttachment &attachmentCache)
+bool UIMachineSettingsStorage::createStorageAttachment(const UISettingsCacheMachineStorageController &controllerCache,
+                                                       const UISettingsCacheMachineStorageAttachment &attachmentCache)
 {
     /* Prepare result: */
@@ -3899 +3899 @@
 }
 
-bool UIMachineSettingsStorage::updateStorageAttachment(const UICacheSettingsMachineStorageController &controllerCache,
-                                                       const UICacheSettingsMachineStorageAttachment &attachmentCache)
+bool UIMachineSettingsStorage::updateStorageAttachment(const UISettingsCacheMachineStorageController &controllerCache,
+                                                       const UISettingsCacheMachineStorageAttachment &attachmentCache)
 {
     /* Prepare result: */
@@ -3988 +3988 @@
 }
 
-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 +4000 @@
 }
 
-bool UIMachineSettingsStorage::isAttachmentCouldBeUpdated(const UICacheSettingsMachineStorageAttachment &attachmentCache) const
+bool UIMachineSettingsStorage::isAttachmentCouldBeUpdated(const UISettingsCacheMachineStorageAttachment &attachmentCache) const
 {
     /* IMediumAttachment could be indirectly updated through IMachine

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -627 +627 @@
     bool m_fAttachmentHotPluggable;
 };
-typedef UISettingsCache<UIDataSettingsMachineStorageAttachment> UICacheSettingsMachineStorageAttachment;
+typedef UISettingsCache<UIDataSettingsMachineStorageAttachment> UISettingsCacheMachineStorageAttachment;
 
 /* Machine settings / Storage page / Storage controller data: */
@@ -658 +658 @@
     bool m_fUseHostIOCache;
 };
-typedef UISettingsCachePool<UIDataSettingsMachineStorageController, UICacheSettingsMachineStorageAttachment> UICacheSettingsMachineStorageController;
+typedef UISettingsCachePool<UIDataSettingsMachineStorageController, UISettingsCacheMachineStorageAttachment> UISettingsCacheMachineStorageController;
 
 /* Machine settings / Storage page / Storage data: */
@@ -669 +669 @@
     bool operator!=(const UIDataSettingsMachineStorage& /* other */) const { return false; }
 };
-typedef UISettingsCachePool<UIDataSettingsMachineStorage, UICacheSettingsMachineStorageController> UICacheSettingsMachineStorage;
+typedef UISettingsCachePool<UIDataSettingsMachineStorage, UISettingsCacheMachineStorageController> UISettingsCacheMachineStorage;
 
 /* Machine settings / Storage page: */
@@ -778 +778 @@
 
     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 +826 @@
 
     /* Cache: */
-    UICacheSettingsMachineStorage m_cache;
+    UISettingsCacheMachineStorage m_cache;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

@@ -116 +116 @@
     bool m_fEnabledNestedPaging;
 };
-typedef UISettingsCache<UIDataSettingsMachineSystem> UICacheSettingsMachineSystem;
+typedef UISettingsCache<UIDataSettingsMachineSystem> UISettingsCacheMachineSystem;
 
 /* Machine settings / System page: */
@@ -218 +218 @@
 
     /* Cache: */
-    UICacheSettingsMachineSystem m_cache;
+    UISettingsCacheMachineSystem m_cache;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -512 +512 @@
                 {
                     /* Check if USB filter data really changed: */
-                    const UICacheSettingsMachineUSBFilter &usbFilterCache = m_cache.child(iFilterIndex);
+                    const UISettingsCacheMachineUSBFilter &usbFilterCache = m_cache.child(iFilterIndex);
                     if (usbFilterCache.wasChanged())
                     {

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h

@@ -80 +80 @@
     KUSBDeviceState m_hostUSBDeviceState;
 };
-typedef UISettingsCache<UIDataSettingsMachineUSBFilter> UICacheSettingsMachineUSBFilter;
+typedef UISettingsCache<UIDataSettingsMachineUSBFilter> UISettingsCacheMachineUSBFilter;
 
 /* Common settings / USB page / USB data: */
@@ -102 +102 @@
     KUSBControllerType m_USBControllerType;
 };
-typedef UISettingsCachePool<UIDataSettingsMachineUSB, UICacheSettingsMachineUSBFilter> UICacheSettingsMachineUSB;
+typedef UISettingsCachePool<UIDataSettingsMachineUSB, UISettingsCacheMachineUSBFilter> UISettingsCacheMachineUSB;
 
 /* Common settings / USB page: */
@@ -189 +189 @@
 
     /* Cache: */
-    UICacheSettingsMachineUSB m_cache;
+    UISettingsCacheMachineUSB m_cache;
 };