Changeset 9217 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 29, 2008 11:36:05 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Notation updates.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp (modified) (34 diffs)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

@@ -65 +65 @@
 
     void setMedia (const VBoxMedia &aMedia) { mMedia = aMedia; }
-    const VBoxMedia &getMedia() const { return mMedia; }
+    const VBoxMedia &media() const { return mMedia; }
 
     void setPath (const QString &aPath) { mPath = aPath; }
-    const QString &getPath() const { return mPath; }
+    const QString &path() const { return mPath; }
 
     void setUsage (const QString &aUsage) { mUsage = aUsage; }
-    const QString &getUsage() const { return mUsage; }
+    const QString &usage() const { return mUsage; }
 
     void setSnapshotUsage (const QString &aSnapshotUsage) { mSnapshotUsage = aSnapshotUsage; }
-    const QString &getSnapshotUsage() const { return mSnapshotUsage; }
-
-    QString getTotalUsage() const
-    {
-        /* should correlate with VBoxDiskImageManagerDlg::compose[Cd/Fd]Tooltip */
+    const QString &snapshotUsage() const { return mSnapshotUsage; }
+
+    QString totalUsage() const
+    {
+        /* Should correlate with VBoxDiskImageManagerDlg::compose[Cd/Fd]Tooltip */
         return mSnapshotUsage.isNull() ? mUsage :
             QString ("%1 (%2)").arg (mUsage, mSnapshotUsage);
@@ -84 +84 @@
 
     void setSnapshotName (const QString &aSnapshotName) { mSnapshotName = aSnapshotName; }
-    const QString &getSnapshotName() const { return mSnapshotName; }
+    const QString &snapshotName() const { return mSnapshotName; }
 
     void setDiskType (const QString &aDiskType) { mDiskType = aDiskType; }
-    const QString &getDiskType() const { return mDiskType; }
+    const QString &diskType() const { return mDiskType; }
 
     void setStorageType (const QString &aStorageType) { mStorageType = aStorageType; }
-    const QString &getStorageType() const { return mStorageType; }
+    const QString &storageType() const { return mStorageType; }
 
     void setVirtualSize (const QString &aVirtualSize) { mVirtualSize = aVirtualSize; }
-    const QString &getVirtualSize() const { return mVirtualSize; }
+    const QString &virtualSize() const { return mVirtualSize; }
 
     void setActualSize (const QString &aActualSize) { mActualSize = aActualSize; }
-    const QString &getActualSize() const { return mActualSize; }
+    const QString &ActualSize() const { return mActualSize; }
 
     void setUuid (const QUuid &aUuid) { mUuid = aUuid; }
-    const QUuid &getUuid() const { return mUuid; }
+    const QUuid &uuid() const { return mUuid; }
 
     void setMachineId (const QUuid &aMachineId) { mMachineId = aMachineId; }
-    const QUuid &getMachineId() const { return mMachineId; }
+    const QUuid &machineId() const { return mMachineId; }
 
     void setStatus (VBoxMedia::Status aStatus) { mStatus = aStatus; }
-    VBoxMedia::Status getStatus() const { return mStatus; }
+    VBoxMedia::Status status() const { return mStatus; }
 
     void setToolTip (const QString& aToolTip) 
@@ -113 +113 @@
             QTreeWidgetItem::setToolTip (i, mToolTip);
     }
-    const QString &getToolTip() const { return mToolTip; }
-
-    QString getInformation (const QString &aInfo, bool aCompact = true,
-                            const QString &aElipsis = "middle")
+    const QString &toolTip() const { return mToolTip; }
+
+    QString information (const QString &aInfo, bool aCompact = true,
+                         const QString &aElipsis = "middle")
     {
         QString compactString = QString ("<compact elipsis=\"%1\">").arg (aElipsis);
@@ -150 +150 @@
 protected:
 
+    /* Protected member vars */
     VBoxMedia mMedia;
 
@@ -186 +187 @@
     DiskImageItemIterator& operator++()
     {
-        return (DiskImageItemIterator&) QTreeWidgetItemIterator::operator++();
+        return static_cast<DiskImageItemIterator&> (QTreeWidgetItemIterator::operator++());
     }
 };
@@ -197 +198 @@
         : QIRichLabel (aParent), mLabel (aLabel) {}
 
-    QLabel* label() { return mLabel; }
+    QLabel* label() const { return mLabel; }
 
 private:
 
+    /* Private member vars */
     QLabel *mLabel;
 };
