Changeset 50602 in vbox for trunk/src/VBox

Timestamp:

Feb 26, 2014 12:50:39 PM (11 years ago)

Author:

vboxsync

Message:

DnD: Build fix.

Location:

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

Files:

• UIDnDDataObject_win.cpp (modified) (2 diffs)
• UIDnDDataObject_win.h (modified) (2 diffs)
• UIDnDDrag.cpp (modified) (7 diffs)
• UIDnDDrag.h (modified) (1 diff)
• UIDnDDropSource_win.cpp (modified) (1 diff)
• UIDnDDropSource_win.h (modified) (2 diffs)
• UIDnDMIMEData.cpp (modified) (9 diffs)
• UIDnDMIMEData.h (modified) (2 diffs)

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

@@ -40 +40 @@
 #include "UIDnDEnumFormat_win.h"
 
-UIDnDDataObject::UIDnDDataObject(const QStringList &lstFormats,
-                                 UIDnDDrag *pParent)
-    : mpParent(pParent),
+UIDnDDataObject::UIDnDDataObject(CSession &session, 
+                                 const QStringList &lstFormats,
+                                 QWidget *pParent)
+    : mSession(session),
+      mpParent(pParent),
       mStatus(Uninitialized),
       mRefCount(1),
@@ -286 +288 @@
         int rc;
         if (!mVaData.isValid())
-            rc = mpParent->RetrieveData(strMIMEType, vaType, mVaData);
+        {
+            rc = UIDnDDrag::RetrieveData(mSession,
+                                         DropAction::CopyAction,
+                                         strMIMEType, vaType, mVaData,
+                                         mpParent);
+        }
         else
             rc = VINF_SUCCESS; /* Data already retrieved. */

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

@@ -45 +45 @@
 public:
 
-    UIDnDDataObject(const QStringList &lstFormats, UIDnDDrag *pParent);
+    UIDnDDataObject(CSession &session, const QStringList &lstFormats, QWidget *pParent);
     virtual ~UIDnDDataObject(void);
 
@@ -81 +81 @@
                         LONG lindex = -1, DWORD dwAspect = DVASPECT_CONTENT, DVTARGETDEVICE *pTargetDevice = NULL);
 
-    UIDnDDrag  *mpParent;
+    QWidget    *mpParent;
+    CSession    mSession;
     Status      mStatus;
     LONG        mRefCount;

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

@@ -44 +44 @@
 #endif
 
-UIDnDDrag::UIDnDDrag(CSession &session, const QStringList &lstFormats,
+UIDnDDrag::UIDnDDrag(CSession &session, 
+                     const QStringList &lstFormats,
                      Qt::DropAction defAction, Qt::DropActions actions,
-                     QWidget *pParent)
-    : m_pParent(pParent)
-    , m_session(session)
+                     QWidget *pParent /* = NULL */)
+    : m_session(session)
     , m_lstFormats(lstFormats)
     , m_defAction(defAction)
     , m_actions(actions)
+    , m_pParent(pParent)
 #ifndef RT_OS_WINDOWS
     , pMData(NULL)
@@ -70 +71 @@
     int rc = VINF_SUCCESS;
 #ifdef RT_OS_WINDOWS
-    UIDnDDropSource *pDropSource = new UIDnDDropSource(this /* pParent */);
-    UIDnDDataObject *pDataObject = new UIDnDDataObject(m_lstFormats, this /* pParent */);
+    UIDnDDropSource *pDropSource = new UIDnDDropSource(m_pParent);
+    UIDnDDataObject *pDataObject = new UIDnDDataObject(m_session, m_lstFormats, m_pParent);
 
     DWORD dwOKEffects = DROPEFFECT_NONE;
@@ -98 +99 @@
 
     /* pMData is transfered to the QDrag object, so no need for deletion. */
-    pMData = new UIDnDMimeData(m_session, m_lstFormats,
-                               m_defAction, m_actions, m_pParent);
+    pMData = new UIDnDMimeData(m_session, 
+                               m_lstFormats, m_defAction, m_actions,
+                               m_pParent);
 
     /* Inform the MIME data object of any changes in the current action. */
