Changeset 100035 in vbox

Timestamp:

Jun 1, 2023 12:59:18 PM (2 years ago)

Author:

vboxsync

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

157713

Message:

FE/Qt: bugref:10450: Runtime UI: Qt6 compatibility bits for UIDnDMIMEData; QVariant::Type is obsolete and repalced with QMetaType::Type but I don't really wish to put #ifdef to each place where QVariant::Type is used, it's better to get rid of obsolete stuff after we traversed to Qt6 already.

Location:

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

Files:

• UIDnDMIMEData.cpp (modified) (1 diff)
• UIDnDMIMEData.h (modified) (1 diff)

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

@@ -97 +97 @@
  * @return QVariant
  */
+#ifndef VBOX_IS_QT6_OR_LATER /* QVariant::Type is repalced with QMetaType in Qt6 */
 QVariant UIDnDMIMEData::retrieveData(const QString &strMIMEType, QVariant::Type vaType) const
 {
+#else
+QVariant UIDnDMIMEData::retrieveData(const QString &strMIMEType, QMetaType metaType) const
+{
+    /* In Qt6 deprecated QVariant::Type is redefined through QMetaType::Type: */
+    const QVariant::Type vaType = (QVariant::Type)metaType.id();
+#endif
+
     LogFlowFunc(("state=%RU32, curAction=0x%x, defAction=0x%x, mimeType=%s, type=%d (%s)\n",
                  m_enmState, m_curAction, m_defAction, strMIMEType.toStdString().c_str(), vaType, QVariant::typeToName(vaType)));

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

@@ -105 +105 @@
     virtual bool hasFormat(const QString &mimeType) const;
 
-    virtual QVariant retrieveData(const QString &strMIMEType, QVariant::Type vaType) const;
+#ifndef VBOX_IS_QT6_OR_LATER /* QVariant::Type is repalced with QMetaType in Qt6 */
+    virtual QVariant retrieveData(const QString &strMIMEType, QVariant::Type vaType) const RT_OVERRIDE;
+#else
+    virtual QVariant retrieveData(const QString &strMIMEType, QMetaType metaType) const RT_OVERRIDE;
+#endif
     /** @}  */