1 files changed, 17 insertions, 16 deletions

diff --git a/src/selectionmode/bottombarcontentscontainer.cpp b/src/selectionmode/bottombarcontentscontainer.cpp
index 3f7e681dd..c9068138a 100644
--- a/src/selectionmode/bottombarcontentscontainer.cpp
+++ b/src/selectionmode/bottombarcontentscontainer.cpp
@@ -21,6 +21,7 @@
 #include <QToolButton>
 #include <QVBoxLayout>
 
+#include <ranges>
 #include <unordered_set>
 
 using namespace SelectionMode;
@@ -78,18 +79,18 @@ void BottomBarContentsContainer::adaptToNewBarWidth(int newBarWidth)
         Q_ASSERT(m_overflowButton);
         if (unusedSpace() < 0) {
             // The bottom bar is overflowing! We need to hide some of the widgets.
-            for (auto i = m_generalBarActions.rbegin(); i != m_generalBarActions.rend(); ++i) {
-                if (!i->isWidgetVisible()) {
+            for (auto &m_generalBarAction : std::ranges::reverse_view(m_generalBarActions)) {
+                if (!m_generalBarAction.isWidgetVisible()) {
                     continue;
                 }
-                i->widget()->setVisible(false);
+                m_generalBarAction.widget()->setVisible(false);
 
                 // Add the action to the overflow.
                 auto overflowMenu = m_overflowButton->menu();
                 if (overflowMenu->actions().isEmpty()) {
-                    overflowMenu->addAction(i->action());
+                    overflowMenu->addAction(m_generalBarAction.action());
                 } else {
-                    overflowMenu->insertAction(overflowMenu->actions().at(0), i->action());
+                    overflowMenu->insertAction(overflowMenu->actions().at(0), m_generalBarAction.action());
                 }
                 m_overflowButton->setVisible(true);
                 if (unusedSpace() >= 0) {
@@ -98,24 +99,24 @@ void BottomBarContentsContainer::adaptToNewBarWidth(int newBarWidth)
             }
         } else {
             // We have some unusedSpace(). Let's check if we can maybe add more of the contextual actions' widgets.
-            for (auto i = m_generalBarActions.begin(); i != m_generalBarActions.end(); ++i) {
-                if (i->isWidgetVisible()) {
+            for (auto &m_generalBarAction : m_generalBarActions) {
+                if (m_generalBarAction.isWidgetVisible()) {
                     continue;
                 }
-                if (!i->widget()) {
-                    i->newWidget(this);
-                    i->widget()->setVisible(false);
-                    m_layout->insertWidget(m_layout->count() - 1, i->widget()); // Insert before m_overflowButton
+                if (!m_generalBarAction.widget()) {
+                    m_generalBarAction.newWidget(this);
+                    m_generalBarAction.widget()->setVisible(false);
+                    m_layout->insertWidget(m_layout->count() - 1, m_generalBarAction.widget()); // Insert before m_overflowButton
                 }
-                if (unusedSpace() < i->widget()->sizeHint().width()) {
+                if (unusedSpace() < m_generalBarAction.widget()->sizeHint().width()) {
                     // It doesn't fit. We keep it invisible.
                     break;
                 }
-                i->widget()->setVisible(true);
+                m_generalBarAction.widget()->setVisible(true);
 
                 // Remove the action from the overflow.
                 auto overflowMenu = m_overflowButton->menu();
-                overflowMenu->removeAction(i->action());
+                overflowMenu->removeAction(m_generalBarAction.action());
                 if (overflowMenu->isEmpty()) {
                     m_overflowButton->setVisible(false);
                 }
@@ -139,8 +140,8 @@ void BottomBarContentsContainer::slotSelectionChanged(const KFileItemList &selec
                 Q_EMIT barVisibilityChangeRequested(false);
             }
         } else {
-            for (auto i = contextActions.begin(); i != contextActions.end(); ++i) {
-                m_generalBarActions.emplace_back(ActionWithWidget{*i});
+            for (auto &contextAction : contextActions) {
+                m_generalBarActions.emplace_back(ActionWithWidget{contextAction});
             }
             resetContents(BottomBar::GeneralContents);