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

Timestamp:

Feb 26, 2014 9:48:29 AM (11 years ago)

Author:

vboxsync

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

92467

Message:

DnD: Windows build fix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIDnDDrag.cpp (modified) (1 diff)
• UIDnDMIMEData.cpp (modified) (3 diffs)
• UIDnDMIMEData.h (modified) (2 diffs)

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

@@ -123 +123 @@
 }
 
+int UIDnDDrag::RetrieveData(const QString &strMimeType,
+                            QVariant::Type vaType, QVariant &vaData)
+{
+    LogFlowFunc(("Retrieving data as type=%s (variant type=%ld)\n",
+                 strMimeType.toAscii().constData(), vaType));
+
+    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(strMimeType,
+                                             UIDnDHandler::toVBoxDnDAction(m_defAction));
+    if (guest.isOk())
+    {
+        msgCenter().showModalProgressDialog(progress,
+                                            tr("Retrieving data ..."), ":/progress_dnd_gh_90px.png",
+                                            m_pParent);
+        if (!progress.GetCanceled())
+        {
+            rc =   (   progress.isOk()
+                    && progress.GetResultCode() == 0)
+                 ? VINF_SUCCESS : VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
+
+            if (RT_SUCCESS(rc))
+            {
+                /* After the data successfully arrived from the guest, we query it from Main. */
+                QVector<uint8_t> vecData = guest.DragGHGetData();
+                if (!vecData.isEmpty())
+                {
+                    switch (vaType)
+                    {
+                        case QVariant::String:
+                        {
+                            vaData = QVariant(QString(reinterpret_cast<const char*>(vecData.constData())));
+                            break;
+                        }
+
+                        case QVariant::ByteArray:
+                        {
+                            QByteArray ba(reinterpret_cast<const char*>(vecData.constData()), vecData.size());
+                            vaData = QVariant(ba);
+                            break;
+                        }
+
+                        case QVariant::StringList:
+                        {
+                            QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
+                            QStringList lstString = strData.split("\r\n", QString::SkipEmptyParts);
+
+                            vaData = QVariant(lstString);
+                            break;
+                        }
+
+                        default:
+                            rc = VERR_NOT_SUPPORTED;
+                            break;
+                    }
+                }
+                else
+                    rc = VERR_NO_DATA;
+            }
+            else
+                msgCenter().cannotDropData(progress, m_pParent);
+        }
+        else
+            rc = VERR_CANCELLED;
+    }
+    else
+    {
+        msgCenter().cannotDropData(guest, m_pParent);
+        rc = VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 #include "UIDnDDrag.moc"
 

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

@@ -40 +40 @@
 UIDnDMimeData::UIDnDMimeData(CSession &session, QStringList formats,
                              Qt::DropAction defAction, Qt::DropActions actions,
-                             QWidget *pParent)
+                             UIDnDDrag *pParent)
     : m_pParent(pParent)
     , m_session(session)
@@ -164 +164 @@
     {
         AssertPtr(m_pParent);
-        rc = retrieveDataInternal(strMIMEType, type, m_data);
+        rc = m_pParent->RetrieveData(strMIMEType, type, m_data);
         if (RT_SUCCESS(rc))
         {
@@ -179 +179 @@
                  rc, m_enmState));
     return m_data;
-}
-
-int UIDnDMimeData::retrieveDataInternal(const QString &strMimeType,
-                                        QVariant::Type vaType, QVariant &vaData) const
-{
-    LogFlowFunc(("Retrieving data as type=%s (variant type=%ld)\n",
-                 strMimeType.toAscii().constData(), vaType));
-
-    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(strMimeType,
-                                             UIDnDHandler::toVBoxDnDAction(m_defAction));
-    if (guest.isOk())
-    {
-        msgCenter().showModalProgressDialog(progress,
-                                            tr("Retrieving data ..."), ":/progress_dnd_gh_90px.png",
-                                            m_pParent);
-        if (!progress.GetCanceled())
-        {
-            rc =   (   progress.isOk()
-                    && progress.GetResultCode() == 0)
-                 ? VINF_SUCCESS : VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
-
-            if (RT_SUCCESS(rc))
-            {
-                /* After the data successfully arrived from the guest, we query it from Main. */
-                QVector<uint8_t> vecData = guest.DragGHGetData();
-                if (!vecData.isEmpty())
-                {
-                    switch (vaType)
-                    {
-                        case QVariant::String:
-                        {
-                            vaData = QVariant(QString(reinterpret_cast<const char*>(vecData.constData())));
-                            break;
-                        }
-
-                        case QVariant::ByteArray:
-                        {
-                            QByteArray ba(reinterpret_cast<const char*>(vecData.constData()), vecData.size());
-                            vaData = QVariant(ba);
-                            break;
-                        }
-
-                        case QVariant::StringList:
-                        {
-                            QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
-                            QStringList lstString = strData.split("\r\n", QString::SkipEmptyParts);
-
-                            vaData = QVariant(lstString);
-                            break;
-                        }
-
-                        default:
-                            rc = VERR_NOT_SUPPORTED;
-                            break;
-                    }
-                }
-                else
-                    rc = VERR_NO_DATA;
-            }
-            else
-                msgCenter().cannotDropData(progress, m_pParent);
-        }
-        else
-            rc = VERR_CANCELLED;
-    }
-    else
-    {
-        msgCenter().cannotDropData(guest, m_pParent);
-        rc = VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
 }
 

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

@@ -63 +63 @@
     UIDnDMimeData(CSession &session, QStringList formats,
                   Qt::DropAction defAction,
-                  Qt::DropActions actions, QWidget *pParent);
+                  Qt::DropActions actions, UIDnDDrag *pParent);
 
     int setData(const QString &mimeType);
@@ -101 +101 @@
 private:
 
-    QWidget          *m_pParent;
+    UIDnDDrag        *m_pParent;
     CSession          m_session;
     QStringList       m_lstFormats;