Changeset 5282 in vbox for trunk/src/VBox/Frontends/VirtualBox/ui

Timestamp:

Oct 12, 2007 8:56:26 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Use QUuid for UUIDs, not QString.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxDiskImageManagerDlg.ui (modified) (1 diff)
• VBoxDiskImageManagerDlg.ui.h (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui

@@ -530 +530 @@
     <variable access="private">int type;</variable>
     <variable access="private">bool doSelect;</variable>
-    <variable access="private">QString targetVMId;</variable>
+    <variable access="private">QUuid targetVMId;</variable>
     <variable access="private">QPixmap pxInaccessible;</variable>
     <variable access="private">QPixmap pxErroneous;</variable>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h

@@ -42 +42 @@
     const VBoxMedia &getMedia() const { return mMedia; }
 
-    void setPath (QString aPath) { mPath = aPath; }
+    void setPath (const QString &aPath) { mPath = aPath; }
     const QString &getPath() const { return mPath; }
 
-    void setUsage (QString aUsage) { mUsage = aUsage; }
+    void setUsage (const QString &aUsage) { mUsage = aUsage; }
     const QString &getUsage() const { return mUsage; }
 
-    void setSnapshotUsage (QString aSnapshotUsage) { mSnapshotUsage = aSnapshotUsage; }
+    void setSnapshotUsage (const QString &aSnapshotUsage) { mSnapshotUsage = aSnapshotUsage; }
     const QString &getSnapshotUsage() const { return mSnapshotUsage; }
 
@@ -58 +58 @@
     }
 
-    void setSnapshotName (QString aSnapshotName) { mSnapshotName = aSnapshotName; }
+    void setSnapshotName (const QString &aSnapshotName) { mSnapshotName = aSnapshotName; }
     const QString &getSnapshotName() const { return mSnapshotName; }
 
-    void setDiskType (QString aDiskType) { mDiskType = aDiskType; }
+    void setDiskType (const QString &aDiskType) { mDiskType = aDiskType; }
     const QString &getDiskType() const { return mDiskType; }
 
-    void setStorageType (QString aStorageType) { mStorageType = aStorageType; }
+    void setStorageType (const QString &aStorageType) { mStorageType = aStorageType; }
     const QString &getStorageType() const { return mStorageType; }
 
-    void setVirtualSize (QString aVirtualSize) { mVirtualSize = aVirtualSize; }
+    void setVirtualSize (const QString &aVirtualSize) { mVirtualSize = aVirtualSize; }
     const QString &getVirtualSize() const { return mVirtualSize; }
 
-    void setActualSize (QString aActualSize) { mActualSize = aActualSize; }
+    void setActualSize (const QString &aActualSize) { mActualSize = aActualSize; }
     const QString &getActualSize() const { return mActualSize; }
 
-    void setUuid (QUuid aUuid) { mUuid = aUuid; }
-    const QString &getUuid() const { return mUuid; }
-
-    void setMachineId (QString aMachineId) { mMachineId = aMachineId; }
-    const QString &getMachineId() const { return mMachineId; }
+    void setUuid (const QUuid &aUuid) { mUuid = aUuid; }
+    const QUuid &getUuid() const { return mUuid; }
+
+    void setMachineId (const QUuid &aMachineId) { mMachineId = aMachineId; }
+    const QUuid &getMachineId() const { return mMachineId; }
 
     void setStatus (VBoxMedia::Status aStatus) { mStatus = aStatus; }
@@ -145 +145 @@
     QString mActualSize;
 
-    QString mUuid;
-    QString mMachineId;
+    QUuid mUuid;
+    QUuid mMachineId;
 
     QString mToolTip;
@@ -1420 +1420 @@
     doSelect = aDoSelect;
     if (aTargetVMId)
-        targetVMId = aTargetVMId->toString();
+        targetVMId = *aTargetVMId;
 
     if (doSelect)
@@ -1711 +1711 @@
     di = (item && item->rtti() == DiskImageItem::TypeId) ?
         static_cast <DiskImageItem *> (item) : 0;
-    hdSelectedId = di ? di->getUuid() : QString::null;
+    hdSelectedId = di ? di->getUuid() : QUuid();
 
     item = cdsView->currentItem();
     di = (item && item->rtti() == DiskImageItem::TypeId) ?
         static_cast <DiskImageItem *> (item) : 0;
-    cdSelectedId = di ? di->getUuid() : QString::null;
+    cdSelectedId = di ? di->getUuid() : QUuid();
 
     item = fdsView->currentItem();
     di = (item && item->rtti() == DiskImageItem::TypeId) ?
         static_cast <DiskImageItem *> (item) : 0;
-    fdSelectedId = di ? di->getUuid() : QString::null;
+    fdSelectedId = di ? di->getUuid() : QUuid();
 
     /* finally, clear all lists */
@@ -1739 +1739 @@
 bool VBoxDiskImageManagerDlg::checkImage (DiskImageItem* aItem)
 {
-    QUuid itemId = aItem ? QUuid (aItem->getUuid()) : QUuid();
+    QUuid itemId = aItem ? aItem->getUuid() : QUuid();
     if (itemId.isNull()) return false;
 
@@ -1996 +1996 @@
     AssertMsg (item, ("Current item must not be null"));
 
-    QUuid uuid = QUuid (item->getUuid());
+    QUuid uuid = item->getUuid();
     AssertMsg (!uuid.isNull(), ("Current item must have uuid"));
 
@@ -2057 +2057 @@
     AssertMsg (item, ("Current item must not be null"));
 
-    QUuid itemId = QUuid (item->getUuid());
+    QUuid itemId = item->getUuid();
     AssertMsg (!itemId.isNull(), ("Current item must have uuid"));
 
@@ -2182 +2182 @@
     if (currentList->selectedItem() &&
         currentList->selectedItem()->rtti() == DiskImageItem::TypeId)
-        uuid = QUuid (static_cast<DiskImageItem *>(currentList->selectedItem())
-                      ->getUuid());
+        uuid = static_cast <DiskImageItem *> (
+            currentList->selectedItem())->getUuid();
 
     return uuid;