[Port to Qt6] QVariant::type() => QVariant::typeId()

fenuks · Nov 9, 2024 · 420580f · 420580f
1 parent 3e24185
commit 420580f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/3rdparty/solid-lite/backends/iokit/cfhelper.cpp b/3rdparty/solid-lite/backends/iokit/cfhelper.cpp
@@ -109,7 +109,7 @@ static QVariant q_toVariant(const CFTypeRef &obj)
         bool metNonString = false;
         for (CFIndex i = 0; i < size; ++i) {
             QVariant value = q_toVariant(CFArrayGetValueAtIndex(cfarray, i));
-            if (value.type() != QVariant::String)
+            if (value.typeId() != QMetaType::QString)
                 metNonString = true;
             list << value;
         }

diff --git a/3rdparty/solid-lite/predicate.cpp b/3rdparty/solid-lite/predicate.cpp
@@ -209,7 +209,7 @@ bool Solid::Predicate::matches(const Device &device) const
             QVariant value = metaProp.isReadable() ? metaProp.read(iface) : QVariant();
             QVariant expected = d->value;
 
-            if (metaProp.isEnumType() && expected.type()==QVariant::String) {
+            if (metaProp.isEnumType() && expected.typeId()==QMetaType::QString) {
                 QMetaEnum metaEnum = metaProp.enumerator();
                 int value = metaEnum.keysToValue(d->value.toString().toLatin1());
                 if (value>=0) { // No value found for these keys, resetting expected to invalid
@@ -287,9 +287,9 @@ QString Solid::Predicate::toString() const
 
         QString value;
 
-        switch (d->value.type())
+        switch (d->value.typeId())
         {
-        case QVariant::StringList:
+        case QMetaType::QStringList:
         {
             value = '{';
 
@@ -311,13 +311,13 @@ QString Solid::Predicate::toString() const
             value+= '}';
             break;
         }
-        case QVariant::Bool:
+        case QMetaType::Bool:
             value = (d->value.toBool()?"true":"false");
             break;
-        case QVariant::Int:
-        case QVariant::UInt:
-        case QVariant::LongLong:
-        case QVariant::ULongLong:
+        case QMetaType::Int:
+        case QMetaType::UInt:
+        case QMetaType::LongLong:
+        case QMetaType::ULongLong:
             value = d->value.toString();
             break;
         default:

diff --git a/db/librarydb.cpp b/db/librarydb.cpp
@@ -413,7 +413,7 @@ class SqlQuery
         } else {
             // Do integers inline - sqlite seems to get confused when you pass integers
             // to bound parameters
-            if (QVariant::Int==value.type()) {
+            if (QMetaType::Int==value.typeId()) {
                 whereClauses << QString("%1 %2 %3").arg(column, op, value.toString());
             } else if ("genre"==column) {
                 QString clause("(");

diff --git a/support/urllabel.cpp b/support/urllabel.cpp
@@ -43,7 +43,7 @@ void UrlLabel::setText(const QString &t)
 
 void UrlLabel::setProperty(const char *name, const QVariant &value)
 {
-    if (name && !strcmp(name, "text") && QVariant::String==value.type()) {
+    if (name && !strcmp(name, "text") && QMetaType::QString==value.typeId()) {
         setText(value.toString());
     }
 }

diff --git a/widgets/notelabel.cpp b/widgets/notelabel.cpp
@@ -76,7 +76,7 @@ NoteLabel::NoteLabel(QWidget *parent)
 
 void NoteLabel::setProperty(const char *name, const QVariant &value)
 {
-    if (name && !strcmp(name, "text") && QVariant::String==value.type()) {
+    if (name && !strcmp(name, "text") && QMetaType::QString==value.typeId()) {
         setText(value.toString());
     }
 }
@@ -90,7 +90,7 @@ UrlNoteLabel::UrlNoteLabel(QWidget *parent)
 
 void UrlNoteLabel::setProperty(const char *name, const QVariant &value)
 {
-    if (name && !strcmp(name, "text") && QVariant::String==value.type()) {
+    if (name && !strcmp(name, "text") && QMetaType::QString==value.typeId()) {
         setText(value.toString());
     }
 }