Changeset 105605 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Aug 6, 2024 2:00:56 PM (6 months ago)

Author:

vboxsync

Message:

Recording/Main: Renaming: Dropped the superfluous "Settings" suffix of the settings namespace recording classes. This makes those classes easier to find, also for editors which don't support namespace handling, as the same class names were used for the actual implementation classes (i.e. RecordingSettingsImpl.cpp -> RecordingSettings). No functional changes.

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (2 diffs)
• RecordingScreenSettingsImpl.cpp (modified) (7 diffs)
• RecordingSettingsImpl.cpp (modified) (9 diffs)
• SnapshotImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -8619 +8619 @@
                                 const settings::Debugging *pDbg,
                                 const settings::Autostart *pAutostart,
-                                const settings::RecordingSettings &recording)
+                                const settings::Recording &recording)
 {
     AssertReturn(!i_isSessionMachine(), E_FAIL);
@@ -10013 +10013 @@
  */
 HRESULT Machine::i_saveHardware(settings::Hardware &data, settings::Debugging *pDbg,
-                                settings::Autostart *pAutostart, settings::RecordingSettings &recording)
+                                settings::Autostart *pAutostart, settings::Recording &recording)
 {
     HRESULT hrc = S_OK;

trunk/src/VBox/Main/src-server/RecordingScreenSettingsImpl.cpp

@@ -65 +65 @@
 
     // use the XML settings structure in the members for simplicity
-    Backupable<settings::RecordingScreenSettings> bd;
+    Backupable<settings::RecordingScreen>    bd;
 };
 
@@ -93 +93 @@
  */
 HRESULT RecordingScreenSettings::init(RecordingSettings *aParent, uint32_t uScreenId,
-                                      const settings::RecordingScreenSettings& aThat)
+                                      const settings::RecordingScreen& aThat)
 {
     LogFlowThisFunc(("aParent: %p\n", aParent));
@@ -1092 +1092 @@
  *
  * @returns HRESULT
- * @param   data                Configuration settings to load.
+ * @param   Settings            Screen settings to load.
  */
-HRESULT RecordingScreenSettings::i_loadSettings(const settings::RecordingScreenSettings &data)
+HRESULT RecordingScreenSettings::i_loadSettings(const settings::RecordingScreen &Settings)
 {
     AutoCaller autoCaller(this);
@@ -1103 +1103 @@
 
     // simply copy
-    m->bd.assignCopy(&data);
+    m->bd.assignCopy(&Settings);
     return S_OK;
 }
@@ -1111 +1111 @@
  *
  *  @returns HRESULT
- *  @param   data               Configuration settings to save to.
+ *  @param   Settings           Screen settings to save to.
  */
-HRESULT RecordingScreenSettings::i_saveSettings(settings::RecordingScreenSettings &data)
+HRESULT RecordingScreenSettings::i_saveSettings(settings::RecordingScreen &Settings)
 {
     LogThisFunc(("%p: Screen %RU32\n", this, m ? m->uScreenId : UINT32_MAX));
@@ -1123 +1123 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    data = *m->bd.data();
+    Settings = *m->bd.data();
 
     return S_OK;
@@ -1197 +1197 @@
 }
 
-settings::RecordingScreenSettings &RecordingScreenSettings::i_getData(void)
+settings::RecordingScreen &RecordingScreenSettings::i_getData(void)
 {
     /* sanity */

trunk/src/VBox/Main/src-server/RecordingSettingsImpl.cpp

@@ -61 +61 @@
 
     // use the XML settings structure in the members for simplicity
-    Backupable<settings::RecordingCommonSettings> bd;
+    Backupable<settings::RecordingCommon> bd;
 };
 
@@ -434 +434 @@
  */
 int RecordingSettings::i_createScreenObj(RecordingScreenSettingsObjMap &screenSettingsMap,
-                                         uint32_t idScreen, const settings::RecordingScreenSettings &data)
+                                         uint32_t idScreen, const settings::RecordingScreen &data)
 {
     AssertReturn(screenSettingsMap.find(idScreen) == screenSettingsMap.end(), VERR_ALREADY_EXISTS);
@@ -529 +529 @@
  * May be called once right after this object creation.
  *
- * @param data                  Capture settings to load from.
+ * @param Settings                  Recording settings to load from.
  *
  * @note Locks this object for writing.
  */
-HRESULT RecordingSettings::i_loadSettings(const settings::RecordingSettings &data)
+HRESULT RecordingSettings::i_loadSettings(const settings::Recording &Settings)
 {
     LogFlowThisFuncEnter();
@@ -544 +544 @@
     HRESULT hrc = S_OK;
 
-    LogFlowThisFunc(("Data has %zu screens\n", data.mapScreens.size()));
-
-    settings::RecordingScreenSettingsMap::const_iterator itScreenData = data.mapScreens.begin();
-    while (itScreenData != data.mapScreens.end())
+    LogFlowThisFunc(("Data has %zu screens\n", Settings.mapScreens.size()));
+
+    settings::RecordingScreenSettingsMap::const_iterator itScreenData = Settings.mapScreens.begin();
+    while (itScreenData != Settings.mapScreens.end())
     {
         RecordingScreenSettingsObjMap::iterator itScreen = m->mapScreenObj.find(itScreenData->first);
@@ -573 +573 @@
     {
         ComAssertComRCRet(hrc, hrc);
-        AssertReturn(m->mapScreenObj.size() == data.mapScreens.size(), E_UNEXPECTED);
+        AssertReturn(m->mapScreenObj.size() == Settings.mapScreens.size(), E_UNEXPECTED);
 
         // simply copy
-        m->bd.assignCopy(&data.common);
+        m->bd.assignCopy(&Settings.common);
     }
 
@@ -600 +600 @@
  * Saves settings to the given settings.
  *
- * @param data                  Where to store the capture settings to.
+ * @param Settings                  Where to store the recording settings to.
  *
  * @note Locks this object for reading.
  */
-HRESULT RecordingSettings::i_saveSettings(settings::RecordingSettings &data)
+HRESULT RecordingSettings::i_saveSettings(settings::Recording &Settings)
 {
     LogFlowThisFuncEnter();
@@ -623 +623 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    data.common = *m->bd.data();
+    Settings.common = *m->bd.data();
 
     HRESULT hrc = S_OK;
@@ -631 +631 @@
                                                      ++itScreen)
     {
-        hrc = itScreen->second->i_saveSettings(data.mapScreens[itScreen->first /* Screen ID */]);
+        hrc = itScreen->second->i_saveSettings(Settings.mapScreens[itScreen->first /* Screen ID */]);
         if (FAILED(hrc))
             break;
@@ -923 +923 @@
         if (m->mapScreenObj.find(i) == m->mapScreenObj.end())
         {
-            settings::RecordingScreenSettings defaultScreenSettings(i /* Screen ID */); /* Apply default settings. */
+            settings::RecordingScreen defaultScreenSettings(i /* Screen ID */); /* Apply default settings. */
 
             int vrc2 = i_createScreenObj(m->mapScreenObj, i /* Screen ID */, defaultScreenSettings);

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -1274 +1274 @@
                                           const settings::Debugging *pDbg,
                                           const settings::Autostart *pAutostart,
-                                          const settings::RecordingSettings &recording,
+                                          const settings::Recording &recording,
                                           IN_GUID aSnapshotId,
                                           const Utf8Str &aStateFilePath)