Changeset 61009 in vbox for trunk/src/VBox/Main/include/MachineImpl.h

Timestamp:

May 17, 2016 5:18:29 PM (9 years ago)

Author:

vboxsync

Message:

Main: big settings cleanup and writing optimization. Moved constructors/equality/default checks into the .cpp file, and write only settings which aren't at the default value. Greatly reduces the effort needed to write everything out, especially when a lot of snapshots have to be dealt with. Move the storage controllers to the hardware settings, where they always belonged. No change to the XML file (yet). Lots of settings related cleanups in the API code.

File:

• trunk/src/VBox/Main/include/MachineImpl.h (modified) (6 diffs)

trunk/src/VBox/Main/include/MachineImpl.h

@@ -36 +36 @@
 #include "BandwidthControlImpl.h"
 #include "BandwidthGroupImpl.h"
-#include "VBox/settings.h"
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
 #include "Performance.h"
@@ -55 +54 @@
 
 #include "MachineWrap.h"
+
+/** @todo r=klaus after moving the various Machine settings structs to
+ * MachineImpl.cpp it should be possible to eliminate this include. */
+#include <VBox/settings.h>
 
 // defines
@@ -76 +79 @@
 class SessionMachine;
 
-namespace settings
-{
-    class MachineConfigFile;
-    struct Snapshot;
-    struct Hardware;
-    struct Storage;
-    struct StorageController;
-    struct MachineRegistryEntry;
-}
-
 // Machine class
 ////////////////////////////////////////////////////////////////////////////////
@@ -229 +222 @@
     {
         settings::MachineUserData s;
-        typedef  std::vector<uint8_t> IconBlob;
-        IconBlob mIcon;
     };
 
@@ -643 +634 @@
                            const Guid &aCurSnapshotId,
                            Snapshot *aParentSnapshot);
-    HRESULT i_loadHardware(const settings::Hardware &data, const settings::Debugging *pDbg,
+    HRESULT i_loadHardware(const Guid *puuidRegistry,
+                           const Guid *puuidSnapshot,
+                           const settings::Hardware &data,
+                           const settings::Debugging *pDbg,
                            const settings::Autostart *pAutostart);
     HRESULT i_loadDebugging(const settings::Debugging *pDbg);
@@ -1570 +1564 @@
                              const settings::Debugging *pDbg,
                              const settings::Autostart *pAutostart,
-                             const settings::Storage &storage,
                              IN_GUID aSnapshotId,
                              const Utf8Str &aStateFilePath);