Changeset 24294 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Nov 3, 2009 4:13:57 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

54287

Message:

FE/Qt4: VBoxMedium cumulative patch: fixed tool-tip regression (for complex tool-tips) caused by Qt bugs related to html <nobr> tag ignoring; Possible fixed crash while copying CMedium object wrapped in VBoxMedium extension.

File:

• trunk/src/VBox/Frontends/VirtualBox/include/VBoxMedium.h (modified) (6 diffs)

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

@@ -32 +32 @@
 
 /**
+ * Cache used to override some attributes in the user-friendly "don't show diffs" mode.
+ */
+struct NoDiffsCache
+{
+    NoDiffsCache() : isSet (false), state (KMediumState_NotCreated) {}
+    NoDiffsCache& operator= (const NoDiffsCache &aOther)
+    {
+        isSet = aOther.isSet;
+        state = aOther.state;
+        result = aOther.result;
+        toolTip = aOther.toolTip;
+        return *this;
+    }
+
+    bool isSet : 1;
+
+    KMediumState state;
+    COMResult result;
+    QString toolTip;
+};
+
+/**
  * Media descriptor for the GUI.
  *
@@ -100 +122 @@
         , mParent (0) { refresh(); }
 
+    VBoxMedium& operator= (const VBoxMedium &aOther);
+
     void blockAndQueryState();
     void refresh();
@@ -138 +162 @@
     QString name (bool aNoDiffs = false) const { return aNoDiffs ? root().mName : mName; }
     QString location (bool aNoDiffs = false) const { return aNoDiffs ? root().mLocation : mLocation; }
+
     QString size (bool aNoDiffs = false) const { return aNoDiffs ? root().mSize : mSize; }
     QString logicalSize (bool aNoDiffs = false) const { return aNoDiffs ? root().mLogicalSize : mLogicalSize; }
+
     QString hardDiskFormat (bool aNoDiffs = false) const { return aNoDiffs ? root().mHardDiskFormat : mHardDiskFormat; }
     QString hardDiskType (bool aNoDiffs = false) const { return aNoDiffs ? root().mHardDiskType : mHardDiskType; }
+
     QString usage (bool aNoDiffs = false) const { return aNoDiffs ? root().mUsage : mUsage; }
+    QString tip() const { return mToolTip; }
+
+    const NoDiffsCache& cache() const { return mNoDiffs; }
 
     /**
@@ -182 +212 @@
      * Returns a parent medium. For non-hard disk media, this is always NULL.
      */
-    VBoxMedium *parent() const { return mParent; }
-
-    VBoxMedium &root() const;
+    VBoxMedium* parent() const { return mParent; }
+
+    VBoxMedium& root() const;
 
     QString toolTip (bool aNoDiffs = false, bool aCheckRO = false, bool aNullAllowed = false) const;
@@ -216 +246 @@
 
     QString mId;
+    QString mName;
     QString mLocation;
-    QString mName;
+
     QString mSize;
+    QString mLogicalSize;
 
     QString mHardDiskFormat;
     QString mHardDiskType;
-    QString mLogicalSize;
 
     QString mUsage;
@@ -235 +266 @@
     VBoxMedium *mParent;
 
-    /**
-     * Used to override some attributes in the user-friendly "don't show diffs"
-     * mode.
-     */
-    struct NoDiffs
-    {
-        NoDiffs() : isSet (false), state (KMediumState_NotCreated) {}
-
-        bool isSet : 1;
-
-        KMediumState state;
-        COMResult result;
-        QString toolTip;
-    }
-    mNoDiffs;
+    NoDiffsCache mNoDiffs;
+
+    static QString mTable;
+    static QString mRow;
 };