Replace qAsConst with std::as_const

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 87a30e9efe543c3385b2308cd0ca9442c1a26370..f209633479ca0bb8b3a69ad17b4aaefed423b3b9 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -137,7 +137,7 @@ void DolphinContextMenu::addTrashItemContextMenu()
     addAction(QIcon::fromTheme("restoration"), i18nc("@action:inmenu", "Restore"), [this]() {
         QList<QUrl> selectedUrls;
         selectedUrls.reserve(m_selectedItems.count());
     addAction(QIcon::fromTheme("restoration"), i18nc("@action:inmenu", "Restore"), [this]() {
         QList<QUrl> selectedUrls;
         selectedUrls.reserve(m_selectedItems.count());

-        for (const KFileItem &item : qAsConst(m_selectedItems)) {
+        for (const KFileItem &item : std::as_const(m_selectedItems)) {

             selectedUrls.append(item.url());
         }
 
             selectedUrls.append(item.url());
         }
 


@@ -224,7 +224,7 @@ void DolphinContextMenu::addItemContextMenu()
     } else {
         // multiple files
         bool selectionHasOnlyDirs = true;
     } else {
         // multiple files
         bool selectionHasOnlyDirs = true;

-        for (const auto &item : qAsConst(m_selectedItems)) {
+        for (const auto &item : std::as_const(m_selectedItems)) {

             const QUrl &url = DolphinView::openItemAsFolderUrl(item);
             if (url.isEmpty()) {
                 selectionHasOnlyDirs = false;
             const QUrl &url = DolphinView::openItemAsFolderUrl(item);
             if (url.isEmpty()) {
                 selectionHasOnlyDirs = false;

diff --git a/src/global.cpp b/src/global.cpp
index fa2b8e98a20fbf7fad3b100d82d3bb7750cd146e..c91046efbfb8765c541fdd4603e3745a7e4fa492 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -75,7 +75,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl> &inputUrls,
     }
 
     int activeWindowIndex = -1;
     }
 
     int activeWindowIndex = -1;

-    for (const auto &interface : qAsConst(dolphinInterfaces)) {
+    for (const auto &interface : std::as_const(dolphinInterfaces)) {

         ++activeWindowIndex;
 
         auto isActiveWindowReply = interface.first->isActiveWindow();
         ++activeWindowIndex;
 
         auto isActiveWindowReply = interface.first->isActiveWindow();


@@ -116,7 +116,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl> &inputUrls,
         }
     }
 
         }
     }
 

-    for (const auto &interface : qAsConst(dolphinInterfaces)) {
+    for (const auto &interface : std::as_const(dolphinInterfaces)) {

         if (interface.second.isEmpty()) {
             continue;
         }
         if (interface.second.isEmpty()) {
             continue;
         }

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index b71a4325b86bf951331bf449df5fb34604931cf1..a175e0bfe0e65076c3711f263708157da079c87d 100644 (file)
--- 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);
     // 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());
     }
 
         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();
         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);
             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.
     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);
             }
             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.
 
     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()) {
             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 490630888ca8c3432ebeccfa57f1998b2ed54bbc..795b85a44f3909d55f4c432e0c20dca6d6705ab2 100644 (file)
--- 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());
 
         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);
             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) {
     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));
         }
 
             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));
         }
 
             m_pendingPreviewItems.append(m_model->fileItem(index));
         }
 


@@ -1359,7 +1359,7 @@ QHash<QByteArray, QVariant> KFileItemModelRolesUpdater::rolesData(const KFileIte
     }
 
     QStringList overlays = item.overlays();
     }
 
     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()) {
         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();
     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);
         overlays.append(it->getOverlays(url));
     }
     data.insert("iconOverlays", overlays);

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 6c60ed648ebbcae26bdc9922ad6f4b8823d00e9d..33a341081a7978de7dbda9bdcfcf24f34b298356 100644 (file)
--- 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.
         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);
                 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);
 
 {
     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();
         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());
         // 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;
             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
     }
 
     // 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));
     }
 
         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);
     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);
         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) {
         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);
                 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)
 {
 
 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());
         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);
 
     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 {
             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.
 
     // 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);
     }
         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;
 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;
         widthsSum += m_headerWidget->columnWidth(role);
     }
     return widthsSum;

diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index a75df8b760f99f6d9151f89ea75b721bc98f4a27..8df0b0196eedc818078bdbfced6cf1f33e091cb1 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -30,7 +30,7 @@ KItemListViewAccessible::KItemListViewAccessible(KItemListView *view_)
 
 KItemListViewAccessible::~KItemListViewAccessible()
 {
 
 KItemListViewAccessible::~KItemListViewAccessible()
 {

-    for (AccessibleIdWrapper idWrapper : qAsConst(m_cells)) {
+    for (AccessibleIdWrapper idWrapper : std::as_const(m_cells)) {

         if (idWrapper.isValid) {
             QAccessible::deleteAccessibleInterface(idWrapper.id);
         }
         if (idWrapper.isValid) {
             QAccessible::deleteAccessibleInterface(idWrapper.id);
         }

diff --git a/src/kitemviews/kitemset.cpp b/src/kitemviews/kitemset.cpp
index b3a9909af3b04601c8a0e78701e721d1d0f099b7..c8c1ff076ccc5edf503ab7ebc5b846ea661e1d81 100644 (file)
--- 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;
 
     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;
 
         *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;
     }
         *it++ = range.index;
         *it++ = range.index + range.count;
     }

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 0772bccc9ff8ca042f00cd23520d53f60175edf0..499a5041643ca714ac3dac48706aedce88d39dc7 100644 (file)
--- 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;
 
     // 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;
         }
         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;
     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);
         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);
 
     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
         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 47f538447b503cb02c12259a741354a5e9a7ffef..dcf7247a945fc84abd9880b36b72bdc55c149311 100644 (file)
--- 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) {
     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();
                 m_dirWatcher->removeDir(path);
             }
             m_watchedDirs.clear();

diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp
index 850f49406ac30f2966e01ef2a53d0c718b0f1ae5..3e12325615fbade7c6a7c4b079301e400407720b 100644 (file)
--- 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;
 
     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);
         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;
     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) {
         ++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;
         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;
             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;
 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;
         }
         if (visibleRole == role) {
             return x;
         }

diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
index 31f8cb80043d95c1d55e0e18db7b57ab49649ff9..da36caa36d5bd6759ca5cfa097571db2b1dc3e51 100644 (file)
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@@ -282,7 +282,7 @@ void DolphinFacetsWidget::updateTagsMenuItems(const QUrl &, const KFileItemList
 
     const bool onlyOneTag = allTags.count() == 1;
 
 
     const bool onlyOneTag = allTags.count() == 1;
 

-    for (const QString &tagName : qAsConst(allTags)) {
+    for (const QString &tagName : std::as_const(allTags)) {

         QAction *action = tagsMenu->addAction(QIcon::fromTheme(QStringLiteral("tag")), tagName);
         action->setCheckable(true);
         action->setChecked(m_searchTags.contains(tagName));
         QAction *action = tagsMenu->addAction(QIcon::fromTheme(QStringLiteral("tag")), tagName);
         action->setCheckable(true);
         action->setChecked(m_searchTags.contains(tagName));

diff --git a/src/settings/contextmenu/contextmenusettingspage.cpp b/src/settings/contextmenu/contextmenusettingspage.cpp
index eeaf3c168773d924bf45b28d2051712d6d29ecc4..5e755d249d97cd39fade45a25c308d7cb6756a4c 100644 (file)
--- a/src/settings/contextmenu/contextmenusettingspage.cpp
+++ b/src/settings/contextmenu/contextmenusettingspage.cpp
@@ -285,7 +285,7 @@ void ContextMenuSettingsPage::loadServices()
     const auto locations = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio/servicemenus"), QStandardPaths::LocateDirectory);
     QStringList files = KFileUtils::findAllUniqueFiles(locations);
 
     const auto locations = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio/servicemenus"), QStandardPaths::LocateDirectory);
     QStringList files = KFileUtils::findAllUniqueFiles(locations);
 

-    for (const auto &file : qAsConst(files)) {
+    for (const auto &file : std::as_const(files)) {

         const QList<KServiceAction> serviceActions = KDesktopFileActions::userDefinedServices(KService(file), true);
 
         const KDesktopFile desktopFile(file);
         const QList<KServiceAction> serviceActions = KDesktopFileActions::userDefinedServices(KService(file), true);
 
         const KDesktopFile desktopFile(file);

diff --git a/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp b/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp
index acee97cf1d4c341b76e605919dd13ecc6565b8a2..fa7369e06a1399f74b97d9ed28c6f404d90b3b19 100644 (file)
--- a/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp
+++ b/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp
@@ -172,7 +172,7 @@ void runUncompress(const QString &inputPath, const QString &outputPath)
     const auto mime = QMimeDatabase().mimeTypeForFile(inputPath).name();
 
     UncompressCommand command{};
     const auto mime = QMimeDatabase().mimeTypeForFile(inputPath).name();
 
     UncompressCommand command{};

-    for (const auto &pair : qAsConst(mimeTypeToCommand)) {
+    for (const auto &pair : std::as_const(mimeTypeToCommand)) {

         if (pair.first.contains(mime)) {
             command = pair.second;
             break;
         if (pair.first.contains(mime)) {
             command = pair.second;
             break;

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 45aa7b65a0723e5685008f8e4cddaddbde4ba464..0d2c76e3c8b841d142bba10a5bea70aa9cd14083 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -129,7 +129,7 @@ void DolphinSettingsDialog::enableApply()
 
 void DolphinSettingsDialog::applySettings()
 {
 
 void DolphinSettingsDialog::applySettings()
 {

-    for (SettingsPageBase *page : qAsConst(m_pages)) {
+    for (SettingsPageBase *page : std::as_const(m_pages)) {

         page->applySettings();
     }
 
         page->applySettings();
     }
 


@@ -148,7 +148,7 @@ void DolphinSettingsDialog::applySettings()
 
 void DolphinSettingsDialog::restoreDefaults()
 {
 
 void DolphinSettingsDialog::restoreDefaults()
 {

-    for (SettingsPageBase *page : qAsConst(m_pages)) {
+    for (SettingsPageBase *page : std::as_const(m_pages)) {

         page->restoreDefaults();
     }
 }
         page->restoreDefaults();
     }
 }

diff --git a/src/settings/interface/interfacesettingspage.cpp b/src/settings/interface/interfacesettingspage.cpp
index e941cf46786f973da208e0a9fca0c417953f863e..6a3fc8c905dd6636d6e684d3be18bfe7e843f891 100644 (file)
--- a/src/settings/interface/interfacesettingspage.cpp
+++ b/src/settings/interface/interfacesettingspage.cpp
@@ -59,14 +59,14 @@ InterfaceSettingsPage::~InterfaceSettingsPage()
 
 void InterfaceSettingsPage::applySettings()
 {
 
 void InterfaceSettingsPage::applySettings()
 {

-    for (SettingsPageBase *page : qAsConst(m_pages)) {
+    for (SettingsPageBase *page : std::as_const(m_pages)) {

         page->applySettings();
     }
 }
 
 void InterfaceSettingsPage::restoreDefaults()
 {
         page->applySettings();
     }
 }
 
 void InterfaceSettingsPage::restoreDefaults()
 {

-    for (SettingsPageBase *page : qAsConst(m_pages)) {
+    for (SettingsPageBase *page : std::as_const(m_pages)) {

         page->restoreDefaults();
     }
 }
         page->restoreDefaults();
     }
 }

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 9d20042899773e18080060f7b7d0743b97de82f4..b98eb86a1ca126cf4534f59a82edf7a19c19dc66 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -58,14 +58,14 @@ DolphinGeneralConfigModule::~DolphinGeneralConfigModule()
 
 void DolphinGeneralConfigModule::save()
 {
 
 void DolphinGeneralConfigModule::save()
 {

-    for (SettingsPageBase *page : qAsConst(m_pages)) {
+    for (SettingsPageBase *page : std::as_const(m_pages)) {

         page->applySettings();
     }
 }
 
 void DolphinGeneralConfigModule::defaults()
 {
         page->applySettings();
     }
 }
 
 void DolphinGeneralConfigModule::defaults()
 {

-    for (SettingsPageBase *page : qAsConst(m_pages)) {
+    for (SettingsPageBase *page : std::as_const(m_pages)) {

         page->applySettings();
     }
 }
         page->applySettings();
     }
 }

diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index b0e7a42a49aa8383202d29ad448e2e83bf26f3af..e4755a1c5e0d72a3f2166dd4f96e43b8498ed683 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -59,7 +59,7 @@ DolphinViewModesConfigModule::~DolphinViewModesConfigModule()
 
 void DolphinViewModesConfigModule::save()
 {
 
 void DolphinViewModesConfigModule::save()
 {

-    for (ViewSettingsTab *tab : qAsConst(m_tabs)) {
+    for (ViewSettingsTab *tab : std::as_const(m_tabs)) {

         tab->applySettings();
     }
     reparseConfiguration();
         tab->applySettings();
     }
     reparseConfiguration();


@@ -67,7 +67,7 @@ void DolphinViewModesConfigModule::save()
 
 void DolphinViewModesConfigModule::defaults()
 {
 
 void DolphinViewModesConfigModule::defaults()
 {

-    for (ViewSettingsTab *tab : qAsConst(m_tabs)) {
+    for (ViewSettingsTab *tab : std::as_const(m_tabs)) {

         tab->restoreDefaults();
     }
     reparseConfiguration();
         tab->restoreDefaults();
     }
     reparseConfiguration();

diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index 5e740640ddf8c0dcb7e81e455724a4518d77c12f..7fccfc24afde9c7c53665f53ae9195b875a56307 100644 (file)
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -65,14 +65,14 @@ ViewSettingsPage::~ViewSettingsPage()
 
 void ViewSettingsPage::applySettings()
 {
 
 void ViewSettingsPage::applySettings()
 {

-    for (SettingsPageBase *tab : qAsConst(m_tabs)) {
+    for (SettingsPageBase *tab : std::as_const(m_tabs)) {

         tab->applySettings();
     }
 }
 
 void ViewSettingsPage::restoreDefaults()
 {
         tab->applySettings();
     }
 }
 
 void ViewSettingsPage::restoreDefaults()
 {

-    for (SettingsPageBase *tab : qAsConst(m_tabs)) {
+    for (SettingsPageBase *tab : std::as_const(m_tabs)) {

         if (tabWidget->currentWidget() == tab) {
             tab->restoreDefaults();
             return;
         if (tabWidget->currentWidget() == tab) {
             tab->restoreDefaults();
             return;

diff --git a/src/tests/kfileitemmodelbenchmark.cpp b/src/tests/kfileitemmodelbenchmark.cpp
index 0daf4abd0c83c1f2d5d4221e97bc7463272ae2ab..4eeb9ff55f38ec35087b5ae432513a0d7b5dc076 100644 (file)
--- a/src/tests/kfileitemmodelbenchmark.cpp
+++ b/src/tests/kfileitemmodelbenchmark.cpp
@@ -74,7 +74,7 @@ void KFileItemModelBenchmark::insertAndRemoveManyItems_data()
     QList<int> sizes;
     sizes << 100000;
 
     QList<int> sizes;
     sizes << 100000;
 

-    for (int n : qAsConst(sizes)) {
+    for (int n : std::as_const(sizes)) {

         QStringList allStrings;
         for (int i = 0; i < n; ++i) {
             allStrings << QString::number(i);
         QStringList allStrings;
         for (int i = 0; i < n; ++i) {
             allStrings << QString::number(i);

diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp
index d1a9cfc7c7980cee961f42f3ce3d2e013e8cc4b8..ac2110c0fcd49b76cde6c894a30d1515e0afadd5 100644 (file)
--- a/src/tests/kitemlistcontrollertest.cpp
+++ b/src/tests/kitemlistcontrollertest.cpp
@@ -292,9 +292,9 @@ void KItemListControllerTest::testKeyboardNavigation_data()
             break;
         }
 
             break;
         }
 

-        for (int columnCount : qAsConst(columnCountList)) {
-            for (const KItemListController::SelectionBehavior &selectionBehavior : qAsConst(selectionBehaviorList)) {
-                for (bool groupingEnabled : qAsConst(groupingEnabledList)) {
+        for (int columnCount : std::as_const(columnCountList)) {
+            for (const KItemListController::SelectionBehavior &selectionBehavior : std::as_const(selectionBehaviorList)) {
+                for (bool groupingEnabled : std::as_const(groupingEnabledList)) {

                     QList<QPair<KeyPress, ViewState>> testList;
 
                     // First, key presses which should have the same effect
                     QList<QPair<KeyPress, ViewState>> testList;
 
                     // First, key presses which should have the same effect

diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp
index e0c536c6791b254e100cb1ec48656bf5350e04ac..0005daceb2ed4262b5d45bef5c682a004724874d 100644 (file)
--- a/src/tests/kitemsettest.cpp
+++ b/src/tests/kitemsettest.cpp
@@ -66,11 +66,11 @@ static QSet<int> KItemSet2QSet(const KItemSet &itemSet)
     // Check that the conversion was successful.
     Q_ASSERT(itemSet.count() == result.count());
 
     // Check that the conversion was successful.
     Q_ASSERT(itemSet.count() == result.count());
 

-    for (int i : qAsConst(itemSet)) {
+    for (int i : std::as_const(itemSet)) {

         Q_ASSERT(result.contains(i));
     }
 
         Q_ASSERT(result.contains(i));
     }
 

-    for (int i : qAsConst(result)) {
+    for (int i : std::as_const(result)) {

         Q_ASSERT(itemSet.contains(i));
     }
 
         Q_ASSERT(itemSet.contains(i));
     }
 

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 4408a9e4785a72e14643971b1c0ab448a462a94c..397ff5d5e5770d08f767ff3a6715b32869e441b2 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -714,7 +714,7 @@ void DolphinViewActionHandler::slotSortTriggered(QAction *action)
     // actions and the sub-menu-actions. If an action gets checked, it must
     // be assured that all other actions get unchecked, except the ascending/
     // descending actions
     // actions and the sub-menu-actions. If an action gets checked, it must
     // be assured that all other actions get unchecked, except the ascending/
     // descending actions

-    for (QAction *groupAction : qAsConst(m_sortByActions)) {
+    for (QAction *groupAction : std::as_const(m_sortByActions)) {

         KActionMenu *actionMenu = qobject_cast<KActionMenu *>(groupAction);
         if (actionMenu) {
             const auto actions = actionMenu->menu()->actions();
         KActionMenu *actionMenu = qobject_cast<KActionMenu *>(groupAction);
         if (actionMenu) {
             const auto actions = actionMenu->menu()->actions();

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index e3bd293901c8f3551d7a530ff68699bf49d8256f..64f8843d29f22ae5ebdfceda48a854f61a3c4493 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -105,7 +105,7 @@ QList<QAction *> VersionControlObserver::actions(const KFileItemList &items) con
         return m_plugin->versionControlActions(items);
     } else {
         QList<QAction *> actions;
         return m_plugin->versionControlActions(items);
     } else {
         QList<QAction *> actions;

-        for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
+        for (const QPointer<KVersionControlPlugin> &plugin : std::as_const(m_plugins)) {

             actions << plugin->outOfVersionControlActions(items);
         }
         return actions;
             actions << plugin->outOfVersionControlActions(items);
         }
         return actions;


@@ -283,7 +283,7 @@ void VersionControlObserver::initPlugins()
             }
         }
 
             }
         }
 

-        for (auto &plugin : qAsConst(m_plugins)) {
+        for (auto &plugin : std::as_const(m_plugins)) {

             connect(plugin, &KVersionControlPlugin::itemVersionsChanged, this, &VersionControlObserver::silentDirectoryVerification);
             connect(plugin, &KVersionControlPlugin::infoMessage, this, &VersionControlObserver::infoMessage);
             connect(plugin, &KVersionControlPlugin::errorMessage, this, &VersionControlObserver::errorMessage);
             connect(plugin, &KVersionControlPlugin::itemVersionsChanged, this, &VersionControlObserver::silentDirectoryVerification);
             connect(plugin, &KVersionControlPlugin::infoMessage, this, &VersionControlObserver::infoMessage);
             connect(plugin, &KVersionControlPlugin::errorMessage, this, &VersionControlObserver::errorMessage);


@@ -299,7 +299,7 @@ KVersionControlPlugin *VersionControlObserver::searchPlugin(const QUrl &director
     initPlugins();
 
     // Verify whether the current directory is under a version system
     initPlugins();
 
     // Verify whether the current directory is under a version system

-    for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
+    for (const QPointer<KVersionControlPlugin> &plugin : std::as_const(m_plugins)) {

         if (!plugin) {
             continue;
         }
         if (!plugin) {
             continue;
         }