diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-06-15 09:31:31 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-15 10:56:33 +0200 |
commit | 67f04fa060be1b75b8ea60ac6eb45d1577d1fdaf (patch) | |
tree | 368d745ae016534cb2e18c7f5454fffbc8c1216f /tests/auto/sql/models | |
parent | 8929c0a3550ae27cb5c9ed276d4c5a85594ba682 (diff) |
Deprecate QVariant::Type uses in QSqlField
Add metaType()/setMetaType() methods to be used instead
of the type() methods taking a QVariant::Type.
Change-Id: Ieaba35b73f8061cd83288dd6b50d58322db3c7ed
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'tests/auto/sql/models')
3 files changed, 20 insertions, 20 deletions
diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp index 8a87f8bf15..88e052cd18 100644 --- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp +++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp @@ -417,9 +417,9 @@ void tst_QSqlQueryModel::record() QCOMPARE(rec.fieldName(0), isToUpper ? QString("ID") : QString("id")); QCOMPARE(rec.fieldName(1), isToUpper ? QString("NAME") : QString("name")); QCOMPARE(rec.fieldName(2), isToUpper ? QString("TITLE") : QString("title")); - QCOMPARE(rec.value(0), QVariant(rec.field(0).type())); - QCOMPARE(rec.value(1), QVariant(rec.field(1).type())); - QCOMPARE(rec.value(2), QVariant(rec.field(2).type())); + QCOMPARE(rec.value(0), QVariant(rec.field(0).metaType())); + QCOMPARE(rec.value(1), QVariant(rec.field(1).metaType())); + QCOMPARE(rec.value(2), QVariant(rec.field(2).metaType())); rec = model.record(0); QCOMPARE(rec.fieldName(0), isToUpper ? QString("ID") : QString("id")); diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp index 19d8430118..4fd4f1559d 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp @@ -468,10 +468,10 @@ void tst_QSqlRelationalTableModel::insertRecord() QVERIFY_SQL(model, select()); QSqlRecord rec; - QSqlField f1("id", QVariant::Int); - QSqlField f2("name", QVariant::String); - QSqlField f3("title_key", QVariant::Int); - QSqlField f4("another_title_key", QVariant::Int); + QSqlField f1("id", QMetaType(QMetaType::Int)); + QSqlField f2("name", QMetaType(QMetaType::QString)); + QSqlField f3("title_key", QMetaType(QMetaType::Int)); + QSqlField f4("another_title_key", QMetaType(QMetaType::Int)); f1.setValue(7); f2.setValue("test"); @@ -518,10 +518,10 @@ void tst_QSqlRelationalTableModel::setRecord() QVERIFY_SQL(model, select()); QSqlRecord rec; - QSqlField f1("id", QVariant::Int); - QSqlField f2("name", QVariant::String); - QSqlField f3("title_key", QVariant::Int); - QSqlField f4("another_title_key", QVariant::Int); + QSqlField f1("id", QMetaType(QMetaType::Int)); + QSqlField f2("name", QMetaType(QMetaType::QString)); + QSqlField f3("title_key", QMetaType(QMetaType::Int)); + QSqlField f4("another_title_key", QMetaType(QMetaType::Int)); f1.setValue(7); f2.setValue("tester"); @@ -1417,9 +1417,9 @@ void tst_QSqlRelationalTableModel::whiteSpaceInIdentifiers() QVERIFY_SQL(model, select()); QSqlRecord rec; - QSqlField f1("id", QVariant::Int); - QSqlField f2(db.driver()->escapeIdentifier("city key", QSqlDriver::FieldName), QVariant::Int); - QSqlField f3(db.driver()->escapeIdentifier("extra field", QSqlDriver::FieldName), QVariant::Int); + QSqlField f1("id", QMetaType(QMetaType::Int)); + QSqlField f2(db.driver()->escapeIdentifier("city key", QSqlDriver::FieldName), QMetaType(QMetaType::Int)); + QSqlField f3(db.driver()->escapeIdentifier("extra field", QSqlDriver::FieldName), QMetaType(QMetaType::Int)); f1.setValue(3); f2.setValue(2); @@ -1445,9 +1445,9 @@ void tst_QSqlRelationalTableModel::whiteSpaceInIdentifiers() model.setEditStrategy(QSqlTableModel::OnManualSubmit); QSqlRecord recNew; - QSqlField f1New("id", QVariant::Int); - QSqlField f2New(db.driver()->escapeIdentifier("city key", QSqlDriver::FieldName), QVariant::Int); - QSqlField f3New(db.driver()->escapeIdentifier("extra field", QSqlDriver::FieldName), QVariant::Int); + QSqlField f1New("id", QMetaType(QMetaType::Int)); + QSqlField f2New(db.driver()->escapeIdentifier("city key", QSqlDriver::FieldName), QMetaType(QMetaType::Int)); + QSqlField f3New(db.driver()->escapeIdentifier("extra field", QSqlDriver::FieldName), QMetaType(QMetaType::Int)); f1New.setValue(4); f2New.setValue(1); diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp index f58fdc9bf9..a0aa011d0c 100644 --- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp +++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp @@ -956,9 +956,9 @@ void tst_QSqlTableModel::insertMultiRecords() QVERIFY(model.insertRow(2)); - QCOMPARE(model.data(model.index(2, 0)), QVariant(model.record().field(0).type())); - QCOMPARE(model.data(model.index(2, 1)), QVariant(model.record().field(1).type())); - QCOMPARE(model.data(model.index(2, 2)), QVariant(model.record().field(2).type())); + QCOMPARE(model.data(model.index(2, 0)), QVariant(model.record().field(0).metaType())); + QCOMPARE(model.data(model.index(2, 1)), QVariant(model.record().field(1).metaType())); + QCOMPARE(model.data(model.index(2, 2)), QVariant(model.record().field(2).metaType())); QVERIFY(model.insertRow(3)); QVERIFY(model.insertRow(0)); |