Changeset 85020 in vbox

Timestamp:

Jul 1, 2020 10:48:57 AM (5 years ago)

Author:

vboxsync

Message:

DnD/Main: Renamed internal send/receive data task classes to unify naming.

Location:

trunk/src/VBox/Main

Files:

• include/GuestDnDSourceImpl.h (modified) (3 diffs)
• include/GuestDnDTargetImpl.h (modified) (3 diffs)
• src-client/GuestDnDSourceImpl.cpp (modified) (5 diffs)
• src-client/GuestDnDTargetImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/GuestDnDSourceImpl.h

@@ -30 +30 @@
 #include "GuestDnDPrivate.h"
 
-class RecvDataTask;
+class GuestDnDRecvDataTask;
 struct GuestDnDRecvCtx;
 
@@ -88 +88 @@
     /** @name Thread task .
      * @{ */
-    static void i_receiveDataThreadTask(RecvDataTask *pTask);
+    static void i_receiveDataThreadTask(GuestDnDRecvDataTask *pTask);
     /** @}  */
 
@@ -114 +114 @@
     } mData;
 
-    friend class RecvDataTask;
+    friend class GuestDnDRecvDataTask;
 };
 

trunk/src/VBox/Main/include/GuestDnDTargetImpl.h

@@ -29 +29 @@
 
 struct GuestDnDSendCtx;
-class SendDataTask;
+class GuestDnDSendDataTask;
 
 class ATL_NO_VTABLE GuestDnDTarget :
@@ -76 +76 @@
     /** @name Thread task workers.
      * @{ */
-    static void i_sendDataThreadTask(SendDataTask *pTask);
+    static void i_sendDataThreadTask(GuestDnDSendDataTask *pTask);
     /** @}  */
 
@@ -105 +105 @@
     } mData;
 
-    friend class SendDataTask;
+    friend class GuestDnDSendDataTask;
 };
 

trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp

@@ -71 +71 @@
  * a worker thread.
  */
-class RecvDataTask : public GuestDnDSourceTask
+class GuestDnDRecvDataTask : public GuestDnDSourceTask
 {
 public:
 
-    RecvDataTask(GuestDnDSource *pSource, GuestDnDRecvCtx *pCtx)
+    GuestDnDRecvDataTask(GuestDnDSource *pSource, GuestDnDRecvCtx *pCtx)
         : GuestDnDSourceTask(pSource)
         , mpCtx(pCtx)
@@ -87 +87 @@
     }
 
-    virtual ~RecvDataTask(void) { }
+    virtual ~GuestDnDRecvDataTask(void) { }
 
     GuestDnDRecvCtx *getCtx(void) { return mpCtx; }
@@ -355 +355 @@
         return hr;
 
-    RecvDataTask *pTask = NULL;
+    GuestDnDRecvDataTask *pTask = NULL;
 
     try
@@ -367 +367 @@
         LogRel2(("DnD: Requesting data from guest in format: %s\n", aFormat.c_str()));
 
-        pTask = new RecvDataTask(this, &mData.mRecvCtx);
+        pTask = new GuestDnDRecvDataTask(this, &mData.mRecvCtx);
         if (!pTask->isOk())
         {
@@ -1051 +1051 @@
 
 /* static */
-void GuestDnDSource::i_receiveDataThreadTask(RecvDataTask *pTask)
+void GuestDnDSource::i_receiveDataThreadTask(GuestDnDRecvDataTask *pTask)
 {
     LogFlowFunc(("pTask=%p\n", pTask));

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -74 +74 @@
  * a worker thread.
  */
-class SendDataTask : public GuestDnDTargetTask
+class GuestDnDSendDataTask : public GuestDnDTargetTask
 {
 public:
 
-    SendDataTask(GuestDnDTarget *pTarget, GuestDnDSendCtx *pCtx)
+    GuestDnDSendDataTask(GuestDnDTarget *pTarget, GuestDnDSendCtx *pCtx)
         : GuestDnDTargetTask(pTarget),
           mpCtx(pCtx)
@@ -90 +90 @@
     }
 
-    virtual ~SendDataTask(void)
+    virtual ~GuestDnDSendDataTask(void)
     {
         if (mpCtx)
@@ -564 +564 @@
 
 /* static */
-void GuestDnDTarget::i_sendDataThreadTask(SendDataTask *pTask)
+void GuestDnDTarget::i_sendDataThreadTask(GuestDnDSendDataTask *pTask)
 {
     LogFlowFunc(("pTask=%p\n", pTask));
@@ -632 +632 @@
         return hr;
 
-    SendDataTask *pTask = NULL;
+    GuestDnDSendDataTask *pTask = NULL;
     GuestDnDSendCtx *pSendCtx = NULL;
 
@@ -646 +646 @@
 
         /* pTask is responsible for deletion of pSendCtx after creating */
-        pTask = new SendDataTask(this, pSendCtx);
+        pTask = new GuestDnDSendDataTask(this, pSendCtx);
         if (!pTask->isOk())
         {