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

Timestamp:

Feb 14, 2014 9:46:58 AM (11 years ago)

Author:

vboxsync

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

92295

Message:

DnD: Update.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/runtime/UIDnDDataObject_win.cpp (added)
• src/runtime/UIDnDDataObject_win.h (added)
• src/runtime/UIDnDDrag.cpp (added)
• src/runtime/UIDnDDrag.h (added)
• src/runtime/UIDnDDropSource_win.cpp (added)
• src/runtime/UIDnDDropSource_win.h (added)
• src/runtime/UIDnDEnumFormat_win.cpp (added)
• src/runtime/UIDnDEnumFormat_win.h (added)
• src/runtime/UIDnDHandler.cpp (modified) (16 diffs)
• src/runtime/UIDnDHandler.h (modified) (5 diffs)
• src/runtime/UIDnDMIMEData.cpp (modified) (6 diffs)
• src/runtime/UIDnDMIMEData.h (modified) (4 diffs)
• src/runtime/UIMachineView.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -455 +455 @@
  ifdef VBOX_WITH_DRAG_AND_DROP_GH
   VirtualBox_QT_MOCHDRS += \
-        src/runtime/UIDnDMIMEData.h
+        src/runtime/UIDnDMIMEData.h \
+        src/runtime/UIDnDDrag.h
  endif
 endif
@@ -492 +493 @@
 
 ifdef VBOX_WITH_DRAG_AND_DROP
+ VirtualBox_QT_MOCSRCS += \
+        src/runtime/UIDnDHandler.cpp
  ifdef VBOX_WITH_DRAG_AND_DROP_GH
   VirtualBox_QT_MOCSRCS += \
+        src/runtime/UIDnDDrag.cpp \
         src/runtime/UIDnDMIMEData.cpp
  endif
@@ -781 +785 @@
  ifdef VBOX_WITH_DRAG_AND_DROP_GH
   VirtualBox_SOURCES += \
-        src/runtime/UIDnDMIMEData.cpp
-  VirtualBox_QT_MOCSRCS += \
-        src/runtime/UIDnDMIMEData.cpp
+        src/runtime/UIDnDMIMEData.cpp \
+        src/runtime/UIDnDDrag.cpp
+  VirtualBox_SOURCES.win += \
+        src/runtime/UIDnDDropSource_win.cpp \
+        src/runtime/UIDnDDataObject_win.cpp \
+        src/runtime/UIDnDEnumFormat_win.cpp
  endif
 endif

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

@@ -34 +34 @@
 #include "UIDnDHandler.h"
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-# include "UIDnDMIMEData.h"
+# include "UIDnDDrag.h"
 #endif
 #include "UIMessageCenter.h"
@@ -46 +46 @@
 
 UIDnDHandler::UIDnDHandler(void)
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-    : pMData(NULL)
-#endif
+    : mMode(Unknown)
 {
 }