@@ -123 +125 @@
 }
 
-int UIDnDDrag::RetrieveData(const QString &strMimeType,
-                            QVariant::Type vaType, QVariant &vaData)
+/* static */
+int UIDnDDrag::RetrieveData(const CSession &session,
+                            Qt::DropAction dropAction,
+                            const QString &strMimeType,
+                            QVariant::Type vaType, QVariant &vaData,
+                            QWidget *pParent)
 {
     LogFlowFunc(("Retrieving data as type=%s (variant type=%ld)\n",
@@ -130 +136 @@
 
     int rc = VINF_SUCCESS;
-    CGuest guest = m_session.GetConsole().GetGuest();
+    CGuest guest = 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));
+                                             UIDnDHandler::toVBoxDnDAction(dropAction));
     if (guest.isOk())
     {
         msgCenter().showModalProgressDialog(progress,
                                             tr("Retrieving data ..."), ":/progress_dnd_gh_90px.png",
-                                            m_pParent);
+                                            pParent);
         if (!progress.GetCanceled())
         {
@@ -186 +192 @@
             }
             else
-                msgCenter().cannotDropData(progress, m_pParent);
+                msgCenter().cannotDropData(progress, pParent);
         }
         else
@@ -193 +199 @@
     else
     {
-        msgCenter().cannotDropData(guest, m_pParent);
+        msgCenter().cannotDropData(guest, pParent);
         rc = VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
     }

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

@@ -45 +45 @@
 public:
 
-    UIDnDDrag(CSession &session, const QStringList &lstFormats,
-              Qt::DropAction defAction,
-              Qt::DropActions actions, QWidget *pParent);
-
+    UIDnDDrag(CSession &session, 
+              const QStringList &lstFormats, Qt::DropAction defAction, Qt::DropActions actions,
+              QWidget *pParent = NULL);
 public:
 
     int DoDragDrop(void);
 
-    int RetrieveData(const QString &strMimeType,
-                     QVariant::Type vaType, QVariant &vaData);
+public:
+
+    static int RetrieveData(const CSession &session, Qt::DropAction dropAction, const QString &strMimeType, QVariant::Type vaType, QVariant &vaData, QWidget *pParent);
 
 private:
 
-    QWidget          *m_pParent;
     CSession          m_session;
     QStringList       m_lstFormats;
     Qt::DropAction    m_defAction;
     Qt::DropActions   m_actions;
+    QWidget          *m_pParent;
 #ifndef RT_OS_WINDOWS
     UIDnDMimeData    *pMData;

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

@@ -32 +32 @@
 #include "UIDnDDropSource_win.h"
 
-UIDnDDropSource::UIDnDDropSource(UIDnDDrag *pParent)
+UIDnDDropSource::UIDnDDropSource(QWidget *pParent)
     : mRefCount(1),
       mpParent(pParent),

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

@@ -27 +27 @@
 public:
 
-    UIDnDDropSource(UIDnDDrag *pParent);
+    UIDnDDropSource(QWidget *pParent);
     virtual ~UIDnDDropSource(void);
 
@@ -48 +48 @@
 
     LONG mRefCount;
-    UIDnDDrag *mpParent;
+    QWidget *mpParent;
     DWORD mdwCurEffect;
     Qt::DropActions muCurAction;

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

@@ -38 +38 @@
 #include "UIMessageCenter.h"
 
-UIDnDMimeData::UIDnDMimeData(CSession &session, QStringList formats,
+UIDnDMimeData::UIDnDMimeData(CSession &session, 
+                             QStringList formats,
                              Qt::DropAction defAction, Qt::DropActions actions,
-                             UIDnDDrag *pParent)
-    : m_pParent(pParent)
-    , m_session(session)
+                             QWidget *pParent)
+    : m_Session(session)
     , m_lstFormats(formats)
     , m_defAction(defAction)
     , m_actions(actions)
+    , m_pParent(pParent)
     , m_enmState(Dragging)
