Changeset 31539 in vbox for trunk/src/VBox/Main/include

Timestamp:

Aug 10, 2010 3:40:18 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

64639

Message:

Main: use settings struct for machine user data; remove iprt::MiniString::raw() and change all occurences to c_str()

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (1 diff)
• MachineImpl.h (modified) (2 diffs)
• SnapshotImpl.h (modified) (1 diff)
• VirtualBoxBase.h (modified) (1 diff)
• netif.h (modified) (1 diff)

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

@@ -229 +229 @@
 
     static HRESULT setErrorStatic(HRESULT aResultCode, const char *pcsz, ...);
-    HRESULT setAuthLibraryError(const char *filename, int rc);
     HRESULT setInvalidMachineStateError();
 

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

@@ -214 +214 @@
     struct UserData
     {
-        UserData();
-        ~UserData();
-
-        Bstr    mName;
-        BOOL    mNameSync;
-        Bstr    mDescription;
-        Bstr    mOSTypeId;
-        Bstr    mSnapshotFolder;
-        Bstr    mSnapshotFolderFull;
-        BOOL    mTeleporterEnabled;
-        ULONG   mTeleporterPort;
-        Bstr    mTeleporterAddress;
-        Bstr    mTeleporterPassword;
-        BOOL    mRTCUseUTC;
+        settings::MachineUserData s;
+        Utf8Str m_strSnapshotFolderFull;
     };
 
@@ -592 +580 @@
      * for reading.
      */
-    const Bstr& getName() const { return mUserData->mName; }
+    const Utf8Str& getName() const { return mUserData->s.strName; }
 
     enum

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

@@ -116 +116 @@
     ComObjPtr<Snapshot> findChildOrSelf(const Utf8Str &aName);
 
-    void updateSavedStatePaths(const char *aOldPath,
-                               const char *aNewPath);
-    void updateSavedStatePathsImpl(const char *aOldPath,
-                                   const char *aNewPath);
+    void updateSavedStatePaths(const Utf8Str &strOldPath,
+                               const Utf8Str &strNewPath);
+    void updateSavedStatePathsImpl(const Utf8Str &strOldPath,
+                                   const Utf8Str &strNewPath);
 
     HRESULT saveSnapshot(settings::Snapshot &data, bool aAttrsOnly);

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

@@ -343 +343 @@
         if (RT_UNLIKELY(!(expr))) \
             return setError(E_INVALIDARG, tr ("Argument %s %s"), \
-                            #arg, Utf8StrFmt msg .raw()); \
+                            #arg, Utf8StrFmt msg .c_str()); \
     } while (0)
 

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

@@ -147 +147 @@
     /* Get the index from the name */
     int iInstance;
-    if (sscanf(Utf8Str(bstrIfName).raw(), "vboxnet%d", &iInstance) != 1)
+    if (sscanf(Utf8Str(bstrIfName).c_str(), "vboxnet%d", &iInstance) != 1)
         return Bstr("0.0.0.0");