@@ -60 +58 @@
                                          const QMimeData *pMimeData, QWidget * /* pParent = NULL */)
 {
+    if (mMode == GH) /* Wrong mode? Bail out. */
+        return Qt::IgnoreAction;
+
     LogFlowFunc(("screenId=%RU32, x=%d, y=%d, action=%ld\n",
                  screenId, x, y, toVBoxDnDAction(proposedAction)));
@@ -78 +79 @@
                                         const QMimeData *pMimeData, QWidget * /* pParent = NULL */)
 {
+    if (mMode == GH) /* Wrong mode? Bail out. */
+        return Qt::IgnoreAction;
+
 #ifdef DEBUG_andy
     LogFlowFunc(("screenId=%RU32, x=%d, y=%d, action=%ld\n",
@@ -99 +103 @@
                                         const QMimeData *pMimeData, QWidget *pParent /* = NULL */)
 {
+    if (mMode == GH) /* Wrong mode? Bail out. */
+        return Qt::IgnoreAction;
+
     LogFlowFunc(("screenId=%RU32, x=%d, y=%d, action=%ld\n",
                  screenId, x, y, toVBoxDnDAction(proposedAction)));
@@ -114 +121 @@
     if (result != KDragAndDropAction_Ignore)
     {
-        /* Get the actually data */
+        /* Get the actual MIME data in the requested format. */
         const QByteArray &d = pMimeData->data(format);
         if (   !d.isEmpty()
             && !format.isEmpty())
         {
-            /* We need the data in the vector format. */
+            /* Convert the actual MIME data to a vector (needed
+             * for the COM wrapper). */
             QVector<uint8_t> dv(d.size());
             memcpy(dv.data(), d.constData(), d.size());
@@ -126 +134 @@
             if (guest.isOk())
             {
-                msgCenter().showModalProgressDialog(progress, tr("Dropping data ..."), ":/progress_dnd_hg_90px.png", pParent);
-                if (!progress.GetCanceled() && (!progress.isOk() || progress.GetResultCode() != 0))
+                msgCenter().showModalProgressDialog(progress,
+                                                    tr("Dropping data ..."), ":/progress_dnd_hg_90px.png",
+                                                    pParent);
+                if (   !progress.GetCanceled()
+                    && (   !progress.isOk()
+                        ||  progress.GetResultCode() != 0))
                 {
                     msgCenter().cannotDropData(progress, pParent);
@@ -146 +158 @@
 void UIDnDHandler::dragHGLeave(CGuest &guest, ulong screenId, QWidget * /* pParent = NULL */)
 {
+    if (mMode == GH) /* Wrong mode? Bail out. */
+        return;
+
     LogFlowFunc(("screenId=%RU32\n", screenId));
     guest.DragHGLeave(screenId);
@@ -154 +169 @@
     int rc;
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    if (mMode == HG) /* Wrong mode? Bail out. */
+        return VERR_WRONG_ORDER;
+
     /*
      * How this works: Host is asking the guest if there is any DnD
@@ -169 +187 @@
     LogFlowFunc(("defaultAction=%d, numFormats=%d\n", defaultAction, vecFmtGuest.size()));
 
-    /*
-     * Do guest -> host format conversion, if needed.
-     * On X11 this already maps to the Xdnd protocol.
-     ** @todo What about the MacOS Carbon Drag Manager? Needs testing.
-     *
-     * See: https://www.iana.org/assignments/media-types/media-types.xhtml
-     */
-    LogFlowFunc(("Number of guest formats: %d\n", vecFmtGuest.size()));
     QStringList lstFmtNative;
-    for (int i = 0; i < vecFmtGuest.size(); i++)
+    if (defaultAction != KDragAndDropAction_Ignore)
     {
-        const QString &strFmtGuest = vecFmtGuest.at(i);
-        LogFlowFunc(("\tFormat %d: %s\n", i,
-                     strFmtGuest.toAscii().constData()));
+        /*
+         * Do guest -> host format conversion, if needed.
+         * On X11 this already maps to the Xdnd protocol.
+         ** @todo What about the MacOS Carbon Drag Manager? Needs testing.
+         *
+         * See: https://www.iana.org/assignments/media-types/media-types.xhtml
+         */
+        LogFlowFunc(("Number of guest formats: %d\n", vecFmtGuest.size()));
+        for (int i = 0; i < vecFmtGuest.size(); i++)
+        {
+            const QString &strFmtGuest = vecFmtGuest.at(i);
+            LogFlowFunc(("\tFormat %d: %s\n", i,
+                         strFmtGuest.toAscii().constData()));
 # ifdef RT_OS_WINDOWS
-        /* CF_TEXT */
-        if (   strFmtGuest.contains("text/plain", Qt::CaseInsensitive)
-            && !lstFmtNative.contains("text/plain"))
-        {
-            lstFmtNative << "text/plain";
-        }
-        /* CF_HDROP */
-        else if (   strFmtGuest.contains("text/uri-list", Qt::CaseInsensitive)
-                 && !lstFmtNative.contains("text/uri-list"))
-        {
-            lstFmtNative << "text/uri-list";
-        }
+            /* CF_TEXT */
+            if (   strFmtGuest.contains("text/plain", Qt::CaseInsensitive)
+                && !lstFmtNative.contains("text/plain"))
+            {
+                lstFmtNative << "text/plain";
+            }
+            /* CF_HDROP */
+            else if (   strFmtGuest.contains("text/uri-list", Qt::CaseInsensitive)
+                     && !lstFmtNative.contains("text/uri-list"))
+            {
+                lstFmtNative << "text/uri-list";
+            }
 # else
-        /* On non-Windows just do a 1:1 mapping. */
-        lstFmtNative << strFmtGuest;
+            /* On non-Windows just do a 1:1 mapping. */
+            lstFmtNative << strFmtGuest;
 #  ifdef RT_OS_MACOS
-        /** @todo Does the mapping apply here? Don't think so ... */
+            /** @todo Does the mapping apply here? Don't think so ... */
 #  endif
 # endif /* !RT_OS_WINDOWS */
+        }
+
+        LogFlowFunc(("Number of native formats: %d\n", lstFmtNative.size()));
+# ifdef DEBUG
+        for (int i = 0; i < lstFmtNative.size(); i++)
+            LogFlowFunc(("\tFormat %d: %s\n", i, lstFmtNative.at(i).toAscii().constData()));
+# endif
     }
 
-    LogFlowFunc(("Number of native formats: %d\n", lstFmtNative.size()));
-# ifdef DEBUG
-    for (int i = 0; i < lstFmtNative.size(); i++)
-        LogFlowFunc(("\tFormat %d: %s\n", i, lstFmtNative.at(i).toAscii().constData()));
-# endif
-
-    if (    defaultAction != KDragAndDropAction_Ignore
-        && !lstFmtNative.isEmpty())
+    if (!lstFmtNative.isEmpty())
     {
         try
         {
-            QDrag *pDrag = new QDrag(pParent);
-
-            /* pMData is transfered to the QDrag object, so no need for deletion. */
-            pMData = new UIDnDMimeData(session, lstFmtNative,
-                                                      toQtDnDAction(defaultAction),
-                                                      toQtDnDActions(vecActions), pParent);
-
-            /* Inform this object that MIME data from the guest is available so that
-             * it can update the MIME data object accordingly. */
-            connect(pMData, SIGNAL(sigDataAvailable(QString)),
-                    this, SLOT(sltDataAvailable(QString)), Qt::DirectConnection);
-
-            /* Inform the MIME data object of any changes in the current action. */
-            connect(pDrag, SIGNAL(actionChanged(Qt::DropAction)),
-                    pMData, SLOT(sltDropActionChanged(Qt::DropAction)));
-
-            /* Fire it up.
-             *
-             * On Windows this will start a modal operation using OLE's
-             * DoDragDrop() method, so this call will block until the DnD operation
-             * is finished. */
-            pDrag->setMimeData(pMData);
-            Qt::DropAction dropAction =
-                 pDrag->exec(toQtDnDActions(vecActions), toQtDnDAction(defaultAction));
-            LogFlowFunc(("dropAction=%ld\n", toVBoxDnDAction(dropAction)));
-# ifdef RT_OS_WINDOWS
-            /* Since the QDrag::exec() call above was blocking on Windows, decide what
-             * to do now, e.g. if there was a "drop" action.
-             *
-             * Note: The UIDnDMimeData object will not be not accessible here anymore,
-             *       since QDrag had its ownership and deleted it after the (blocking)
-             *       QDrag::exec() call. */
-# endif
-            rc = VINF_SUCCESS;
+            UIDnDDrag *pDrag = new UIDnDDrag(session, lstFmtNative,
+                                             toQtDnDAction(defaultAction),
+                                             toQtDnDActions(vecActions), pParent);
+            rc = pDrag->DoDragDrop();
+
+            delete pDrag;
         }
         catch (std::bad_alloc)
@@ -258 +250 @@
     else
         rc = VINF_SUCCESS;
-#else
+#else /* !VBOX_WITH_DRAG_AND_DROP_GH */
     NOREF(session);
     NOREF(screenId);
@@ -274 +266 @@
  */
 
+/* static */
 KDragAndDropAction UIDnDHandler::toVBoxDnDAction(Qt::DropAction action)
 {
@@ -286 +279 @@
 }
 
+/* static */
 QVector<KDragAndDropAction> UIDnDHandler::toVBoxDnDActions(Qt::DropActions actions)
 {
@@ -301 +295 @@
 }
 
+/* static */
 Qt::DropAction UIDnDHandler::toQtDnDAction(KDragAndDropAction action)
 {
@@ -315 +310 @@
 }
 
+/* static */
 Qt::DropActions UIDnDHandler::toQtDnDActions(const QVector<KDragAndDropAction> &vecActions)
 {
@@ -343 +339 @@
 }
 
-void UIDnDHandler::sltDataAvailable(const QString &mimeType)
-{
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-    LogFlowFunc(("pMData=0x%p, mimeType=%s\n",
-                 pMData, mimeType.toAscii().constData()));
-
-    if (pMData)
-        pMData->setData(mimeType);
-#endif
-}
-
 #include "UIDnDHandler.moc"
 

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

@@ -35 +35 @@
 
 public:
+
     /* Singleton factory. */
     static UIDnDHandler* instance(void)
@@ -42 +43 @@
         return m_pInstance;
     }
+
     static void destroy(void)
     {
@@ -50 +52 @@
         }
     }
+
+    /**
+     * Current operation mode.
+     */
+    enum Mode
+    {
+        /** Unknown mode. */
+        Unknown = 0,
+        /** Host to guest. */
+        HG,
+        /** Guest to host. */
+        GH
+    };
 
     /* Host -> Guest. */
@@ -60 +75 @@
     int            dragGHPending(CSession &session, ulong screenId, QWidget *pParent = NULL);
 
-public slots:
+public:
 
-    void sltDataAvailable(const QString &mimetype);
+    static KDragAndDropAction          toVBoxDnDAction(Qt::DropAction action);
+    static QVector<KDragAndDropAction> toVBoxDnDActions(Qt::DropActions actions);
+    static Qt::DropAction              toQtDnDAction(KDragAndDropAction action);
+    static Qt::DropActions             toQtDnDActions(const QVector<KDragAndDropAction> &vecActions);
 
 private:
@@ -70 +88 @@
     virtual ~UIDnDHandler(void) {}
 
-    /* Private helpers. */
-    static KDragAndDropAction          toVBoxDnDAction(Qt::DropAction action);
-    static QVector<KDragAndDropAction> toVBoxDnDActions(Qt::DropActions actions);
-    static Qt::DropAction              toQtDnDAction(KDragAndDropAction action);
-    static Qt::DropActions             toQtDnDActions(const QVector<KDragAndDropAction> &vecActions);
-
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-    UIDnDMimeData *pMData;
-    friend class UIDnDMimeData;
-#endif
+    /** The current operation mode. */
+    Mode mMode;
 };
 

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

@@ -20 +20 @@
 /* Qt includes: */
 #include <QApplication>
+#include <QFileInfo>
 #include <QKeyEvent>
 #include <QMimeData>
@@ -34 +35 @@
 /* GUI includes: */
 #include "UIDnDMIMEData.h"
+#include "UIDnDDrag.h"
 #include "UIMessageCenter.h"
 
 UIDnDMimeData::UIDnDMimeData(CSession &session, QStringList formats,
                              Qt::DropAction defAction, Qt::DropActions actions,
-                             QWidget *pParent)
+                             UIDnDDrag *pParent)
     : m_pParent(pParent)
     , m_session(session)
@@ -96 +98 @@
 }
 
-bool UIDnDMimeData::hasFormat(const QString &mimeType) const
-{
-    bool fRc = m_lstFormats.contains(mimeType);
+bool UIDnDMimeData::hasFormat(const QString &strMIMEType) const
+{
+    bool fRc = m_lstFormats.contains(strMIMEType);
     LogFlowFunc(("%s: %RTbool (QtMimeData: %RTbool)\n",
-                 mimeType.toStdString().c_str(),
-                 fRc, QMimeData::hasFormat(mimeType)));
+                 strMIMEType.toStdString().c_str(),
+                 fRc, QMimeData::hasFormat(strMIMEType)));
     return fRc;
 }
 
-QVariant UIDnDMimeData::retrieveData(const QString &mimeType,
+QVariant UIDnDMimeData::retrieveData(const QString &strMIMEType,
                                      QVariant::Type type) const
 {
     LogFlowFunc(("m_enmState=%d, mimeType=%s, type=%d (%s)\n",
-                 m_enmState, mimeType.toStdString().c_str(),
+                 m_enmState, strMIMEType.toStdString().c_str(),
                  type, QVariant::typeToName(type)));
 
     bool fCanDrop = true;
 
-#if 0
 #ifdef RT_OS_WINDOWS
-    Qt::MouseButtons mouseBtns = Qt::NoButton;
-    bool fLeftBtnDown = RT_BOOL(GetAsyncKeyState(VK_LBUTTON) & 0x8000);
-    if (fLeftBtnDown)
-        mouseBtns |= Qt::LeftButton;
-# ifdef DEBUG_andy
-    LogFlowFunc(("mouseButtons=0x%x, GetAsyncKeyState(VK_LBUTTON)=%RTbool\n",
-                 mouseBtns, fLeftBtnDown));
-# endif
-    if (mouseBtns == Qt::NoButton)
-        m_enmState = Dropped;
-#endif
-#endif
-
-#ifdef RT_OS_WINDOWS
-    /* On Windows we only will get into this function if OLE's DoDragDrop
-     * routine (called by QtDrag) decides that a drop event just happened.
-     * So just update our internal state to reflect the same as on other
-     * platforms. */
+    /* On Windows this function will be called several times by Qt's
+     * OLE-specific internals to figure out which data formats we have
+     * to offer. So just assume we can drop data here for a start.* */
     fCanDrop = true;
 #else
-    /* Mouse button released? See eventFilter for more information. */
+    /* On non-Windows our state gets updated via an own event filter
+     * (see UIDnDMimeData::eventFilter). This filter will update the current
+     * operation state for us (based on the mouse buttons). */
     if (m_enmState != Dropped)
         fCanDrop = false;
@@ -143 +131 @@
     /* Do we support the requested MIME type? */
     if (   fCanDrop
-        && !m_lstFormats.contains(mimeType))
+        && !m_lstFormats.contains(strMIMEType))
     {
         LogFlowFunc(("Unsupported MIME type=%s\n",
-                     mimeType.toStdString().c_str()));
+                     strMIMEType.toStdString().c_str()));
         fCanDrop = false;
     }
@@ -169 +157 @@
         LogFlowFunc(("Skipping request, m_enmState=%d ...\n",
                      m_enmState));
-        return QMimeData::retrieveData(mimeType, type);
-    }
-
-    if (m_enmState == Dragging)
-    {
-        int rc = VINF_SUCCESS;
-
-        CGuest guest = m_session.GetConsole().GetGuest();
-        /* Start getting the data from the guest. First inform the guest we
-         * want the data in the specified MIME type. */
-        CProgress progress = guest.DragGHDropped(mimeType,
-                                                 UIDnDHandler::toVBoxDnDAction(m_defAction));
-        if (guest.isOk())
-        {
-            msgCenter().showModalProgressDialog(progress,
-                                                tr("Retrieving data ..."), ":/progress_dnd_gh_90px.png",
-                                                m_pParent);
-            if (!progress.GetCanceled())
-            {
-                if (   progress.isOk()
-                    && progress.GetResultCode() == 0)
-                {
-                    /** @todo What about retrieving bigger files? Loop? */
-
-                    /* After the data successfully arrived from the guest, we query it from Main. */
-                    QVector<uint8_t> data = guest.DragGHGetData();
-                    if (!data.isEmpty())
-                    {
-                        switch (type)
-                        {
-                            case QVariant::String:
-                            {
-                                m_data = QVariant(QString(reinterpret_cast<const char*>(data.data())));
-                                break;
-                            }
-
-                            case QVariant::ByteArray:
-                            {
-                                QByteArray ba(reinterpret_cast<const char*>(data.constData()), data.size());
-                                m_data = QVariant(ba);
-                                break;
-                            }
-
-                            case QVariant::List:
-                            {
-                                QString strData = QString(reinterpret_cast<const char*>(data.data()));
-                                QStringList lstString = strData.split("\r\n", QString::SkipEmptyParts);
-
-                                m_data = QVariant(lstString);
-                                break;
-                            }
-
-                            default:
-                                AssertMsgFailed(("Should never happen, d'oh!\n"));
-                                rc = VERR_NOT_SUPPORTED;
-                                break;
-                        }
-                    }
-                    /** @todo How often to retry on empty data received? */
-
-                    if (RT_SUCCESS(rc))
-                        emit sigDataAvailable(mimeType);
-
-                    m_enmState = DataRetrieved;
-                }
-                else
-                    msgCenter().cannotDropData(progress, m_pParent);
-            }
-            else
-                m_enmState = Canceled;
+        return QMimeData::retrieveData(strMIMEType, type);
+    }
+
+    int rc = VINF_SUCCESS;
+    if (m_enmState == Dropped)
+    {
+        AssertPtr(m_pParent);
+        rc = m_pParent->RetrieveData(strMIMEType, type, m_data);
+        if (RT_SUCCESS(rc))
+        {
+            /* Tell ourselves that data became available. */
+            emit sigDataAvailable(strMIMEType);
         }
         else
-            msgCenter().cannotDropData(guest, m_pParent);
-    }
-
-    //return QMimeData::retrieveData(mimeType, type);
-    return m_data;
+        {
+            m_enmState = Canceled;
+        }
+    }
+
+    LogFlowFunc(("Returning rc=%Rrc, m_enmState=%ld\n",
+                 rc, m_enmState));
+    return QMimeData::retrieveData(strMIMEType, type);
 }
 
