diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/corelib/serialization/convert/xmlconverter.cpp | 6 | ||||
-rw-r--r-- | examples/sql/sqlbrowser/browser.cpp | 4 | ||||
-rw-r--r-- | examples/widgets/tools/settingseditor/variantdelegate.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/corelib/serialization/convert/xmlconverter.cpp b/examples/corelib/serialization/convert/xmlconverter.cpp index 87ba9b5156..c2811c5745 100644 --- a/examples/corelib/serialization/convert/xmlconverter.cpp +++ b/examples/corelib/serialization/convert/xmlconverter.cpp @@ -294,7 +294,7 @@ static QVariant variantFromXml(QXmlStreamReader &xml, Converter::Options options else if (type == QLatin1String("regex")) id = QMetaType::QRegularExpression; else - id = QMetaType::type(type.toLatin1()); + id = QMetaType::fromName(type.toLatin1()).id(); if (id == QMetaType::UnknownType) { fprintf(stderr, "%lld:%lld: Invalid XML: unknown type '%s'.\n", xml.lineNumber(), xml.columnNumber(), qPrintable(type.toString())); @@ -302,7 +302,7 @@ static QVariant variantFromXml(QXmlStreamReader &xml, Converter::Options options } result = text.toString(); - if (!result.convert(id)) { + if (!result.convert(QMetaType(id))) { fprintf(stderr, "%lld:%lld: Invalid XML: could not parse content as type '%s'.\n", xml.lineNumber(), xml.columnNumber(), qPrintable(type.toString())); exit(EXIT_FAILURE); @@ -433,7 +433,7 @@ static void variantToXml(QXmlStreamWriter &xml, const QVariant &v) // does this convert to string? const char *typeName = v.typeName(); QVariant copy = v; - if (copy.convert(QMetaType::QString)) { + if (copy.convert(QMetaType(QMetaType::QString))) { xml.writeAttribute(typeString, QString::fromLatin1(typeName)); xml.writeCharacters(copy.toString()); } else { diff --git a/examples/sql/sqlbrowser/browser.cpp b/examples/sql/sqlbrowser/browser.cpp index b05cf52099..3efd8b77b4 100644 --- a/examples/sql/sqlbrowser/browser.cpp +++ b/examples/sql/sqlbrowser/browser.cpp @@ -194,8 +194,8 @@ void Browser::showMetaData(const QString &t) QSqlField fld = rec.field(i); model->setData(model->index(i, 0), fld.name()); model->setData(model->index(i, 1), fld.typeID() == -1 - ? QString(QMetaType::typeName(fld.type())) - : QString("%1 (%2)").arg(QMetaType::typeName(fld.type())).arg(fld.typeID())); + ? QString(fld.metaType().name()) + : QString("%1 (%2)").arg(fld.metaType().name()).arg(fld.typeID())); model->setData(model->index(i, 2), fld.length()); model->setData(model->index(i, 3), fld.precision()); model->setData(model->index(i, 4), fld.requiredStatus() == -1 ? QVariant("?") diff --git a/examples/widgets/tools/settingseditor/variantdelegate.cpp b/examples/widgets/tools/settingseditor/variantdelegate.cpp index 255f6135be..24a236aeee 100644 --- a/examples/widgets/tools/settingseditor/variantdelegate.cpp +++ b/examples/widgets/tools/settingseditor/variantdelegate.cpp @@ -334,7 +334,7 @@ void VariantDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, break; default: value = text; - value.convert(originalValue.userType()); + value.convert(originalValue.metaType()); } } |