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

Timestamp:

May 17, 2017 4:09:58 PM (8 years ago)

Author:

vboxsync

Message:

Main/VirtualBox+DHCPServer+GuestOSType: lots of redundant Bstr/Utf8Str conversions removed, less Bstr use in general avoiding the need for conversion, plus some cleanup of VirtualBox::i_findGuestOSType which is now used consistently

Location:

trunk/src/VBox/Main/include

Files:

• DHCPServerImpl.h (modified) (2 diffs)
• GuestOSTypeImpl.h (modified) (2 diffs)
• VirtualBoxImpl.h (modified) (2 diffs)

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

@@ -70 +70 @@
 public:
 
-    DECLARE_EMPTY_CTOR_DTOR (DHCPServer)
+    DECLARE_EMPTY_CTOR_DTOR(DHCPServer)
 
     HRESULT FinalConstruct();
@@ -76 +76 @@
 
     HRESULT init(VirtualBox *aVirtualBox,
-                 IN_BSTR aName);
+                 const com::Utf8Str &aName);
     HRESULT init(VirtualBox *aVirtualBox,
                  const settings::DHCPServer &data);

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

@@ -39 +39 @@
 
     // public methods only for internal purposes
-    const Bstr &i_id() const { return mID; }
-    const Bstr &i_familyId() const { return mFamilyID; }
+    const Utf8Str &i_id() const { return mID; }
+    const Utf8Str &i_familyId() const { return mFamilyID; }
     bool i_is64Bit() const { return !!(mOSHint & VBOXOSHINT_64BIT); }
     bool i_recommendedIOAPIC() const { return !!(mOSHint & VBOXOSHINT_IOAPIC); }
@@ -85 +85 @@
 
 
-    const Bstr mFamilyID;
-    const Bstr mFamilyDescription;
-    const Bstr mID;
-    const Bstr mDescription;
+    const Utf8Str mFamilyID;
+    const Utf8Str mFamilyDescription;
+    const Utf8Str mID;
+    const Utf8Str mDescription;
     const VBOXOSTYPE mOSType;
     const uint32_t mOSHint;

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

@@ -161 +161 @@
     void i_onHostNameResolutionConfigurationChange();
 
-    int i_natNetworkRefInc(IN_BSTR aNetworkName);
-    int i_natNetworkRefDec(IN_BSTR aNetworkName);
+    int i_natNetworkRefInc(const Utf8Str &aNetworkName);
+    int i_natNetworkRefDec(const Utf8Str &aNetworkName);
 
     ComObjPtr<GuestOSType> i_getUnknownOSType();
@@ -199 +199 @@
                                    ComObjPtr<Medium> &pMedium);
 
-    HRESULT i_findGuestOSType(const Bstr &bstrOSType,
-                              GuestOSType*& pGuestOSType);
+    HRESULT i_findGuestOSType(const Utf8Str &strOSType,
+                              ComObjPtr<GuestOSType> &guestOSType);
 
     const Guid &i_getGlobalRegistryId() const;