-    , m_data(QVariant::Invalid)
+    , m_vaData(QVariant::Invalid)
 {
     LogFlowThisFuncEnter();
@@ -108 +109 @@
 
 QVariant UIDnDMimeData::retrieveData(const QString &strMIMEType,
-                                     QVariant::Type type) const
+                                     QVariant::Type vaType) const
 {
     LogFlowFunc(("m_enmState=%d, mimeType=%s, type=%d (%s)\n",
                  m_enmState, strMIMEType.toStdString().c_str(),
-                 type, QVariant::typeToName(type)));
+                 vaType, QVariant::typeToName(vaType)));
 
     bool fCanDrop = true;
@@ -142 +143 @@
         && !(
              /* Plain text. */
-                type == QVariant::String
+                vaType == QVariant::String
              /* Binary data. */
-             || type == QVariant::ByteArray
+             || vaType == QVariant::ByteArray
              /* URI list. */
-             || type == QVariant::List))
+             || vaType == QVariant::List))
     {
         LogFlowFunc(("Unsupported data type=%d (%s)\n",
-                     type, QVariant::typeToName(type)));
+                     vaType, QVariant::typeToName(vaType)));
         fCanDrop = false;
     }
@@ -157 +158 @@
         LogFlowFunc(("Skipping request, m_enmState=%d ...\n",
                      m_enmState));
-        return QMimeData::retrieveData(strMIMEType, type);
+        return QMimeData::retrieveData(strMIMEType, vaType);
     }
 
@@ -163 +164 @@
     if (m_enmState == Dropped)
     {
-        AssertPtr(m_pParent);
-        rc = m_pParent->RetrieveData(strMIMEType, type, m_data);
+        rc = UIDnDDrag::RetrieveData(m_Session,
+                                     m_defAction,
+                                     strMIMEType, vaType, m_vaData,
+                                     m_pParent);
         if (RT_SUCCESS(rc))
         {
@@ -178 +181 @@
     LogFlowFunc(("Returning rc=%Rrc, m_enmState=%ld\n",
                  rc, m_enmState));
-    return m_data;
+    return m_vaData;
 }
 
@@ -236 +239 @@
 {
     LogFlowFunc(("mimeType=%s, dataType=%s\n",
-                 mimeType.toAscii().constData(), m_data.typeName()));
+                 mimeType.toAscii().constData(), m_vaData.typeName()));
 
     int rc = VINF_SUCCESS;
 
-    switch (m_data.type())
+    switch (m_vaData.type())
     {
         case QVariant::String: /* Plain text. */
         {
-            QMimeData::setText(m_data.toString());
+            QMimeData::setText(m_vaData.toString());
             break;
         }
@@ -250 +253 @@
         case QVariant::ByteArray: /* Raw byte data. */
         {
-            QMimeData::setData(mimeType, m_data.toByteArray());
+            QMimeData::setData(mimeType, m_vaData.toByteArray());
             break;
         }
@@ -256 +259 @@
         case QVariant::StringList: /* URI. */
         {
-            QList<QVariant> lstData = m_data.toList();
+            QList<QVariant> lstData = m_vaData.toList();
             QList<QUrl> lstURL;
             for (int i = 0; i < lstData.size(); i++)

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

@@ -61 +61 @@
 public:
 
-    UIDnDMimeData(CSession &session, QStringList formats,
-                  Qt::DropAction defAction,
-                  Qt::DropActions actions, UIDnDDrag *pParent);
+    UIDnDMimeData(CSession &session, QStringList formats, Qt::DropAction defAction, Qt::DropActions actions, QWidget *pParent);
+
+public:
 
     int setData(const QString &mimeType);
@@ -95 +95 @@
 #endif
 
-protected:
-
-    int retrieveDataInternal(const QString &strMimeType, QVariant::Type vaType, QVariant &vaData) const;
-
 private:
 
-    UIDnDDrag        *m_pParent;
-    CSession          m_session;
+    CSession          m_Session;
     QStringList       m_lstFormats;
     Qt::DropAction    m_defAction;
     Qt::DropActions   m_actions;
+    QWidget          *m_pParent;
     mutable State     m_enmState;
-    mutable QVariant  m_data;
+    mutable QVariant  m_vaData;
 };