aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp')
-rw-r--r--tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp58
1 files changed, 31 insertions, 27 deletions
diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index dd845b37d5..0821669703 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -1,5 +1,6 @@
// Copyright (C) 2018 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
#include <QtQuickTestUtils/private/qmlutils_p.h>
#include <QtQuickTestUtils/private/visualtestutils_p.h>
#include <QtQuickTestUtils/private/viewtestutils_p.h>
@@ -59,7 +60,7 @@ public:
struct Branch {
Branch(Branch *parent = nullptr) : parent(parent) {}
- ~Branch() { foreach (const Node &child, children) delete child.branch; }
+ ~Branch() { for (const Node &child : std::as_const(children)) delete child.branch; }
int indexOf(Branch *branch) const {
for (int i = 0; i < children.size(); ++i) {
if (children.at(i).branch == branch)
@@ -75,7 +76,7 @@ public:
SingleRoleModel(const QStringList &list = QStringList(), const QByteArray &role = "name", QObject *parent = nullptr)
: QAbstractItemModel(parent), m_role(role)
{
- foreach (const QString &string, list)
+ for (const QString &string : list)
trunk.children.append(Node(string));
}
~SingleRoleModel() {}
@@ -182,7 +183,7 @@ public:
QStringList getList() const {
QStringList list;
- foreach (const Node &node, trunk.children)
+ for (const Node &node : trunk.children)
list.append(node.display);
return list;
}
@@ -190,13 +191,13 @@ public:
void setList(const QStringList &l) {
if (trunk.children.size() > 0) {
beginRemoveRows(QModelIndex(), 0, trunk.children.size() - 1);
- foreach (const Node &child, trunk.children) delete child.branch;
+ for (const Node &child : std::as_const(trunk.children)) delete child.branch;
trunk.children.clear();
endRemoveRows();
}
if (l.size() > 0) {
beginInsertRows(QModelIndex(), 0, l.size() -1);
- foreach (const QString &string, l)
+ for (const QString &string : l)
trunk.children.append(Node(string));
endInsertRows();
}
@@ -603,7 +604,8 @@ void tst_qquickvisualdatamodel::childChanged()
QVERIFY(name);
QCOMPARE(name->text(), QString("Row 2 updated child"));
- model.item(1,0)->appendRow(new QStandardItem(QLatin1String("Row 2 Child Item 2")));
+ QStandardItem item(QLatin1String("Row 2 Child Item 2"));
+ model.item(1,0)->appendRow(&item);
QCOMPARE(listview->count(), 2);
listview->forceLayout();
@@ -635,10 +637,10 @@ void tst_qquickvisualdatamodel::objectListModel()
QQuickView view;
QList<QObject*> dataList;
- dataList.append(new DataObject("Item 1", "red"));
- dataList.append(new DataObject("Item 2", "green"));
- dataList.append(new DataObject("Item 3", "blue"));
- dataList.append(new DataObject("Item 4", "yellow"));
+ dataList.append(new DataObject("Item 1", "red", &view));
+ dataList.append(new DataObject("Item 2", "green", &view));
+ dataList.append(new DataObject("Item 3", "blue", &view));
+ dataList.append(new DataObject("Item 4", "yellow", &view));
QQmlContext *ctxt = view.rootContext();
ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
@@ -777,10 +779,10 @@ void tst_qquickvisualdatamodel::modelProperties()
QQuickView view;
QList<QObject*> dataList;
- dataList.append(new DataObject("Item 1", "red"));
- dataList.append(new DataObject("Item 2", "green"));
- dataList.append(new DataObject("Item 3", "blue"));
- dataList.append(new DataObject("Item 4", "yellow"));
+ dataList.append(new DataObject("Item 1", "red", &view));
+ dataList.append(new DataObject("Item 2", "green", &view));
+ dataList.append(new DataObject("Item 3", "blue", &view));
+ dataList.append(new DataObject("Item 4", "yellow", &view));
QQmlContext *ctxt = view.rootContext();
ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
@@ -846,12 +848,9 @@ void tst_qquickvisualdatamodel::modelProperties()
QUrl source(testFileUrl("modelproperties2.qml"));
//3 items, 3 i each
- QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":13: ReferenceError: modelData is not defined");
- QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":13: ReferenceError: modelData is not defined");
- QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":13: ReferenceError: modelData is not defined");
- QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":11: ReferenceError: modelData is not defined");
- QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":11: ReferenceError: modelData is not defined");
- QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":11: ReferenceError: modelData is not defined");
+ QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":13: TypeError: Cannot read property 'display' of undefined");
+ QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":13: TypeError: Cannot read property 'display' of undefined");
+ QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":13: TypeError: Cannot read property 'display' of undefined");
QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":17: TypeError: Cannot read property 'display' of undefined");
QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":17: TypeError: Cannot read property 'display' of undefined");
QTest::ignoreMessage(QtWarningMsg, source.toString().toLatin1() + ":17: TypeError: Cannot read property 'display' of undefined");
@@ -2261,7 +2260,7 @@ void tst_qquickvisualdatamodel::onChanged()
evaluate<void>(object.data(), expression);
- foreach (const QString &test, tests) {
+ for (const QString &test : std::as_const(tests)) {
bool passed = evaluate<bool>(object.data(), test);
if (!passed)
qWarning() << test;
@@ -3998,7 +3997,8 @@ void tst_qquickvisualdatamodel::asynchronousInsert()
engine.rootContext()->setContextProperty("myModel", &model);
- QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(c.create());
+ QScopedPointer<QObject> o(c.create());
+ QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(o.data());
QVERIFY(visualModel);
ItemRequester requester;
@@ -4063,7 +4063,8 @@ void tst_qquickvisualdatamodel::asynchronousRemove()
engine.rootContext()->setContextProperty("myModel", &model);
- QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(c.create());
+ QScopedPointer<QObject> o(c.create());
+ QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(o.data());
QVERIFY(visualModel);
ItemRequester requester;
@@ -4142,7 +4143,8 @@ void tst_qquickvisualdatamodel::asynchronousMove()
engine.rootContext()->setContextProperty("myModel", &model);
- QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(c.create());
+ QScopedPointer<QObject> o(c.create());
+ QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(o.data());
QVERIFY(visualModel);
ItemRequester requester;
@@ -4190,7 +4192,8 @@ void tst_qquickvisualdatamodel::asynchronousCancel()
engine.rootContext()->setContextProperty("myModel", &model);
- QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(c.create());
+ QScopedPointer<QObject> o(c.create());
+ QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(o.data());
QVERIFY(visualModel);
QQuickItem *item = qobject_cast<QQuickItem*>(visualModel->object(requestIndex, QQmlIncubator::Asynchronous));
@@ -4312,7 +4315,8 @@ void tst_qquickvisualdatamodel::delegateModelChangeDelegate()
c.setData("import QtQml.Models 2.2\nDelegateModel {}\n", QUrl());
QCOMPARE(c.status(), QQmlComponent::Ready);
- QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(c.create(context.data()));
+ QScopedPointer<QObject> o(c.create(context.data()));
+ QQmlDelegateModel *visualModel = qobject_cast<QQmlDelegateModel*>(o.data());
QVERIFY(visualModel);
visualModel->setModel(QVariant(3));
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 10:58:47 +0000