Changeset 74574 in vbox for trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

Timestamp:

Oct 2, 2018 9:38:42 AM (6 years ago)

Author:

vboxsync

Message:

DnD/DnDObject: Documentation, a bit of cleaning / re-structuring. No functional changes.

File:

• trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp (modified) (8 diffs)

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

@@ -904 +904 @@
     AssertPtr(pObj);
 
-    RTCString strPath = pObj->GetDestPath();
+    RTCString strPath = pObj->GetDestPathAbs();
     if (strPath.isEmpty())
         return VERR_INVALID_PARAMETER;
@@ -931 +931 @@
     AssertPtr(pObj);
 
-    RTCString strPathSrc = pObj->GetSourcePath();
+    RTCString strPathSrc = pObj->GetSourcePathAbs();
     if (strPathSrc.isEmpty())
         return VERR_INVALID_PARAMETER;
@@ -965 +965 @@
                 pMsg->setType(HOST_DND_HG_SND_FILE_HDR);
                 pMsg->setNextUInt32(0); /** @todo ContextID not used yet. */
-                pMsg->setNextString(pObj->GetDestPath().c_str());                  /* pvName */
-                pMsg->setNextUInt32((uint32_t)(pObj->GetDestPath().length() + 1)); /* cbName */
+                pMsg->setNextString(pObj->GetDestPathAbs().c_str());                  /* pvName */
+                pMsg->setNextUInt32((uint32_t)(pObj->GetDestPathAbs().length() + 1)); /* cbName */
                 pMsg->setNextUInt32(0);                                            /* uFlags */
                 pMsg->setNextUInt32(pObj->GetMode());                              /* fMode */
@@ -1026 +1026 @@
     if (mDataBase.m_uProtocolVersion <= 1)
     {
-        pMsg->setNextString(pObj->GetDestPath().c_str());                  /* pvName */
-        pMsg->setNextUInt32((uint32_t)(pObj->GetDestPath().length() + 1)); /* cbName */
+        pMsg->setNextString(pObj->GetDestPathAbs().c_str());                  /* pvName */
+        pMsg->setNextUInt32((uint32_t)(pObj->GetDestPathAbs().length() + 1)); /* cbName */
     }
     else if (mDataBase.m_uProtocolVersion >= 2)
@@ -1063 +1063 @@
         if (pObj->IsComplete()) /* Done reading? */
         {
-            LogRel2(("DnD: File transfer to guest complete: %s\n", pObj->GetSourcePath().c_str()));
-            LogFlowFunc(("File '%s' complete\n", pObj->GetSourcePath().c_str()));
+            LogRel2(("DnD: File transfer to guest complete: %s\n", pObj->GetSourcePathAbs().c_str()));
+            LogFlowFunc(("File '%s' complete\n", pObj->GetSourcePathAbs().c_str()));
 
             /* DnDURIObject::Read() returns VINF_EOF when finished reading the entire fire,
@@ -1467 +1467 @@
     uint32_t fMode = pCurObj->GetMode();
     LogRel3(("DnD: Processing: srcPath=%s, dstPath=%s, fMode=0x%x, cbSize=%RU32, fIsDir=%RTbool, fIsFile=%RTbool\n",
-             pCurObj->GetSourcePath().c_str(), pCurObj->GetDestPath().c_str(),
+             pCurObj->GetSourcePathAbs().c_str(), pCurObj->GetDestPathAbs().c_str(),
              fMode, pCurObj->GetSize(),
              RTFS_IS_DIRECTORY(fMode), RTFS_IS_FILE(fMode)));
@@ -1482 +1482 @@
     {
         AssertMsgFailed(("fMode=0x%x is not supported for srcPath=%s, dstPath=%s\n",
-                         fMode, pCurObj->GetSourcePath().c_str(), pCurObj->GetDestPath().c_str()));
+                         fMode, pCurObj->GetSourcePathAbs().c_str(), pCurObj->GetDestPathAbs().c_str()));
         rc = VERR_NOT_SUPPORTED;
     }
@@ -1495 +1495 @@
     if (fRemove)
     {
-        LogFlowFunc(("Removing \"%s\" from list, rc=%Rrc\n", pCurObj->GetSourcePath().c_str(), rc));
+        LogFlowFunc(("Removing \"%s\" from list, rc=%Rrc\n", pCurObj->GetSourcePathAbs().c_str(), rc));
         pCtx->mURI.removeObjCurrent();
     }