@@ -409 +411 @@
              &vboxProblem(), SLOT (showHelpHelpDialog()));
 
-
     /* Applying language settings */
     retranslateUi();
 }
-
 
 void VBoxDiskImageManagerDlg::setup (int aType, bool aDoSelect,
@@ -525 +525 @@
 int VBoxDiskImageManagerDlg::exec()
 {
-    AssertMsg (!mEventLoop, ("exec is called recursively"));
+    AssertMsg (!mEventLoop, ("exec is called recursively!\n"));
 
     /* Reset the result code */
@@ -558 +558 @@
     DiskImageItem *item = toDiskImageItem (selectedItem (tree));
     if (item)
-        uuid = item->getUuid();
+        uuid = item->uuid();
 
     return uuid;
@@ -570 +570 @@
     DiskImageItem *item = toDiskImageItem (selectedItem (tree));
     if (item)
-        path = item->getPath().trimmed();
+        path = item->path().trimmed();
 
     return path;
@@ -580 +580 @@
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    QUuid machineId = aItem ? aItem->getMachineId() : aHd.GetMachineId();
-
-    QString src = aItem ? aItem->getPath() : aHd.GetLocation();
+    QUuid machineId = aItem ? aItem->machineId() : aHd.GetMachineId();
+
+    QString src = aItem ? aItem->path() : aHd.GetLocation();
     QString location = aItem || aHd.GetStorageType() == KHardDiskStorageType_ISCSIHardDisk ? src :
         QDir::convertSeparators (QFileInfo (src).absoluteFilePath());
 
-    QString storageType = aItem ? aItem->getStorageType() :
+    QString storageType = aItem ? aItem->storageType() :
         vboxGlobal().toString (aHd.GetStorageType());
-    QString hardDiskType = aItem ? aItem->getDiskType() :
+    QString hardDiskType = aItem ? aItem->diskType() :
         vboxGlobal().hardDiskTypeString (aHd);
 
     QString usage;
     if (aItem)
-        usage = aItem->getUsage();
+        usage = aItem->usage();
     else if (!machineId.isNull())
         usage = vbox.GetMachine (machineId).GetName();
 
-    QUuid snapshotId = aItem ? aItem->getUuid() : aHd.GetSnapshotId();
+    QUuid snapshotId = aItem ? aItem->uuid() : aHd.GetSnapshotId();
     QString snapshotName;
     if (aItem)
-        snapshotName = aItem->getSnapshotName();
+        snapshotName = aItem->snapshotName();
     else if (!machineId.isNull() && !snapshotId.isNull())
     {
@@ -664 +664 @@
                                                    DiskImageItem *aItem)
 {
-    QString location = aItem ? aItem->getPath() :
+    QString location = aItem ? aItem->path() :
         QDir::convertSeparators (QFileInfo (aCd.GetFilePath()).absoluteFilePath());
-    QUuid uuid = aItem ? aItem->getUuid() : aCd.GetId();
+    QUuid uuid = aItem ? aItem->uuid() : aCd.GetId();
     QString usage;
     if (aItem)
-        usage = aItem->getTotalUsage();
+        usage = aItem->totalUsage();
     else
     {
@@ -730 +730 @@
                                                    DiskImageItem *aItem)
 {
-    QString location = aItem ? aItem->getPath() :
+    QString location = aItem ? aItem->path() :
         QDir::convertSeparators (QFileInfo (aFd.GetFilePath()).absoluteFilePath());
-    QUuid uuid = aItem ? aItem->getUuid() : aFd.GetId();
+    QUuid uuid = aItem ? aItem->uuid() : aFd.GetId();
     QString usage;
     if (aItem)
-        usage = aItem->getTotalUsage();
+        usage = aItem->totalUsage();
     else
     {
@@ -961 +961 @@
         case VBoxDefs::HD:
             item = createHdItem (mHdsTree, aMedia);
-            if (item->getUuid() == mHdSelectedId)
+            if (item->uuid() == mHdSelectedId)
             {
                 setCurrentItem (mHdsTree, item);
@@ -969 +969 @@
         case VBoxDefs::CD:
             item = createCdItem (mCdsTree, aMedia);
-            if (item->getUuid() == mCdSelectedId)
+            if (item->uuid() == mCdSelectedId)
             {
                 setCurrentItem (mCdsTree, item);
@@ -977 +977 @@
         case VBoxDefs::FD:
             item = createFdItem (mFdsTree, aMedia);
-            if (item->getUuid() == mFdSelectedId)
+            if (item->uuid() == mFdSelectedId)
             {
                 setCurrentItem (mFdsTree, item);
@@ -1140 +1140 @@
 
     QString dir;
-    if (item && item->getStatus() == VBoxMedia::Ok)
-        dir = QFileInfo (item->getPath().trimmed()).absolutePath ();
+    if (item && item->status() == VBoxMedia::Ok)
+        dir = QFileInfo (item->path().trimmed()).absolutePath ();
 
     if (dir.isEmpty())
@@ -1196 +1196 @@
     CVirtualBox vbox = vboxGlobal().virtualBox();
 
-    QUuid uuid = item->getUuid();
+    QUuid uuid = item->uuid();
     AssertMsg (!uuid.isNull(), ("Current item must have uuid\n"));
 
-    QString src = item->getPath().trimmed();
+    QString src = item->path().trimmed();
     VBoxDefs::DiskType type = currentTreeWidgetType();
 
@@ -1211 +1211 @@
                 /// enable image deletion for  them as well (use
                 /// GetStorageType() to define the correct cast).
-                CHardDisk disk = item->getMedia().disk;
+                CHardDisk disk = item->media().disk;
                 if (disk.GetStorageType() == KHardDiskStorageType_VirtualDiskImage &&
                     disk.GetParent().isNull() && /* must not be differencing (see below) */
-                    item->getStatus() == VBoxMedia::Ok)
+                    item->status() == VBoxMedia::Ok)
                 {
                     int rc = vboxProblem().confirmHardDiskImageDeletion (this, src);
@@ -1273 +1273 @@
     CVirtualBox vbox = vboxGlobal().virtualBox();
 
-    QUuid itemId = item->getUuid();
+    QUuid itemId = item->uuid();
     AssertMsg (!itemId.isNull(), ("Current item must have uuid\n"));
 
@@ -1281 +1281 @@
         case VBoxDefs::HD:
             {
-                CHardDisk hd = item->getMedia().disk;
+                CHardDisk hd = item->media().disk;
                 QUuid machineId = hd.GetMachineId();
                 if (vboxProblem().confirmReleaseImage (this,
@@ -1287 +1287 @@
                 {
                     releaseDisk (machineId, itemId, VBoxDefs::HD);
-                    VBoxMedia media (item->getMedia());
+                    VBoxMedia media (item->media());
                     media.status = hd.GetAccessible() ? VBoxMedia::Ok :
                         hd.isOk() ? VBoxMedia::Inaccessible :
@@ -1298 +1298 @@
         case VBoxDefs::CD:
             {
-                QString usage = item->getTotalUsage();
+                QString usage = item->totalUsage();
                 if (vboxProblem().confirmReleaseImage (this, usage))
                 {
@@ -1309 +1309 @@
 
                     CDVDImage cd = vbox.GetDVDImage (itemId);
-                    VBoxMedia media (item->getMedia());
+                    VBoxMedia media (item->media());
                     media.status = cd.GetAccessible() ? VBoxMedia::Ok :
                         cd.isOk() ? VBoxMedia::Inaccessible :
@@ -1319 +1319 @@
         case VBoxDefs::FD:
             {
-                QString usage = item->getTotalUsage();
+                QString usage = item->totalUsage();
                 if (vboxProblem().confirmReleaseImage (this, usage))
                 {
@@ -1330 +1330 @@
 
                     CFloppyImage fd = vbox.GetFloppyImage (itemId);
-                    VBoxMedia media (item->getMedia());
+                    VBoxMedia media (item->media());
                     media.status = fd.GetAccessible() ? VBoxMedia::Ok :
                         fd.isOk() ? VBoxMedia::Inaccessible :
@@ -1558 +1558 @@
     bool notInEnum      = !vboxGlobal().isMediaEnumerationStarted();
     bool modifyEnabled  = notInEnum &&
-                          item &&  item->getUsage().isNull() &&
-                          (item->childCount() == 0) && !item->getPath().isNull();
-    bool releaseEnabled = item && !item->getUsage().isNull() &&
-                          item->getSnapshotUsage().isNull() &&
+                          item &&  item->usage().isNull() &&
+                          (item->childCount() == 0) && !item->path().isNull();
+    bool releaseEnabled = item && !item->usage().isNull() &&
+                          item->snapshotUsage().isNull() &&
                           checkImage (item) &&
                           !item->parent() && (item->childCount() == 0) &&
-                          item->getSnapshotName().isNull();
+                          item->snapshotName().isNull();
     bool newEnabled     = notInEnum &&
                           currentTreeWidget() == mHdsTree ? true : false;
@@ -1579 +1579 @@
         bool selectEnabled = item && !item->parent() &&
                              (!newEnabled ||
-                                (item->getUsage().isNull() ||
-                                 item->getMachineId() == mTargetVMId));
+                                (item->usage().isNull() ||
+                                 item->machineId() == mTargetVMId));
 
         mButtonBox->button (QDialogButtonBox::Ok)->setEnabled (selectEnabled);
@@ -1589 +1589 @@
         if (item->treeWidget() == mHdsTree)
         {
-            mHdsPane1->setText (item->getInformation (item->getPath(), true, "end"));
-            mHdsPane2->setText (item->getInformation (item->getDiskType(), false));
-            mHdsPane3->setText (item->getInformation (item->getStorageType(), false));
-            mHdsPane4->setText (item->getInformation (item->getUsage()));
-            mHdsPane5->setText (item->getInformation (item->getSnapshotName()));
+            mHdsPane1->setText (item->information (item->path(), true, "end"));
+            mHdsPane2->setText (item->information (item->diskType(), false));
+            mHdsPane3->setText (item->information (item->storageType(), false));
+            mHdsPane4->setText (item->information (item->usage()));
+            mHdsPane5->setText (item->information (item->snapshotName()));
         }
         else if (item->treeWidget() == mCdsTree)
         {
-            mCdsPane1->setText (item->getInformation (item->getPath(), true, "end"));
-            mCdsPane2->setText (item->getInformation (item->getTotalUsage()));
+            mCdsPane1->setText (item->information (item->path(), true, "end"));
+            mCdsPane2->setText (item->information (item->totalUsage()));
         }
         else if (item->treeWidget() == mFdsTree)
         {
-            mFdsPane1->setText (item->getInformation (item->getPath(), true, "end"));
-            mFdsPane2->setText (item->getInformation (item->getTotalUsage()));
+            mFdsPane1->setText (item->information (item->path(), true, "end"));
+            mFdsPane2->setText (item->information (item->totalUsage()));
         }
     }
@@ -1866 +1866 @@
     while (*iterator)
     {
-        if ((*iterator)->getUuid() == aId)
+        if ((*iterator)->uuid() == aId)
             return *iterator;
         ++iterator;
@@ -1879 +1879 @@
     while (*iterator)
     {
-        if ((*iterator)->getStatus() == aStatus)
+        if ((*iterator)->status() == aStatus)
             return *iterator;
         ++iterator;
@@ -1888 +1888 @@
 bool VBoxDiskImageManagerDlg::checkImage (DiskImageItem *aItem)
 {
-    QUuid itemId = aItem ? aItem->getUuid() : QUuid();
+    QUuid itemId = aItem ? aItem->uuid() : QUuid();
     if (itemId.isNull()) 
         return false;
@@ -1898 +1898 @@
         case VBoxDefs::HD:
             {
-                CHardDisk hd = aItem->getMedia().disk;
+                CHardDisk hd = aItem->media().disk;
                 QUuid machineId = hd.GetMachineId();
                 if (machineId.isNull() ||
@@ -2027 +2027 @@
     di = toDiskImageItem (mHdsTree->currentItem());
     if (mHdSelectedId.isNull())
-        mHdSelectedId = di ? di->getUuid() : QUuid();
+        mHdSelectedId = di ? di->uuid() : QUuid();
 
     di = toDiskImageItem (mCdsTree->currentItem());
     if (mCdSelectedId.isNull())
-        mCdSelectedId = di ? di->getUuid() : QUuid();
+        mCdSelectedId = di ? di->uuid() : QUuid();
 
     di = toDiskImageItem (mFdsTree->currentItem());
     if (mFdSelectedId.isNull())
-        mFdSelectedId = di ? di->getUuid() : QUuid();
+        mFdSelectedId = di ? di->uuid() : QUuid();
 
     /* Finally, clear all lists */