┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/kitemviews
diff options
context:
space:
mode:
authorMéven Car <[email protected]>2023-09-10 15:19:13 +0200
committerMéven Car <[email protected]>2023-09-10 15:19:13 +0200
commitb58a346be96f7d0973ed96e52c4cf95463ba244d (patch)
tree799775ba70d0d9f61f2d400ad1b46227979dec26 /src/kitemviews
parent5a7b749f5b524f771c549774de4783f014664135 (diff)
Replace qAsConst with std::as_const
Diffstat (limited to 'src/kitemviews')
-rw-r--r--src/kitemviews/kfileitemmodel.cpp8
-rw-r--r--src/kitemviews/kfileitemmodelrolesupdater.cpp10
-rw-r--r--src/kitemviews/kitemlistview.cpp20
-rw-r--r--src/kitemviews/kitemlistviewaccessible.cpp2
-rw-r--r--src/kitemviews/kitemset.cpp4
-rw-r--r--src/kitemviews/kstandarditemlistwidget.cpp6
-rw-r--r--src/kitemviews/private/kdirectorycontentscounter.cpp2
-rw-r--r--src/kitemviews/private/kitemlistheaderwidget.cpp8
8 files changed, 30 insertions, 30 deletions
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index b71a4325b..a175e0bfe 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -981,7 +981,7 @@ void KFileItemModel::resortAllItems()
// been moved because of the resorting.
QList<QUrl> oldUrls;
oldUrls.reserve(itemCount);
- for (const ItemData *itemData : qAsConst(m_itemData)) {
+ for (const ItemData *itemData : std::as_const(m_itemData)) {
oldUrls.append(itemData->item.url());
}
@@ -1226,7 +1226,7 @@ void KFileItemModel::slotItemsDeleted(const KFileItemList &items)
indexesToRemoveWithChildren.reserve(m_itemData.count());
const int itemCount = m_itemData.count();
- for (int index : qAsConst(indexesToRemove)) {
+ for (int index : std::as_const(indexesToRemove)) {
indexesToRemoveWithChildren.append(index);
const int parentLevel = expandedParentsCount(index);
@@ -1644,7 +1644,7 @@ void KFileItemModel::prepareItemsForSorting(QList<ItemData *> &itemDataList)
case DeletionTimeRole:
// These roles can be determined with retrieveData, and they have to be stored
// in the QHash "values" for the sorting.
- for (ItemData *itemData : qAsConst(itemDataList)) {
+ for (ItemData *itemData : std::as_const(itemDataList)) {
if (itemData->values.isEmpty()) {
itemData->values = retrieveData(itemData->item, itemData->parent);
}
@@ -1653,7 +1653,7 @@ void KFileItemModel::prepareItemsForSorting(QList<ItemData *> &itemDataList)
case TypeRole:
// At least store the data including the file type for items with known MIME type.
- for (ItemData *itemData : qAsConst(itemDataList)) {
+ for (ItemData *itemData : std::as_const(itemDataList)) {
if (itemData->values.isEmpty()) {
const KFileItem item = itemData->item;
if (item.isDir() || item.isMimeTypeKnown()) {
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 490630888..795b85a44 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -905,7 +905,7 @@ void KFileItemModelRolesUpdater::startUpdating()
m_pendingPreviewItems.clear();
m_pendingPreviewItems.reserve(indexes.count());
- for (int index : qAsConst(indexes)) {
+ for (int index : std::as_const(indexes)) {
const KFileItem item = m_model->fileItem(index);
if (!m_finishedItems.contains(item)) {
m_pendingPreviewItems.append(item);
@@ -1170,11 +1170,11 @@ void KFileItemModelRolesUpdater::updateChangedItems()
std::sort(visibleChangedIndexes.begin(), visibleChangedIndexes.end());
if (m_previewShown) {
- for (int index : qAsConst(visibleChangedIndexes)) {
+ for (int index : std::as_const(visibleChangedIndexes)) {
m_pendingPreviewItems.append(m_model->fileItem(index));
}
- for (int index : qAsConst(invisibleChangedIndexes)) {
+ for (int index : std::as_const(invisibleChangedIndexes)) {
m_pendingPreviewItems.append(m_model->fileItem(index));
}
@@ -1359,7 +1359,7 @@ QHash<QByteArray, QVariant> KFileItemModelRolesUpdater::rolesData(const KFileIte
}
QStringList overlays = item.overlays();
- for (KOverlayIconPlugin *it : qAsConst(m_overlayIconsPlugin)) {
+ for (KOverlayIconPlugin *it : std::as_const(m_overlayIconsPlugin)) {
overlays.append(it->getOverlays(item.url()));
}
if (!overlays.isEmpty()) {
@@ -1384,7 +1384,7 @@ void KFileItemModelRolesUpdater::slotOverlaysChanged(const QUrl &url, const QStr
const int index = m_model->index(item);
QHash<QByteArray, QVariant> data = m_model->data(index);
QStringList overlays = item.overlays();
- for (KOverlayIconPlugin *it : qAsConst(m_overlayIconsPlugin)) {
+ for (KOverlayIconPlugin *it : std::as_const(m_overlayIconsPlugin)) {
overlays.append(it->getOverlays(url));
}
data.insert("iconOverlays", overlays);
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 6c60ed648..33a341081 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -231,7 +231,7 @@ void KItemListView::setVisibleRoles(const QList<QByteArray> &roles)
if (!m_headerWidget->automaticColumnResizing()) {
// The column-width of new roles are still 0. Apply the preferred
// column-width as default with.
- for (const QByteArray &role : qAsConst(m_visibleRoles)) {
+ for (const QByteArray &role : std::as_const(m_visibleRoles)) {
if (m_headerWidget->columnWidth(role) == 0) {
const qreal width = m_headerWidget->preferredColumnWidth(role);
m_headerWidget->setColumnWidth(role, width);
@@ -669,7 +669,7 @@ void KItemListView::paint(QPainter *painter, const QStyleOptionGraphicsItem *opt
{
QGraphicsWidget::paint(painter, option, widget);
- for (auto animation : qAsConst(m_rubberBandAnimations)) {
+ for (auto animation : std::as_const(m_rubberBandAnimations)) {
QRectF rubberBandRect = animation->property(RubberPropertyName).toRectF();
const QPointF topLeft = rubberBandRect.topLeft();
@@ -1220,7 +1220,7 @@ void KItemListView::slotItemsRemoved(const KItemRangeList &itemRanges)
// after the deleted items. It is important to update them in ascending
// order to prevent overlaps when setting the new index.
std::sort(itemsToMove.begin(), itemsToMove.end());
- for (int i : qAsConst(itemsToMove)) {
+ for (int i : std::as_const(itemsToMove)) {
KItemListWidget *widget = m_visibleItems.value(i);
Q_ASSERT(widget);
const int newIndex = i - count;
@@ -1846,7 +1846,7 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
}
// Delete invisible KItemListWidget instances that have not been reused
- for (int index : qAsConst(reusableItems)) {
+ for (int index : std::as_const(reusableItems)) {
recycleWidget(m_visibleItems.value(index));
}
@@ -2222,7 +2222,7 @@ QHash<QByteArray, qreal> KItemListView::preferredColumnWidths(const KItemRangeLi
const QFontMetricsF fontMetrics(m_headerWidget->font());
const int gripMargin = m_headerWidget->style()->pixelMetric(QStyle::PM_HeaderGripMargin);
const int headerMargin = m_headerWidget->style()->pixelMetric(QStyle::PM_HeaderMargin);
- for (const QByteArray &visibleRole : qAsConst(m_visibleRoles)) {
+ for (const QByteArray &visibleRole : std::as_const(m_visibleRoles)) {
const QString headerText = m_model->roleDescription(visibleRole);
const qreal headerWidth = fontMetrics.horizontalAdvance(headerText) + gripMargin + headerMargin * 2;
widths.insert(visibleRole, headerWidth);
@@ -2238,7 +2238,7 @@ QHash<QByteArray, qreal> KItemListView::preferredColumnWidths(const KItemRangeLi
const int endIndex = startIndex + itemRange.count - 1;
for (int i = startIndex; i <= endIndex; ++i) {
- for (const QByteArray &visibleRole : qAsConst(m_visibleRoles)) {
+ for (const QByteArray &visibleRole : std::as_const(m_visibleRoles)) {
qreal maxWidth = widths.value(visibleRole, 0);
const qreal width = creator->preferredRoleColumnWidth(visibleRole, i, this);
maxWidth = qMax(width, maxWidth);
@@ -2279,7 +2279,7 @@ void KItemListView::applyColumnWidthsFromHeader()
void KItemListView::updateWidgetColumnWidths(KItemListWidget *widget)
{
- for (const QByteArray &role : qAsConst(m_visibleRoles)) {
+ for (const QByteArray &role : std::as_const(m_visibleRoles)) {
widget->setColumnWidth(role, m_headerWidget->columnWidth(role));
}
widget->setSidePadding(m_headerWidget->sidePadding());
@@ -2296,7 +2296,7 @@ void KItemListView::updatePreferredColumnWidths(const KItemRangeList &itemRanges
if (itemCount == rangesItemCount) {
const QHash<QByteArray, qreal> preferredWidths = preferredColumnWidths(itemRanges);
- for (const QByteArray &role : qAsConst(m_visibleRoles)) {
+ for (const QByteArray &role : std::as_const(m_visibleRoles)) {
m_headerWidget->setPreferredColumnWidth(role, preferredWidths.value(role));
}
} else {
@@ -2351,7 +2351,7 @@ void KItemListView::applyAutomaticColumnWidths()
// size does not use the available view-size the size of the
// first role will get stretched.
- for (const QByteArray &role : qAsConst(m_visibleRoles)) {
+ for (const QByteArray &role : std::as_const(m_visibleRoles)) {
const qreal preferredWidth = m_headerWidget->preferredColumnWidth(role);
m_headerWidget->setColumnWidth(role, preferredWidth);
}
@@ -2400,7 +2400,7 @@ void KItemListView::applyAutomaticColumnWidths()
qreal KItemListView::columnWidthsSum() const
{
qreal widthsSum = 0;
- for (const QByteArray &role : qAsConst(m_visibleRoles)) {
+ for (const QByteArray &role : std::as_const(m_visibleRoles)) {
widthsSum += m_headerWidget->columnWidth(role);
}
return widthsSum;
diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index a75df8b76..8df0b0196 100644
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -30,7 +30,7 @@ KItemListViewAccessible::KItemListViewAccessible(KItemListView *view_)
KItemListViewAccessible::~KItemListViewAccessible()
{
- for (AccessibleIdWrapper idWrapper : qAsConst(m_cells)) {
+ for (AccessibleIdWrapper idWrapper : std::as_const(m_cells)) {
if (idWrapper.isValid) {
QAccessible::deleteAccessibleInterface(idWrapper.id);
}
diff --git a/src/kitemviews/kitemset.cpp b/src/kitemviews/kitemset.cpp
index b3a9909af..c8c1ff076 100644
--- a/src/kitemviews/kitemset.cpp
+++ b/src/kitemviews/kitemset.cpp
@@ -195,14 +195,14 @@ KItemSet KItemSet::operator^(const KItemSet &other) const
const QVector<int>::iterator end = rangeBoundaries.end();
QVector<int>::iterator it = begin;
- for (const KItemRange &range : qAsConst(m_itemRanges)) {
+ for (const KItemRange &range : std::as_const(m_itemRanges)) {
*it++ = range.index;
*it++ = range.index + range.count;
}
const QVector<int>::iterator middle = it;
- for (const KItemRange &range : qAsConst(other.m_itemRanges)) {
+ for (const KItemRange &range : std::as_const(other.m_itemRanges)) {
*it++ = range.index;
*it++ = range.index + range.count;
}
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 0772bccc9..499a50416 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -1278,7 +1278,7 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
// Calculate the position for each additional information
qreal y = nameTextInfo->pos.y() + nameHeight;
- for (const QByteArray &role : qAsConst(m_sortedVisibleRoles)) {
+ for (const QByteArray &role : std::as_const(m_sortedVisibleRoles)) {
if (role == "text") {
continue;
}
@@ -1344,7 +1344,7 @@ void KStandardItemListWidget::updateCompactLayoutTextCache()
const qreal x = option.padding * 3 + iconSize();
qreal y = qRound((widgetHeight - textLinesHeight) / 2);
const qreal maxWidth = size().width() - x - option.padding;
- for (const QByteArray &role : qAsConst(m_sortedVisibleRoles)) {
+ for (const QByteArray &role : std::as_const(m_sortedVisibleRoles)) {
const QString text = roleText(role, values);
TextInfo *textInfo = m_textInfo.value(role);
textInfo->staticText.setText(text);
@@ -1394,7 +1394,7 @@ void KStandardItemListWidget::updateDetailsLayoutTextCache()
qreal x = firstColumnInc;
const qreal y = qMax(qreal(option.padding), (widgetHeight - fontHeight) / 2);
- for (const QByteArray &role : qAsConst(m_sortedVisibleRoles)) {
+ for (const QByteArray &role : std::as_const(m_sortedVisibleRoles)) {
QString text = roleText(role, values);
// Elide the text in case it does not fit into the available column-width
diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp
index 47f538447..dcf7247a9 100644
--- a/src/kitemviews/private/kdirectorycontentscounter.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounter.cpp
@@ -166,7 +166,7 @@ void KDirectoryContentsCounter::slotItemsRemoved()
if (!m_watchedDirs.isEmpty()) {
// Don't let KDirWatch watch for removed items
if (allItemsRemoved) {
- for (const QString &path : qAsConst(m_watchedDirs)) {
+ for (const QString &path : std::as_const(m_watchedDirs)) {
m_dirWatcher->removeDir(path);
}
m_watchedDirs.clear();
diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp
index 850f49406..3e1232561 100644
--- a/src/kitemviews/private/kitemlistheaderwidget.cpp
+++ b/src/kitemviews/private/kitemlistheaderwidget.cpp
@@ -167,7 +167,7 @@ void KItemListHeaderWidget::paint(QPainter *painter, const QStyleOptionGraphicsI
qreal x = -m_offset + m_sidePadding;
int orderIndex = 0;
- for (const QByteArray &role : qAsConst(m_columns)) {
+ for (const QByteArray &role : std::as_const(m_columns)) {
const qreal roleWidth = m_columnWidths.value(role);
const QRectF rect(x, 0, roleWidth, size().height());
paintRole(painter, role, rect, orderIndex, widget);
@@ -507,7 +507,7 @@ int KItemListHeaderWidget::roleIndexAt(const QPointF &pos) const
int index = -1;
qreal x = -m_offset + m_sidePadding;
- for (const QByteArray &role : qAsConst(m_columns)) {
+ for (const QByteArray &role : std::as_const(m_columns)) {
++index;
x += m_columnWidths.value(role);
if (pos.x() <= x) {
@@ -540,7 +540,7 @@ bool KItemListHeaderWidget::isAbovePaddingGrip(const QPointF &pos, PaddingGrip p
return pos.x() >= (lx - grip) && pos.x() <= lx;
case Trailing: {
qreal rx = lx;
- for (const QByteArray &role : qAsConst(m_columns)) {
+ for (const QByteArray &role : std::as_const(m_columns)) {
rx += m_columnWidths.value(role);
}
return pos.x() >= (rx - grip) && pos.x() <= rx;
@@ -604,7 +604,7 @@ int KItemListHeaderWidget::targetOfMovingRole() const
qreal KItemListHeaderWidget::roleXPosition(const QByteArray &role) const
{
qreal x = -m_offset + m_sidePadding;
- for (const QByteArray &visibleRole : qAsConst(m_columns)) {
+ for (const QByteArray &visibleRole : std::as_const(m_columns)) {
if (visibleRole == role) {
return x;
}