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

Timestamp:

Aug 11, 2020 4:41:41 PM (5 years ago)

Author:

vboxsync

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

139835

Message:

DnD / FE/Qt: Renaming.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIDnDDataObject_win.cpp (modified) (8 diffs)
• UIDnDDataObject_win.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp

@@ -40 +40 @@
 UIDnDDataObject::UIDnDDataObject(UIDnDHandler *pDnDHandler, const QStringList &lstFormats)
     : m_pDnDHandler(pDnDHandler)
-    , m_enmStatus(DnDDataObjectStatus_Uninitialized)
+    , m_enmStatus(Status_Uninitialized)
     , m_cRefs(1)
     , m_cFormats(0)
@@ -128 +128 @@
 #endif
         m_cFormats  = cRegisteredFormats;
-        m_enmStatus = DnDDataObjectStatus_Dropping;
+        m_enmStatus = Status_Dropping;
     }
 
@@ -214 +214 @@
         switch (m_enmStatus)
         {
-            case DnDDataObjectStatus_Dropping:
+            case Status_Dropping:
             {
 #if 0
@@ -225 +225 @@
             }
 
-            case DnDDataObjectStatus_Dropped:
+            case Status_Dropped:
             {
                 LogRel3(("DnD: Dropped\n"));
@@ -578 +578 @@
 {
     LogFlowFunc(("Aborting ...\n"));
-    m_enmStatus = DnDDataObjectStatus_Aborted;
+    m_enmStatus = Status_Aborted;
     return RTSemEventSignal(m_SemEvent);
 }
@@ -737 +737 @@
  * @param   enmStatus           New status to set.
  */
-void UIDnDDataObject::SetStatus(DnDDataObjectStatus enmStatus)
+void UIDnDDataObject::SetStatus(Status enmStatus)
 {
     LogFlowFunc(("Setting status to %RU32\n", enmStatus));
@@ -745 +745 @@
 /**
  * Signals that data has been "dropped".
- *
- ** @todo r=andy Remove?
  */
 void UIDnDDataObject::Signal(void)
 {
-    SetStatus(DnDDataObjectStatus_Dropped);
+    SetStatus(Status_Dropped);
 }
 
@@ -786 +784 @@
     {
         m_strFormat = strFormat;
-        SetStatus(DnDDataObjectStatus_Dropped);
+        SetStatus(Status_Dropped);
     }
     else
-        SetStatus(DnDDataObjectStatus_Aborted);
+        SetStatus(Status_Aborted);
 
     /* Signal in any case. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.h

@@ -40 +40 @@
 public:
 
-    enum DnDDataObjectStatus
+    enum Status
     {
-        DnDDataObjectStatus_Uninitialized = 0,
-        DnDDataObjectStatus_Initialized,
-        DnDDataObjectStatus_Dropping,
-        DnDDataObjectStatus_Dropped,
-        DnDDataObjectStatus_Aborted,
-        DnDDataObjectStatus_32Bit_Hack = 0x7fffffff
+        Status_Uninitialized = 0,
+        Status_Initialized,
+        Status_Dropping,
+        Status_Dropped,
+        Status_Aborted,
+        Status_32Bit_Hack = 0x7fffffff
     };
 
@@ -83 +83 @@
 protected:
 
-    void SetStatus(DnDDataObjectStatus enmStatus);
+    void SetStatus(Status enmStatus);
 
     bool LookupFormatEtc(LPFORMATETC pFormatEtc, ULONG *puIndex);
@@ -92 +92 @@
     UIDnDHandler           *m_pDnDHandler;
     /** Current drag and drop status. */
-    DnDDataObjectStatus     m_enmStatus;
+    Status                  m_enmStatus;
     /** Internal reference count of this object. */
     LONG                    m_cRefs;