Index: /trunk/src/VBox/Main/HardDiskImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/HardDiskImpl.cpp	(revision 22778)
+++ /trunk/src/VBox/Main/HardDiskImpl.cpp	(revision 22779)
@@ -1899,5 +1899,5 @@
 /**
  * Returns @c true if this hard disk cannot be modified because it has
- * dependants (children) or is part of the snapshot. Related to the hard disk
+ * dependents (children) or is part of the snapshot. Related to the hard disk
  * type and posterity, not to the current media state.
  *
Index: /trunk/src/VBox/Main/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/MachineImpl.cpp	(revision 22778)
+++ /trunk/src/VBox/Main/MachineImpl.cpp	(revision 22779)
@@ -2115,5 +2115,5 @@
                                      LONG aDevice)
 {
-    LogFlowThisFunc (("aControllerName=\"%ls\" aControllerPort=%ld aDevice=%ld\n",
+    LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%ld aDevice=%ld\n",
                      aControllerName, aControllerPort, aDevice));
 
@@ -2131,12 +2131,13 @@
     /// @todo NEWMEDIA implicit machine registration
     if (!mData->mRegistered)
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("Cannot attach hard disks to an unregistered machine"));
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("Cannot attach hard disks to an unregistered machine"));
 
     AssertReturn(mData->mMachineState != MachineState_Saved, E_FAIL);
 
-    if (Global::IsOnlineOrTransient (mData->mMachineState))
-        return setError (VBOX_E_INVALID_VM_STATE,
-            tr ("Invalid machine state: %d"), mData->mMachineState);
+    if (Global::IsOnlineOrTransient(mData->mMachineState))
+        return setError(VBOX_E_INVALID_VM_STATE,
+                        tr("Invalid machine state: %d"),
+                        mData->mMachineState);
 
     /* Check for an existing controller. */
@@ -2158,14 +2159,13 @@
         || (aDevice >= (LONG)devicesPerPort)
        )
-        return setError (E_INVALIDARG,
-            tr ("The port and/or count parameter are out of range [%lu:%lu]"),
-                portCount, devicesPerPort);
+        return setError(E_INVALIDARG,
+                        tr("The port and/or count parameter are out of range [%lu:%lu]"),
+                        portCount,
+                        devicesPerPort);
 
     /* check if the device slot is already busy */
-    HDData::AttachmentList::const_iterator it =
-        std::find_if (mHDData->mAttachments.begin(),
-                      mHDData->mAttachments.end(),
-                      HardDiskAttachment::EqualsTo (aControllerName, aControllerPort, aDevice));
-
+    HDData::AttachmentList::const_iterator it = std::find_if(mHDData->mAttachments.begin(),
+                                                             mHDData->mAttachments.end(),
+                                                             HardDiskAttachment::EqualsTo(aControllerName, aControllerPort, aDevice));
     if (it != mHDData->mAttachments.end())
     {
@@ -2189,8 +2189,8 @@
     AutoWriteLock hdLock (hd);
 
-    if (std::find_if (mHDData->mAttachments.begin(),
-                      mHDData->mAttachments.end(),
-                      HardDiskAttachment::RefersTo (hd)) !=
-            mHDData->mAttachments.end())
+    if (std::find_if(mHDData->mAttachments.begin(),
+                     mHDData->mAttachments.end(),
+                     HardDiskAttachment::RefersTo (hd))
+         != mHDData->mAttachments.end())
     {
         return setError(VBOX_E_OBJECT_IN_USE,