From b7e7528f78ffa97d68669a171f8d6696ad5e35f3 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Wed, 7 Feb 2018 00:11:14 +0100 Subject: VDMAbstractItemModelDataType: use column instead of 0 when accessing model Since a QQmlAdaptorModel now supports both row and column, we should use this information when retrieving data from an QAbstractItemModel. Change-Id: I1e73c026695637981e72f680ec61828c944740b6 Reviewed-by: J-P Nurmi --- src/qml/util/qqmladaptormodel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qml/util') diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp index f97854314e..680785420f 100644 --- a/src/qml/util/qqmladaptormodel.cpp +++ b/src/qml/util/qqmladaptormodel.cpp @@ -495,9 +495,9 @@ public: { QHash::const_iterator it = roleNames.find(role.toUtf8()); if (it != roleNames.end()) { - return model.aim()->index(index, 0, model.rootIndex).data(*it); + return model.aim()->index(model.rowAt(index), model.columnAt(index), model.rootIndex).data(*it); } else if (role == QLatin1String("hasModelChildren")) { - return QVariant(model.aim()->hasChildren(model.aim()->index(index, 0, model.rootIndex))); + return QVariant(model.aim()->hasChildren(model.aim()->index(model.rowAt(index), model.columnAt(index), model.rootIndex))); } else { return QVariant(); } @@ -513,7 +513,7 @@ public: QVariant modelIndex(const QQmlAdaptorModel &model, int index) const override { return model - ? QVariant::fromValue(model.aim()->index(index, 0, model.rootIndex)) + ? QVariant::fromValue(model.aim()->index(model.rowAt(index), model.columnAt(index), model.rootIndex)) : QVariant(); } -- cgit v1.2.3