Changeset 16867 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 17, 2009 5:00:56 PM (16 years ago)

Author:

vboxsync

Message:

Main: rename IHardDiskImage2 to IHardDiskImage; rename IFloppyImage2 to IFloppyImage; rename all media-related methods with a '2' suffix

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (4 diffs)
• include/VBoxNewHDWzd.h (modified) (2 diffs)
• include/VBoxNewVMWzd.h (modified) (1 diff)
• include/VBoxProblemReporter.h (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (9 diffs)
• src/VBoxMediaManagerDlg.cpp (modified) (7 diffs)
• src/VBoxNewHDWzd.cpp (modified) (1 diff)
• src/VBoxNewVMWzd.cpp (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)
• src/VBoxVMFirstRunWzd.cpp (modified) (1 diff)
• src/VBoxVMInformationDlg.cpp (modified) (5 diffs)
• src/VBoxVMSettingsFD.cpp (modified) (1 diff)
• src/VBoxVMSettingsHD.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -146 +146 @@
     }
 
-    const CHardDisk2 &hardDisk() const { return mHardDisk; }
+    const CHardDisk &hardDisk() const { return mHardDisk; }
     const CDVDImage &dvdImage() const { return mDVDImage; }
-    const CFloppyImage2 &floppyImage() const { return mFloppyImage; }
+    const CFloppyImage &floppyImage() const { return mFloppyImage; }
 
     QUuid id() const { return mId; }
@@ -246 +246 @@
     COMResult mResult;
 
-    CHardDisk2 mHardDisk;
+    CHardDisk mHardDisk;
     CDVDImage mDVDImage;
-    CFloppyImage2 mFloppyImage;
+    CFloppyImage mFloppyImage;
 
     QUuid mId;
@@ -613 +613 @@
      * normal hard disks that have a parent.
      */
-    QString hardDiskTypeString (const CHardDisk2 &aHD) const
+    QString hardDiskTypeString (const CHardDisk &aHD) const
     {
         if (!aHD.GetParent().isNull())
@@ -799 +799 @@
     /* details generators */
 
-    QString details (const CHardDisk2 &aHD, bool aPredictDiff);
+    QString details (const CHardDisk &aHD, bool aPredictDiff);
 
     QString details (const CUSBDevice &aDevice) const;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxNewHDWzd.h

@@ -39 +39 @@
     VBoxNewHDWzd (QWidget *aParent = 0);
 
-    CHardDisk2 hardDisk() { return mHD; }
+    CHardDisk hardDisk() { return mHD; }
     void setRecommendedFileName (const QString &aName);
     void setRecommendedSize (quint64 aSize);
@@ -66 +66 @@
 
     QIWidgetValidator *mWValNameAndSize;
-    CHardDisk2         mHD;
+    CHardDisk          mHD;
     int                mSliderScale;
     quint64            mMaxVDISize;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxNewVMWzd.h

@@ -67 +67 @@
     QIWidgetValidator *mWvalMemory;
     QIWidgetValidator *mWvalHDD;
-    CHardDisk2 mHardDisk;
+    CHardDisk mHardDisk;
     CMachine mMachine;
 };

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -264 +264 @@
     int confirmDeleteHardDiskStorage (QWidget *aParent,
                                       const QString &aLocation);
