Changeset 55826 in vbox for trunk

Timestamp:

May 12, 2015 12:55:48 PM (10 years ago)

Author:

vboxsync

Message:

Build fix.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp (modified) (10 diffs)

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

@@ -89 +89 @@
                                        const QMimeData *pMimeData)
 {
-    LogFlowFunc(("enmMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n", 
+    LogFlowFunc(("enmMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n",
                  m_enmMode, screenID, x, y, toVBoxDnDAction(proposedAction)));
 
@@ -113 +113 @@
                                       const QMimeData *pMimeData)
 {
-    LogFlowFunc(("enmMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n", 
+    LogFlowFunc(("enmMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n",
                  m_enmMode, screenID, x, y, toVBoxDnDAction(proposedAction)));
 
@@ -135 +135 @@
                                       const QMimeData *pMimeData)
 {
-    LogFlowFunc(("enmMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n", 
+    LogFlowFunc(("enmMode=%RU32, screenID=%RU32, x=%d, y=%d, action=%ld\n",
                  m_enmMode, screenID, x, y, toVBoxDnDAction(proposedAction)));
 
@@ -212 +212 @@
                             Qt::DropAction defAction, Qt::DropActions actions)
 {
+    int rc = VINF_SUCCESS;
+
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+
     m_lstFormats = lstFormats;
     m_defAction  = defAction;
@@ -218 +222 @@
     LogFlowFunc(("m_defAction=0x%x\n", m_defAction));
     LogFlowFunc(("Number of formats: %d\n", m_lstFormats.size()));
-#ifdef DEBUG
+# ifdef DEBUG
     for (int i = 0; i < m_lstFormats.size(); i++)
         LogFlowFunc(("\tFormat %d: %s\n", i, m_lstFormats.at(i).toAscii().constData()));
-#endif
-
-    int rc = VINF_SUCCESS;
-
-#ifdef RT_OS_WINDOWS
+# endif
+
+# ifdef RT_OS_WINDOWS
 
     UIDnDDropSource *pDropSource = new UIDnDDropSource(m_pParent);
@@ -255 +257 @@
         pDataObject->Release();
 
-#else /* !RT_OS_WINDOWS */
+# else /* !RT_OS_WINDOWS */
 
     QDrag *pDrag = new QDrag(m_pParent);
@@ -287 +289 @@
     /* pDrag will be cleaned up by Qt automatically. */
 
-#endif /* !RT_OS_WINDOWS */
+# endif /* !RT_OS_WINDOWS */
+
+#else /* VBOX_WITH_DRAG_AND_DROP_GH */
+
+    rc = VERR_NOT_SUPPORTED;
+
+#endif
 
     LogFlowFuncLeaveRC(rc);
@@ -297 +305 @@
     int rc;
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-  
+
     LogFlowFunc(("enmMode=%RU32, m_fIsPending=%RTbool, screenID=%RU32\n", m_enmMode, m_fIsPending, screenID));
 
@@ -379 +387 @@
     {
         rc = dragStart(lstFmtNative,
-                       toQtDnDAction(defaultAction), toQtDnDActions(vecActions));          
+                       toQtDnDAction(defaultAction), toQtDnDActions(vecActions));
     }
     else /* No format data from the guest arrived yet. */
@@ -433 +441 @@
                                             m_pParent);
 
-        LogFlowFunc(("fCanceled=%RTbool, fCompleted=%RTbool, isOk=%RTbool, hrc=%Rhrc\n", 
+        LogFlowFunc(("fCanceled=%RTbool, fCompleted=%RTbool, isOk=%RTbool, hrc=%Rhrc\n",
                      progress.GetCanceled(), progress.GetCompleted(), progress.isOk(), progress.GetResultCode()));