vbox的更動 56655 路徑 trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

時間撮記:

2015-6-26 上午08:47:05 (9 年 以前)

作者:

vboxsync

訊息:

Build fix.

檔案:

• trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp (修改) (8 筆差異)

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

@@ -277 +277 @@
 
     /* Make a flat data string out of the supported format list. */
-    Utf8Str strFormats = GuestDnD::toFormatString(m_strFormats, aFormats);
+    Utf8Str strFormats = GuestDnD::toFormatString(m_vecFmtSup, aFormats);
+
     /* If there is no valid supported format, ignore this request. */
     if (strFormats.isEmpty())
@@ -343 +344 @@
 
     /* Make a flat data string out of the supported format list. */
-    RTCString strFormats = GuestDnD::toFormatString(m_strFormats, aFormats);
+    RTCString strFormats = GuestDnD::toFormatString(m_vecFmtSup, aFormats);
     /* If there is no valid supported format, ignore this request. */
     if (strFormats.isEmpty())
@@ -434 +435 @@
 
     /* Make a flat data string out of the supported format list. */
-    Utf8Str strFormats = GuestDnD::toFormatString(m_strFormats, aFormats);
+    Utf8Str strFormats = GuestDnD::toFormatString(m_vecFmtSup, aFormats);
     /* If there is no valid supported format, ignore this request. */
     if (strFormats.isEmpty())
@@ -462 +463 @@
             {
                 resAction = GuestDnD::toMainAction(pResp->defAction());
-                aFormat = pResp->format();
+                aFormat = pResp->fmtReq();
 
                 LogFlowFunc(("resFormat=%s, resAction=%RU32\n",
-                             pResp->format().c_str(), pResp->defAction()));
+                             pResp->fmtReq().c_str(), pResp->defAction()));
             }
         }
@@ -556 +557 @@
         pSendCtx->mpResp        = pResp;
         pSendCtx->mScreenID     = aScreenId;
-        pSendCtx->mFormat       = aFormat;
+        pSendCtx->mFmtReq       = aFormat;
         pSendCtx->mData.vecData = aData;
 
@@ -692 +693 @@
     mDataBase.mListOutgoing.clear();
 
-    const char *pszFormat = pCtx->mFormat.c_str();
-    uint32_t cbFormat = pCtx->mFormat.length() + 1;
+    const char *pszFormat = pCtx->mFmtReq.c_str();
+    uint32_t cbFormat = pCtx->mFmtReq.length() + 1;
 
     /* Do we need to build up a file tree? */
@@ -1129 +1130 @@
         MsgSndData.setType(DragAndDropSvc::HOST_DND_HG_SND_DATA);
         MsgSndData.setNextUInt32(pCtx->mScreenID);
-        MsgSndData.setNextPointer((void *)pCtx->mFormat.c_str(), (uint32_t)pCtx->mFormat.length() + 1);
-        MsgSndData.setNextUInt32((uint32_t)pCtx->mFormat.length() + 1);
+        MsgSndData.setNextPointer((void *)pCtx->mFmtReq.c_str(), (uint32_t)pCtx->mFmtReq.length() + 1);
+        MsgSndData.setNextUInt32((uint32_t)pCtx->mFmtReq.length() + 1);
         MsgSndData.setNextPointer((void*)strData.c_str(), (uint32_t)cbData);
         MsgSndData.setNextUInt32((uint32_t)cbData);
@@ -1279 +1280 @@
     Msg.setType(DragAndDropSvc::HOST_DND_HG_SND_DATA);
     Msg.setNextUInt32(pCtx->mScreenID);
-    Msg.setNextPointer((void *)pCtx->mFormat.c_str(), (uint32_t)pCtx->mFormat.length() + 1);
-    Msg.setNextUInt32((uint32_t)pCtx->mFormat.length() + 1);
+    Msg.setNextPointer((void *)pCtx->mFmtReq.c_str(), (uint32_t)pCtx->mFmtReq.length() + 1);
+    Msg.setNextUInt32((uint32_t)pCtx->mFmtReq.length() + 1);
     Msg.setNextPointer((void*)&pCtx->mData.vecData.front(), (uint32_t)cbDataTotal);
     Msg.setNextUInt32(cbDataTotal);