-    void cannotDeleteHardDiskStorage (QWidget *aParent, const CHardDisk2 &aHD,
+    void cannotDeleteHardDiskStorage (QWidget *aParent, const CHardDisk &aHD,
                                       const CProgress &aProgress);
 
@@ -272 +272 @@
     void cannotCreateHardDiskStorage (QWidget *aParent, const CVirtualBox &aVBox,
                                       const QString &aLocaiton,
-                                      const CHardDisk2 &aHD,
+                                      const CHardDisk &aHD,
                                       const CProgress &aProgress);
     void cannotAttachHardDisk (QWidget *aParent, const CMachine &aMachine,

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1917 +1917 @@
         QString data;
         bool hasDisks = false;
-        CHardDisk2AttachmentVector vec = cmachine.GetHardDisk2Attachments();
-        for (CHardDisk2AttachmentVector::ConstIterator hda = vec.begin();
+        CHardDiskAttachmentVector vec = cmachine.GetHardDiskAttachments();
+        for (CHardDiskAttachmentVector::ConstIterator hda = vec.begin();
              hda != vec.end(); ++ hda)
         {
-            CHardDisk2 hd = hda->GetHardDisk();
+            CHardDisk hd = hda->GetHardDisk();
             data += QString ("<br><nobr><b>%1 %2</b>: %3</nobr>")
                 .arg (vboxGlobal().toString (hda->GetBus(), hda->GetChannel()))

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -219 +219 @@
          * to an item from VBoxGlobal::currentMediaList()) */
 
-        CHardDisk2 parent = mHardDisk.GetParent();
+        CHardDisk parent = mHardDisk.GetParent();
         Assert (!parent.isNull() || mParent == NULL);
 
@@ -1938 +1938 @@
  *       @todo in VBoxMedium::details()).
  */
-QString VBoxGlobal::details (const CHardDisk2 &aHD,
+QString VBoxGlobal::details (const CHardDisk &aHD,
                              bool aPredictDiff)
 {
@@ -2161 +2161 @@
         int rows = 2; /* including section header and footer */
 
-        CHardDisk2AttachmentVector vec = aMachine.GetHardDisk2Attachments();
+        CHardDiskAttachmentVector vec = aMachine.GetHardDiskAttachments();
         for (size_t i = 0; i < (size_t) vec.size(); ++ i)
         {
-            CHardDisk2Attachment hda = vec [i];
-            CHardDisk2 hd = hda.GetHardDisk();
+            CHardDiskAttachment hda = vec [i];
+            CHardDisk hd = hda.GetHardDisk();
 
             /// @todo for the explaination of the below isOk() checks, see ***
@@ -2332 +2332 @@
             case KDriveState_ImageMounted:
             {
-                CFloppyImage2 img = floppy.GetImage();
+                CFloppyImage img = floppy.GetImage();
                 item = QString (sSectionItemTpl2)
                     .arg (tr ("Image", "details report (floppy)"),
@@ -2915 +2915 @@
  */
 static
-void AddHardDisksToList (const CHardDisk2Vector &aVector,
+void AddHardDisksToList (const CHardDiskVector &aVector,
                          VBoxMediaList &aList,
                          VBoxMediaList::iterator aWhere,
@@ -2923 +2923 @@
 
     /* First pass: Add siblings sorted */
-    for (CHardDisk2Vector::ConstIterator it = aVector.begin();
+    for (CHardDiskVector::ConstIterator it = aVector.begin();
          it != aVector.end(); ++ it)
     {
@@ -2945 +2945 @@
     for (VBoxMediaList::iterator it = first; it != aWhere;)
     {
-        CHardDisk2Vector children = (*it).hardDisk().GetChildren();
+        CHardDiskVector children = (*it).hardDisk().GetChildren();
         VBoxMedium *parent = &(*it);
 
@@ -2997 +2997 @@
     mMediaList.clear();
     {
-        AddHardDisksToList (mVBox.GetHardDisks2(), mMediaList, mMediaList.end());
+        AddHardDisksToList (mVBox.GetHardDisks(), mMediaList, mMediaList.end());
     }
     {
@@ -3025 +3025 @@
         VBoxMediaList::iterator first = mMediaList.end();
 
-        CFloppyImage2Vector vec = mVBox.GetFloppyImages();
-        for (CFloppyImage2Vector::ConstIterator it = vec.begin();
+        CFloppyImageVector vec = mVBox.GetFloppyImages();
+        for (CFloppyImageVector::ConstIterator it = vec.begin();
              it != vec.end(); ++ it)
         {

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp

@@ -972 +972 @@
     if (dlg.exec() == QDialog::Accepted)
     {
-        CHardDisk2 hd = dlg.hardDisk();
+        CHardDisk hd = dlg.hardDisk();
         /* Select the newly created hard disk */
         MediaItem *item = searchItem (mHardDiskView, hd.GetId());
@@ -1094 +1094 @@
             }
 
-            CHardDisk2 hardDisk = item->medium().hardDisk();
+            CHardDisk hardDisk = item->medium().hardDisk();
 
             if (deleteStorage)
@@ -1134 +1134 @@
         case VBoxDefs::MediaType_Floppy:
         {
-            CFloppyImage2 image = item->medium().floppyImage();
+            CFloppyImage image = item->medium().floppyImage();
             image.Close();
             result = image;
@@ -1232 +1232 @@
         case VBoxDefs::MediaType_HardDisk:
         {
-            CHardDisk2AttachmentVector vec =machine.GetHardDisk2Attachments();
+            CHardDiskAttachmentVector vec =machine.GetHardDiskAttachments();
             for (int i = 0; i < vec.size(); ++ i)
             {
-                CHardDisk2Attachment hda = vec [i];
+                CHardDiskAttachment hda = vec [i];
                 if (hda.GetHardDisk().GetId() == aMedium.id())
                 {
-                    machine.DetachHardDisk2 (hda.GetBus(),
-                                             hda.GetChannel(),
-                                             hda.GetDevice());
+                    machine.DetachHardDisk(hda.GetBus(),
+                                           hda.GetChannel(),
+                                           hda.GetDevice());
                     if (!machine.isOk())
                     {
@@ -1543 +1543 @@
         case VBoxDefs::MediaType_HardDisk:
         {
-            CHardDisk2 hd = mVBox.OpenHardDisk2 (aLocation);
+            CHardDisk hd = mVBox.OpenHardDisk(aLocation);
             if (mVBox.isOk())
             {
@@ -1565 +1565 @@
         case VBoxDefs::MediaType_Floppy:
         {
-            CFloppyImage2 image = mVBox.OpenFloppyImage (aLocation, uuid);
+            CFloppyImage image = mVBox.OpenFloppyImage (aLocation, uuid);
             if (mVBox.isOk())
             {
@@ -1591 +1591 @@
     MediaItem *item = 0;
 
-    CHardDisk2 parent = aMedium.hardDisk().GetParent();
+    CHardDisk parent = aMedium.hardDisk().GetParent();
     if (parent.isNull())
     {

trunk/src/VBox/Frontends/VirtualBox/src/VBoxNewHDWzd.cpp

@@ -384 +384 @@
     CProgress progress;
 
-    CHardDisk2 hd = vbox.CreateHardDisk2 (QString ("VDI"), loc);
+    CHardDisk hd = vbox.CreateHardDisk(QString ("VDI"), loc);
 
     if (!vbox.isOk())

trunk/src/VBox/Frontends/VirtualBox/src/VBoxNewVMWzd.cpp

@@ -352 +352 @@
         {
             CMachine m = session.GetMachine();
-            m.AttachHardDisk2 (mHDCombo->id(), KStorageBus_IDE, 0, 0);
+            m.AttachHardDisk(mHDCombo->id(), KStorageBus_IDE, 0, 0);
             if (m.isOk())
             {

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -1203 +1203 @@
 
 void VBoxProblemReporter::cannotDeleteHardDiskStorage (QWidget *aParent,
-                                                       const CHardDisk2 &aHD,
+                                                       const CHardDisk &aHD,
                                                        const CProgress &aProgress)
 {
-    /* below, we use CHardDisk2 (aHD) to preserve current error info
+    /* below, we use CHardDisk (aHD) to preserve current error info
      * for formatErrorInfo() */
 
     message (aParent, Error,
         tr ("Failed to delete the storage unit of the hard disk <b>%1</b>.")
-            .arg (CHardDisk2 (aHD).GetLocation()),
+            .arg (CHardDisk (aHD).GetLocation()),
         !aHD.isOk() ? formatErrorInfo (aHD) :
         !aProgress.isOk() ? formatErrorInfo (aProgress) :
@@ -1248 +1248 @@
 void VBoxProblemReporter::cannotCreateHardDiskStorage (
     QWidget *aParent, const CVirtualBox &aVBox, const QString &aLocation,
-    const CHardDisk2 &aHD, const CProgress &aProgress)
+    const CHardDisk &aHD, const CProgress &aProgress)
 {
     message (aParent, Error,

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -872 +872 @@
             CMachine machine = session.GetMachine();
             /* Detach all attached Hard Disks */
-            CHardDisk2AttachmentVector vec = machine.GetHardDisk2Attachments();
+            CHardDiskAttachmentVector vec = machine.GetHardDiskAttachments();
             for (int i = 0; i < vec.size(); ++ i)
             {
-                CHardDisk2Attachment hda = vec [i];
-                machine.DetachHardDisk2 (hda.GetBus(), hda.GetChannel(), hda.GetDevice());
+                CHardDiskAttachment hda = vec [i];
+                machine.DetachHardDisk(hda.GetBus(), hda.GetChannel(), hda.GetDevice());
                 if (!machine.isOk())
                     vboxProblem().cannotDetachHardDisk (this, machine,

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMFirstRunWzd.cpp

@@ -36 +36 @@
 
     /* Hide unnecessary text labels */
-    CHardDisk2AttachmentVector vec = mMachine.GetHardDisk2Attachments();
+    CHardDiskAttachmentVector vec = mMachine.GetHardDiskAttachments();
     if (vec.size() != 0)
     {

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

@@ -467 +467 @@
 
         /* IDE Hard Disk (Primary Master) */
-        if (!m.GetHardDisk2 (KStorageBus_IDE, 0, 0).isNull())
+        if (!m.GetHardDisk(KStorageBus_IDE, 0, 0).isNull())
         {
             hdStat += formatHardDisk (KStorageBus_IDE, 0, 0, "IDE00");
@@ -474 +474 @@
 
         /* IDE Hard Disk (Primary Slave) */
-        if (!m.GetHardDisk2 (KStorageBus_IDE, 0, 1).isNull())
+        if (!m.GetHardDisk(KStorageBus_IDE, 0, 1).isNull())
         {
             hdStat += formatHardDisk (KStorageBus_IDE, 0, 1, "IDE01");
@@ -481 +481 @@
 
         /* IDE Hard Disk (Secondary Slave) */
-        if (!m.GetHardDisk2 (KStorageBus_IDE, 1, 1).isNull())
+        if (!m.GetHardDisk(KStorageBus_IDE, 1, 1).isNull())
         {
             hdStat += formatHardDisk (KStorageBus_IDE, 1, 1, "IDE11");
@@ -490 +490 @@
         for (int i = 0; i < 30; ++ i)
         {
-            if (!m.GetHardDisk2 (KStorageBus_SATA, i, 0).isNull())
+            if (!m.GetHardDisk(KStorageBus_SATA, i, 0).isNull())
             {
                 hdStat += formatHardDisk (KStorageBus_SATA, i, 0,
@@ -574 +574 @@
         return QString::null;
 
-    CHardDisk2 hd = mSession.GetMachine().GetHardDisk2 (aBus, aChannel, aDevice);
+    CHardDisk hd = mSession.GetMachine().GetHardDisk(aBus, aChannel, aDevice);
     QString header = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td></tr>";
     QString name = vboxGlobal().toFullString (aBus, aChannel, aDevice);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsFD.cpp

@@ -110 +110 @@
         case KDriveState_ImageMounted:
         {
-            CFloppyImage2 img = floppy.GetImage();
+            CFloppyImage img = floppy.GetImage();
             QString src = img.GetLocation();
             AssertMsg (!src.isNull(), ("Image file must not be null"));

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsHD.cpp

@@ -77 +77 @@
 
     VBoxMedium medium = vboxGlobal().getMedium (
-        CMedium (vboxGlobal().virtualBox().GetHardDisk2 (aId)));
+        CMedium (vboxGlobal().virtualBox().GetHardDisk(aId)));
     medium.refresh();
     bool noDiffs = !HDSettings::instance()->showDiffs();
@@ -662 +662 @@
 
     /* Load attachments list */
-    CHardDisk2AttachmentVector vec = mMachine.GetHardDisk2Attachments();
+    CHardDiskAttachmentVector vec = mMachine.GetHardDiskAttachments();
     for (int i = 0; i < vec.size(); ++ i)
     {
-        CHardDisk2Attachment hda = vec [i];
+        CHardDiskAttachment hda = vec [i];
         SlotValue slot (hda.GetBus(), hda.GetChannel(), hda.GetDevice());
         DiskValue disk (hda.GetHardDisk().GetId());
@@ -687 +687 @@
 
     /* Detach all attached Hard Disks */
-    CHardDisk2AttachmentVector vec = mMachine.GetHardDisk2Attachments();
+    CHardDiskAttachmentVector vec = mMachine.GetHardDiskAttachments();
     for (int i = 0; i < vec.size(); ++ i)
     {
-        CHardDisk2Attachment hda = vec [i];
-        mMachine.DetachHardDisk2 (hda.GetBus(), hda.GetChannel(), hda.GetDevice());
+        CHardDiskAttachment hda = vec [i];
+        mMachine.DetachHardDisk(hda.GetBus(), hda.GetChannel(), hda.GetDevice());
 
         /* [dsen] check this */
@@ -708 +708 @@
             maxSATAPort = maxSATAPort < (list [i].slot.channel + 1) ?
                           (list [i].slot.channel + 1) : maxSATAPort;
-        mMachine.AttachHardDisk2 (list [i].disk.id,
+        mMachine.AttachHardDisk(list [i].disk.id,
             list [i].slot.bus, list [i].slot.channel, list [i].slot.device);
 
@@ -715 +715 @@
             vboxProblem().cannotAttachHardDisk (this, mMachine,
                 vboxGlobal().getMedium (CMedium (vboxGlobal().virtualBox()
-                .GetHardDisk2 (list [i].disk.id))).location(),
+                .GetHardDisk(list [i].disk.id))).location(),
                 list [i].slot.bus, list [i].slot.channel, list [i].slot.device);
     }