Changeset 49761 in vbox

Timestamp:

Dec 3, 2013 6:34:22 PM (11 years ago)

Author:

vboxsync

Message:

Main/Host: remove redundant casts, plus lots of whitespace cleanup

File:

• trunk/src/VBox/Main/src-server/HostImpl.cpp (modified) (33 diffs)

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

@@ -509 +509 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// ISnapshot public methods
+// IHost public methods
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ -516 +516 @@
  * Returns a list of host DVD drives.
  *
- * @returns status code
+ * @returns COM status code
  * @param drives address of result pointer
  */
@@ -542 +542 @@
  * Returns a list of host floppy drives.
  *
- * @returns status code
+ * @returns COM status code
  * @param drives address of result pointer
  */
@@ -572 +572 @@
                                   INetCfgComponent *pncc)
 {
-    LPWSTR              lpszName;
-    GUID                IfGuid;
+    LPWSTR lpszName;
+    GUID IfGuid;
     HRESULT hr;
     int rc = VERR_GENERAL_FAILURE;
@@ -612 +612 @@
  * Returns a list of host network interfaces.
  *
- * @returns status code
+ * @returns COM status code
  * @param drives address of result pointer
  */
@@ -618 +618 @@
 {
     aNetworkInterfaces.resize(0);
-#if defined(RT_OS_WINDOWS) ||  defined(VBOX_WITH_NETFLT) /*|| defined(RT_OS_OS2)*/
+#if defined(RT_OS_WINDOWS) || defined(VBOX_WITH_NETFLT) /*|| defined(RT_OS_OS2)*/
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 # ifdef VBOX_WITH_HOSTNETIF_API
@@ -809 +809 @@
     for (size_t i = 0; i < resultArr.size(); ++i)
     {
-         ComObjPtr<IHostUSBDevice> iHu = static_cast<IHostUSBDevice *>(resultArr[i]);
+         ComObjPtr<IHostUSBDevice> iHu = resultArr[i];
          iHu.queryInterfaceTo(aUSBDevices[i].asOutParam());
     }
@@ -913 +913 @@
  * Returns the number of installed logical processors
  *
- * @returns status code
+ * @returns COM status code
  * @param   count address of result variable
  */
@@ -928 +928 @@
  * Returns the number of online logical processors
  *
- * @returns status code
+ * @returns COM status code
  * @param   count address of result variable
  */
@@ -942 +942 @@
  * Returns the number of installed physical processor cores.
  *
- * @returns status code
+ * @returns COM status code
  * @param   count address of result variable
  */
@@ -956 +956 @@
  * Returns the number of installed physical processor cores.
  *
- * @returns status code
+ * @returns COM status code
  * @param   count address of result variable
  */
@@ -970 +970 @@
  * Returns the (approximate) maximum speed of the given host CPU in MHz
  *
- * @returns status code
+ * @returns COM status code
  * @param   cpu id to get info for.
  * @param   speed address of result variable, speed is 0 if unknown or aCpuId is invalid.
@@ -986 +986 @@
  * Returns a description string for the host CPU
  *
- * @returns status code
+ * @returns COM status code
  * @param   cpu id to get info for.
  * @param   description address of result variable, empty string if not known or aCpuId is invalid.
  */
-HRESULT  Host::getProcessorDescription(ULONG aCpuId, com::Utf8Str &aDescription)
+HRESULT Host::getProcessorDescription(ULONG aCpuId, com::Utf8Str &aDescription)
 {
     // no locking required
@@ -1006 +1006 @@
  * Returns whether a host processor feature is supported or not
  *
- * @returns status code
+ * @returns COM status code
  * @param   Feature to query.
  * @param   address of supported bool result variable
  */
-HRESULT  Host::getProcessorFeature(ProcessorFeature_T aFeature, BOOL *aSupported)
+HRESULT Host::getProcessorFeature(ProcessorFeature_T aFeature, BOOL *aSupported)
 {
     /* Validate input. */
@@ -1092 +1092 @@
  * Returns the specific CPUID leaf.
  *
- * @returns status code
+ * @returns COM status code
  * @param   aCpuId              The CPU number. Mostly ignored.
  * @param   aLeaf               The leaf number.
@@ -1126 +1126 @@
  * Returns the amount of installed system memory in megabytes
  *
- * @returns  status code
+ * @returns COM status code
  * @param   size address of result variable
  */
@@ -1144 +1144 @@
  * Returns the current system memory free space in megabytes
  *
- * @returns status code
+ * @returns COM status code
  * @param   available address of result variable
  */
@@ -1162 +1162 @@
  * Returns the name string of the host operating system
  *
- * @returns  status code
+ * @returns COM status code
  * @param   os address of result variable
  */
@@ -1180 +1180 @@
  * Returns the version string of the host operating system
  *
- * @returns status code
+ * @returns COM status code
  * @param   os address of result variable
  */
@@ -1215 +1215 @@
  * Returns the current host time in milliseconds since 1970-01-01 UTC.
  *
- * @returns status code
+ * @returns COM status code
  * @param   time address of result variable
  */
@@ -1265 +1265 @@
     /* No need to lock anything. If there ever will - watch out, the function
      * called below grabs the VirtualBox lock. */
-    IHostNetworkInterface *iHn = static_cast<IHostNetworkInterface *>(aHostInterface);
-    IProgress *iHn2 = static_cast<IProgress *>(aProgress);
+    IHostNetworkInterface *iHn = aHostInterface;
+    IProgress *iHn2 = aProgress;
 
     int r = NetIfCreateHostOnlyNetworkInterface(m->pParent, &iHn, &iHn2);
@@ -1324 +1324 @@
     {
         ComPtr<IHostNetworkInterface> iface;
-        rc  = findHostNetworkInterfaceById(aId, iface);
+        rc = findHostNetworkInterfaceById(aId, iface);
         if (FAILED(rc))
             return setError(VBOX_E_OBJECT_NOT_FOUND,
@@ -1333 +1333 @@
     }
 
-    IProgress *iPr  = static_cast<IProgress *>(aProgress);
+    IProgress *iPr = aProgress;
 
     int r = NetIfRemoveHostOnlyNetworkInterface(m->pParent, Guid(aId).ref(), &iPr);
@@ -1539 +1539 @@
     {
         Bstr n;
-        (*it)->COMGETTER(Name) (n.asOutParam());
+        (*it)->COMGETTER(Name)(n.asOutParam());
         if (n == aName)
             found = *it;
@@ -1576 +1576 @@
     {
         Bstr g;
-        (*it)->COMGETTER(Id) (g.asOutParam());
+        (*it)->COMGETTER(Id)(g.asOutParam());
         if (Guid(g) == aId)
             found = *it;
@@ -1631 +1631 @@
     aDevice = NULL;
     SafeIfaceArray<IHostUSBDevice> devsvec;
-    HRESULT rc = COMGETTER(USBDevices) (ComSafeArrayAsOutParam(devsvec));
+    HRESULT rc = COMGETTER(USBDevices)(ComSafeArrayAsOutParam(devsvec));
     if (FAILED(rc)) return rc;
 
@@ -1637 +1637 @@
     {
         Bstr address;
-        rc = devsvec[i]->COMGETTER(Address) (address.asOutParam());
+        rc = devsvec[i]->COMGETTER(Address)(address.asOutParam());
         if (FAILED(rc)) return rc;
         if (address == aName)
         {
-            return (ComObjPtr<IHostUSBDevice> (devsvec[i]).queryInterfaceTo(aDevice.asOutParam()));
+            return (ComObjPtr<IHostUSBDevice>(devsvec[i]).queryInterfaceTo(aDevice.asOutParam()));
         }
     }
@@ -1665 +1665 @@
 
     SafeIfaceArray<IHostUSBDevice> devsvec;
-    HRESULT rc = COMGETTER(USBDevices) (ComSafeArrayAsOutParam(devsvec));
+    HRESULT rc = COMGETTER(USBDevices)(ComSafeArrayAsOutParam(devsvec));
     if (FAILED(rc)) return rc;
 
@@ -1671 +1671 @@
     {
         Bstr id;
-        rc = devsvec[i]->COMGETTER(Id) (id.asOutParam());
+        rc = devsvec[i]->COMGETTER(Id)(id.asOutParam());
         if (FAILED(rc)) return rc;
         if (Guid(id) == aId)
         {
-            return (ComObjPtr<IHostUSBDevice> (devsvec[i]).queryInterfaceTo(aDevice.asOutParam()));
+            return (ComObjPtr<IHostUSBDevice>(devsvec[i]).queryInterfaceTo(aDevice.asOutParam()));
         }
     }
@@ -1699 +1699 @@
  * Returns a list of host video capture devices (webcams, etc).
  *
- * @returns status code
+ * @returns COM status code
  * @param aVideoInputDevices Array of interface pointers to be filled.
  */
@@ -1802 +1802 @@
  * @param fRefresh Whether to refresh the host drives list even if this is not the first call.
  * @param pll Caller's pointer which gets set to the static list of host drives.
- * @return
+ * @returns COM status code
  */
 HRESULT Host::i_getDrives(DeviceType_T mediumType,
@@ -2986 +2986 @@
         bool fGone = true;
         Bstr nameOld;
-        (*itOld)->COMGETTER(Name) (nameOld.asOutParam());
+        (*itOld)->COMGETTER(Name)(nameOld.asOutParam());
         for (itNew = listCopy.begin(); itNew != listCopy.end(); ++itNew)
         {
             Bstr nameNew;
-            (*itNew)->COMGETTER(Name) (nameNew.asOutParam());
+            (*itNew)->COMGETTER(Name)(nameNew.asOutParam());
             if (nameNew == nameOld)
             {
@@ -3019 +3019 @@
         {
             Bstr n;
-            (*itNew)->COMGETTER(Name) (n.asOutParam());
+            (*itNew)->COMGETTER(Name)(n.asOutParam());
             LogRel(("Host::updateNetIfList: failed to get interface type for %ls\n", n.raw()));
         }