Changeset 101566 in vbox for trunk

Timestamp:

Oct 24, 2023 12:14:07 AM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10450: Get rid of Qt5 stuff; This one is about QMetaType stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (3 diffs)
• runtime/UIDnDMIMEData.cpp (modified) (11 diffs)
• runtime/UIDnDMIMEData.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.cpp

@@ -137 +137 @@
 {
     QVariant data = m_itemData.value(UICustomFileSystemModelData_Name, QVariant());
-#ifndef VBOX_IS_QT6_OR_LATER /* QVariant/QMetaType ::Type is replaced with QMetaType in Qt6 for canConvert */
-    if (!data.canConvert(QMetaType::QString))
-#else
     if (!data.canConvert(QMetaType(QMetaType::QString)))
-#endif
         return QString();
     return data.toString();
@@ -437 +433 @@
     if (index.isValid() && role == Qt::EditRole)
     {
-#ifndef VBOX_IS_QT6_OR_LATER /* QVariant/QMetaType ::Type is replaced with QMetaType in Qt6 for canConvert */
-        if (index.column() == 0 && value.canConvert(QMetaType::QString))
-#else
         if (index.column() == 0 && value.canConvert(QMetaType(QMetaType::QString)))
-#endif
         {
             UICustomFileSystemItem *pItem = static_cast<UICustomFileSystemItem*>(index.internalPointer());
@@ -471 +463 @@
             return QVariant();
         /* Format date/time column: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QVariant/QMetaType ::Type is replaced with QMetaType in Qt6 for canConvert */
-        if (item->data(index.column()).canConvert(QMetaType::QDateTime))
-#else
         if (item->data(index.column()).canConvert(QMetaType(QMetaType::QDateTime)))
-#endif
         {
             QDateTime dateTime = item->data(index.column()).toDateTime();

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

@@ -97 +97 @@
  * @return QVariant
  */
-#ifndef VBOX_IS_QT6_OR_LATER /* QVariant::Type is replaced with QMetaType in Qt6 for retrieveData */
-QVariant UIDnDMIMEData::retrieveData(const QString &strMIMEType, QVariant::Type enmType) const
-{
-    /* Acquire QMetaType::Type: */
-    const QMetaType::Type vaType = (QMetaType::Type)enmType;
-
-    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)));
-#else
 QVariant UIDnDMIMEData::retrieveData(const QString &strMIMEType, QMetaType metaType) const
 {
@@ -113 +104 @@
     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, metaType.name()));
-#endif
 
     int rc = VINF_SUCCESS;
@@ -171 +161 @@
                    || vaType == QMetaType::QStringList))
         {
-# ifndef VBOX_IS_QT6_OR_LATER /* QVariant is replaced with QMetaType in Qt6 */
-            LogRel(("DnD: Unsupported data type '%s'\n", QVariant::typeToName(vaType)));
-# else
             LogRel(("DnD: Unsupported data type '%s'\n", metaType.name()));
-# endif
             rc = VERR_NOT_SUPPORTED;
         }
@@ -189 +175 @@
         if (RT_SUCCESS(rc))
         {
-#ifndef VBOX_IS_QT6_OR_LATER /* QVariant is replaced with QMetaType in Qt6 */
-            LogRel3(("DnD: Returning data for MIME type=%s, variant type=%s, rc=%Rrc\n",
-                     strMIMEType.toStdString().c_str(), QVariant::typeToName(vaData.type()), rc));
-#else
             LogRel3(("DnD: Returning data for MIME type=%s, variant type=%s, rc=%Rrc\n",
                      strMIMEType.toStdString().c_str(), metaType.name(), rc));
-#endif
 
             return vaData;
@@ -230 +211 @@
         vaType = QMetaType::UnknownType;
 
-#ifndef VBOX_IS_QT6_OR_LATER /* QVariant is replaced with QMetaType in Qt6 */
-    LogFlowFunc(("strMIMEType=%s -> vaType=%s\n", qPrintable(strMIMEType), QVariant::typeToName(vaType)));
-#else
     LogFlowFunc(("strMIMEType=%s -> vaType=%s\n", qPrintable(strMIMEType), QMetaType(vaType).name()));
-#endif
     return vaType;
 }
@@ -245 +222 @@
 {
     RT_NOREF(strMIMEType);
-#ifndef VBOX_IS_QT6_OR_LATER /* QVariant is replaced with QMetaType in Qt6 */
-    LogFlowFunc(("vecDataSize=%d, strMIMEType=%s vaType=%s\n",
-                 vecData.size(), qPrintable(strMIMEType), QVariant::typeToName(vaType)));
-#else
     LogFlowFunc(("vecDataSize=%d, strMIMEType=%s vaType=%s\n",
                  vecData.size(), qPrintable(strMIMEType), QMetaType(vaType).name()));
-#endif
 
     int rc = VINF_SUCCESS;
@@ -260 +232 @@
         {
             vaData = QVariant::fromValue(QString(reinterpret_cast<const char *>(vecData.constData())));
-#ifndef VBOX_IS_QT6_OR_LATER /* type() is replaced with typeId() in Qt6 */
-            Assert(vaData.type() == QVariant::String);
-#else
             Assert(vaData.typeId() == QMetaType::QString);
-#endif
 
             break;
@@ -274 +242 @@
 
             vaData = QVariant::fromValue(ba);
-#ifndef VBOX_IS_QT6_OR_LATER /* type() is replaced with typeId() in Qt6 */
-            Assert(vaData.type() == QVariant::ByteArray);
-#else
             Assert(vaData.typeId() == QMetaType::QByteArray);
-#endif
             break;
         }
@@ -297 +261 @@
             {
                 QVariant vaURL = QVariant::fromValue(QUrl(strCur));
-#ifndef VBOX_IS_QT6_OR_LATER /* type() is replaced with typeId() in Qt6 */
-                Assert(vaURL.type() == QVariant::Url);
-#else
                 Assert(vaURL.typeId() == QMetaType::QUrl);
-#endif
                 lstVariant.append(vaURL);
             }
 
             vaData = QVariant::fromValue(lstVariant);
-#ifndef VBOX_IS_QT6_OR_LATER /* type() is replaced with typeId() in Qt6 */
-            Assert(vaData.type() == QVariant::List);
-#else
             Assert(vaData.typeId() == QMetaType::QVariantList);
-#endif
             break;
         }
@@ -329 +285 @@
 #endif
             vaData = QVariant::fromValue(lstString);
-#ifndef VBOX_IS_QT6_OR_LATER /* type() is replaced with typeId() in Qt6 */
-            Assert(vaData.type() == QVariant::StringList);
-#else
             Assert(vaData.typeId() == QMetaType::QStringList);
-#endif
             break;
         }
@@ -339 +291 @@
         default:
         {
-#ifndef VBOX_IS_QT6_OR_LATER /* QVariant is replaced with QMetaType in Qt6 */
-            LogRel2(("DnD: Converting data (%d bytes) from guest to variant type '%s' not supported\n",
-                     vecData.size(), QVariant::typeToName(vaType) ? QVariant::typeToName(vaType) : "<Invalid>"));
-#else
             LogRel2(("DnD: Converting data (%d bytes) from guest to variant type '%s' not supported\n",
                      vecData.size(), QMetaType(vaType).name() ? QMetaType(vaType).name() : "<Invalid>"));
-#endif
 
             rc = VERR_NOT_SUPPORTED;

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

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