Changeset 17685 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 11, 2009 12:22:40 PM (16 years ago)

Author:

vboxsync

Message:

Main: Rename the port paramter of the AttachHardDisk, GetHardDisk, DetachHardDisk methods to controllerPort because the name clashes with a class member in the java bindings

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (12 diffs)
• idl/VirtualBox.xidl (modified) (3 diffs)
• include/MachineImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1886 +1886 @@
 
 STDMETHODIMP Machine::AttachHardDisk(IN_GUID aId,
-                                     IN_BSTR aControllerName, LONG aPort,
+                                     IN_BSTR aControllerName, LONG aControllerPort,
                                      LONG aDevice)
 {
@@ -1927 +1927 @@
     CheckComRCReturnRC(rc);
 
-    if (   (aPort < 0) || (aPort >= portCount)
+    if (   (aControllerPort < 0) || (aControllerPort >= portCount)
         || (aDevice < 0) || (aDevice >= devicesPerPort))
         return setError (E_INVALIDARG,
@@ -1937 +1937 @@
         std::find_if (mHDData->mAttachments.begin(),
                       mHDData->mAttachments.end(),
-                      HardDiskAttachment::EqualsTo (aControllerName, aPort, aDevice));
+                      HardDiskAttachment::EqualsTo (aControllerName, aControllerPort, aDevice));
 
     if (it != mHDData->mAttachments.end())
@@ -1946 +1946 @@
             tr ("Hard disk '%ls' is already attached to device slot %d on "
                 "port %d of controller '%ls' of this virtual machine"),
-            hd->locationFull().raw(), aDevice, aPort, aControllerName);
+            hd->locationFull().raw(), aDevice, aControllerPort, aControllerName);
     }
 
@@ -1993 +1993 @@
                 /* see if it's the same bus/channel/device */
                 if ((*it)->device() == aDevice &&
-                    (*it)->port() == aPort &&
+                    (*it)->port() == aControllerPort &&
                     (*it)->controller() == aControllerName)
                 {
@@ -2051 +2051 @@
                          */
                         if ((*it)->device() == aDevice &&
-                            (*it)->port() == aPort &&
+                            (*it)->port() == aControllerPort &&
                             (*it)->controller() == aControllerName)
                         {
@@ -2111 +2111 @@
                          */
                         if ((*it)->device() == aDevice &&
-                            (*it)->port() == aPort &&
+                            (*it)->port() == aControllerPort &&
                             (*it)->controller() == aControllerName)
                         {
@@ -2187 +2187 @@
     ComObjPtr<HardDiskAttachment> attachment;
     attachment.createObject();
-    rc = attachment->init (hd, aControllerName, aPort, aDevice, indirect);
+    rc = attachment->init (hd, aControllerName, aControllerPort, aDevice, indirect);
     CheckComRCReturnRC (rc);
 
@@ -2206 +2206 @@
 }
 
-STDMETHODIMP Machine::GetHardDisk(IN_BSTR aControllerName, LONG aPort,
+STDMETHODIMP Machine::GetHardDisk(IN_BSTR aControllerName, LONG aControllerPort,
                                   LONG aDevice, IHardDisk **aHardDisk)
 {
@@ -2225 +2225 @@
         std::find_if (mHDData->mAttachments.begin(),
                       mHDData->mAttachments.end(),
-                      HardDiskAttachment::EqualsTo (aControllerName, aPort, aDevice));
+                      HardDiskAttachment::EqualsTo (aControllerName, aControllerPort, aDevice));
 
     if (it == mHDData->mAttachments.end())
         return setError (VBOX_E_OBJECT_NOT_FOUND,
             tr ("No hard disk attached to device slot %d on port %d of controller '%ls'"),
-            aDevice, aPort, aControllerName);
+            aDevice, aControllerPort, aControllerName);
 
     (*it)->hardDisk().queryInterfaceTo (aHardDisk);
@@ -2237 +2237 @@
 }
 
-STDMETHODIMP Machine::DetachHardDisk(IN_BSTR aControllerName, LONG aPort,
+STDMETHODIMP Machine::DetachHardDisk(IN_BSTR aControllerName, LONG aControllerPort,
                                      LONG aDevice)
 {
@@ -2262 +2262 @@
         std::find_if (mHDData->mAttachments.begin(),
                       mHDData->mAttachments.end(),
-                      HardDiskAttachment::EqualsTo (aControllerName, aPort, aDevice));
+                      HardDiskAttachment::EqualsTo (aControllerName, aControllerPort, aDevice));
 
     if (it == mHDData->mAttachments.end())
         return setError (VBOX_E_OBJECT_NOT_FOUND,
             tr ("No hard disk attached to device slot %d on port %d of controller '%ls'"),
-            aDevice, aPort, aControllerName);
+            aDevice, aControllerPort, aControllerName);
 
     ComObjPtr<HardDiskAttachment> hda = *it;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4323 +4323 @@
         <desc>Name of the storage controller to attach the hard disk to.</desc>
       </param>
-      <param name="port" type="long" dir="in">
+      <param name="controllerPort" type="long" dir="in">
         <desc>Port to attach the hard disk to.</desc>
       </param>
@@ -4352 +4352 @@
         <desc>Name of the storage controller the hard disk is attached to.</desc>
       </param>
-      <param name="port" type="long" dir="in">
+      <param name="controllerPort" type="long" dir="in">
         <desc>Port to query.</desc>
       </param>
@@ -4401 +4401 @@
         <desc>name of the storage controller to detach the hard disk from.</desc>
       </param>
-      <param name="port" type="long" dir="in">
+      <param name="controllerPort" type="long" dir="in">
         <desc>Port number to detach the hard disk from.</desc>
       </param>

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

@@ -540 +540 @@
     STDMETHOD(GetBootOrder)(ULONG aPosition, DeviceType_T *aDevice);
     STDMETHOD(AttachHardDisk)(IN_GUID aId, IN_BSTR aControllerName,
-                              LONG aPort, LONG aDevice);
-    STDMETHOD(GetHardDisk)(IN_BSTR aControllerName, LONG aPort, LONG aDevice,
+                              LONG aControllerPort, LONG aDevice);
+    STDMETHOD(GetHardDisk)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice,
                            IHardDisk **aHardDisk);
-    STDMETHOD(DetachHardDisk)(IN_BSTR aControllerName, LONG aPort, LONG aDevice);
+    STDMETHOD(DetachHardDisk)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice);
     STDMETHOD(GetSerialPort) (ULONG slot, ISerialPort **port);
     STDMETHOD(GetParallelPort) (ULONG slot, IParallelPort **port);