diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index a5284dbad4a..f6c6c89c8e6 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -3174,8 +3174,8 @@ void QSortFilterProxyModel::invalidateRowsFilter() bool QSortFilterProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { Q_D(const QSortFilterProxyModel); - QVariant l = (source_left.model() ? source_left.model()->data(source_left, d->sort_role) : QVariant()); - QVariant r = (source_right.model() ? source_right.model()->data(source_right, d->sort_role) : QVariant()); + const QVariant l = source_left.data(d->sort_role); + const QVariant r = source_right.data(d->sort_role); return QAbstractItemModelPrivate::isVariantLessThan(l, r, d->sort_casesensitivity, d->sort_localeaware); } diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp index aa5f729820e..7b0dffcc497 100644 --- a/src/widgets/accessible/itemviews.cpp +++ b/src/widgets/accessible/itemviews.cpp @@ -1192,7 +1192,7 @@ QAccessible::State QAccessibleTableCell::state() const if (view->selectionModel()->currentIndex() == m_index) st.focused = true; - QVariant checkState = m_index.model()->data(m_index, Qt::CheckStateRole); + const QVariant checkState = m_index.data(Qt::CheckStateRole); if (checkState.toInt() == Qt::Checked) st.checked = true; diff --git a/src/widgets/doc/snippets/qitemdelegate/spinbox-delegate.cpp b/src/widgets/doc/snippets/qitemdelegate/spinbox-delegate.cpp index efe8a167337..5a73d551b57 100644 --- a/src/widgets/doc/snippets/qitemdelegate/spinbox-delegate.cpp +++ b/src/widgets/doc/snippets/qitemdelegate/spinbox-delegate.cpp @@ -49,7 +49,7 @@ QWidget *SpinBoxDelegate::createEditor(QWidget *parent, void SpinBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const { - int value = index.model()->data(index, Qt::EditRole).toInt(); + int value = index.data(Qt::EditRole).toInt(); QSpinBox *spinBox = static_cast(editor); spinBox->setValue(value); diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 1fe9a8d7be5..ce37bd87d07 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -111,7 +111,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt else menuOption.menuItemType = QStyleOptionMenuItem::Normal; - QVariant variant = index.model()->data(index, Qt::DecorationRole); + const QVariant variant = index.data(Qt::DecorationRole); switch (variant.userType()) { case QMetaType::QIcon: menuOption.icon = qvariant_cast(variant); @@ -129,7 +129,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt menuOption.palette.setBrush(QPalette::All, QPalette::Window, qvariant_cast(index.data(Qt::BackgroundRole))); } - menuOption.text = index.model()->data(index, Qt::DisplayRole).toString().replace(u'&', "&&"_L1); + menuOption.text = index.data(Qt::DisplayRole).toString().replace(u'&', "&&"_L1); menuOption.reservedShortcutWidth = 0; menuOption.maxIconWidth = option.decorationSize.width() + 4; menuOption.menuRect = option.rect;