@@ -327 +260 @@
             for (int i = 0; i < lstData.size(); i++)
             {
-                QString strURL = lstData.at(i).toString();
-                LogFlowFunc(("\tURL: %s\n",
-                             strURL.toAscii().constData()));
-                lstURL << QUrl(strURL.toAscii());
+                QFileInfo fileInfo(lstData.at(i).toString());
+#ifdef DEBUG
+                LogFlowFunc(("\tURL: %s (fExists=%RTbool, fIsDir=%RTbool, cb=%RU64)\n",
+                             fileInfo.absoluteFilePath().constData(), fileInfo.exists(),
+                             fileInfo.isDir(), fileInfo.size()));
+#endif
+                lstURL << QUrl::fromLocalFile(fileInfo.absoluteFilePath());
             }
             LogFlowFunc(("Number of URLs: %d\n",  lstURL.size()));
 
-            QMimeData::setUrls(f);
+            if (RT_SUCCESS(rc))
+                QMimeData::setUrls(lstURL);
             break;
         }

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

@@ -32 +32 @@
 #include "UIDnDHandler.h"
 
+/* Forward declarations: */
+class UIDnDDrag;
+
 /** @todo Subclass QWindowsMime / QMacPasteboardMime
  *  to register own/more MIME types. */
@@ -45 +48 @@
     enum State
     {
+        /** Host is in dragging state, without
+         *  having retrieved the metadata from the guest yet. */
         Dragging = 0,
-        DataRetrieved,
+        /** Guest sent over the (MIME) metadata so that the
+         *  host knows which DnD targets can be used. */
+        MetaDataRetrieved,
+        /** There has been a "dropped" action which indicates
+         *  that the guest can continue sending more data (if any)
+         *  over to the host, based on the (MIME) metadata. */
         Dropped,
+        /** The operation has been canceled. */
         Canceled
     };
@@ -55 +66 @@
     UIDnDMimeData(CSession &session, QStringList formats,
                   Qt::DropAction defAction,
-                  Qt::DropActions actions, QWidget *pParent);
+                  Qt::DropActions actions, UIDnDDrag *pParent);
 
     int setData(const QString &mimeType);
@@ -89 +100 @@
 private:
 
-    /* Private members. */
-    QWidget          *m_pParent;
+    UIDnDDrag        *m_pParent;
     CSession          m_session;
     QStringList       m_lstFormats;

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

@@ -1092 +1092 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-
 void UIMachineView::dragEnterEvent(QDragEnterEvent *pEvent)
 {
@@ -1178 +1177 @@
     gDnD->dragGHPending(session(), screenId(), this);
 }
-
 #endif /* VBOX_WITH_DRAG_AND_DROP */