1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QModelIndex::data()

Browse Source 
idx.data(role) is much nicer to read than idx.model()->data(idx, role)

As a drive-by, mark some QVariants const.

Change-Id: I00c0a5ac311a03095050b2542a5c396a6c1c2c6a
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 319cca2e2b8679bc553e8ebf97505f0625ee1c94)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Albert Astals Cid 2024-06-19 17:42:34 +02:00 committed by Qt Cherry-pick Bot
parent e2ffa8ddf6
commit ffb0a15ea4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/itemmodels/qsortfilterproxymodel.cpp
View File

@ -3174,8 +3174,8 @@ void QSortFilterProxyModel::invalidateRowsFilter()
bool QSortFilterProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const bool QSortFilterProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
{ {
Q_D(const QSortFilterProxyModel); Q_D(const QSortFilterProxyModel);
QVariant l = (source_left.model() ? source_left.model()->data(source_left, d->sort_role) : QVariant()); const QVariant l = source_left.data(d->sort_role);
QVariant r = (source_right.model() ? source_right.model()->data(source_right, d->sort_role) : QVariant()); const QVariant r = source_right.data(d->sort_role);
return QAbstractItemModelPrivate::isVariantLessThan(l, r, d->sort_casesensitivity, d->sort_localeaware); return QAbstractItemModelPrivate::isVariantLessThan(l, r, d->sort_casesensitivity, d->sort_localeaware);
} }

2
src/widgets/accessible/itemviews.cpp
View File

@ -1192,7 +1192,7 @@ QAccessible::State QAccessibleTableCell::state() const
if (view->selectionModel()->currentIndex() == m_index) if (view->selectionModel()->currentIndex() == m_index)
st.focused = true; 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) if (checkState.toInt() == Qt::Checked)
st.checked = true; st.checked = true;

2
src/widgets/doc/snippets/qitemdelegate/spinbox-delegate.cpp
View File

@ -49,7 +49,7 @@ QWidget *SpinBoxDelegate::createEditor(QWidget *parent,
void SpinBoxDelegate::setEditorData(QWidget *editor, void SpinBoxDelegate::setEditorData(QWidget *editor,
const QModelIndex &index) const const QModelIndex &index) const
{ {
int value = index.model()->data(index, Qt::EditRole).toInt(); int value = index.data(Qt::EditRole).toInt();
QSpinBox *spinBox = static_cast<QSpinBox*>(editor); QSpinBox *spinBox = static_cast<QSpinBox*>(editor);
spinBox->setValue(value); spinBox->setValue(value);

4
src/widgets/widgets/qcombobox.cpp
View File

@ -111,7 +111,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt
else else
menuOption.menuItemType = QStyleOptionMenuItem::Normal; menuOption.menuItemType = QStyleOptionMenuItem::Normal;
QVariant variant = index.model()->data(index, Qt::DecorationRole); const QVariant variant = index.data(Qt::DecorationRole);
switch (variant.userType()) { switch (variant.userType()) {
case QMetaType::QIcon: case QMetaType::QIcon:
menuOption.icon = qvariant_cast<QIcon>(variant); menuOption.icon = qvariant_cast<QIcon>(variant);
@ -129,7 +129,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt
menuOption.palette.setBrush(QPalette::All, QPalette::Window, menuOption.palette.setBrush(QPalette::All, QPalette::Window,
qvariant_cast<QBrush>(index.data(Qt::BackgroundRole))); qvariant_cast<QBrush>(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.reservedShortcutWidth = 0;
menuOption.maxIconWidth = option.decorationSize.width() + 4; menuOption.maxIconWidth = option.decorationSize.width() + 4;
menuOption.menuRect = option.rect; menuOption.menuRect = option.rect;