Update kconf update script version to 6

[dolphin.git] / src / selectionmode / actiontexthelper.cpp

diff --git a/src/selectionmode/actiontexthelper.cpp b/src/selectionmode/actiontexthelper.cpp
index 3eb868a8cd29e569057810fede9942c8908aab8a..b54e9b004713c5dd394371d9faf646e1d617a6ad 100644 (file)
--- a/src/selectionmode/actiontexthelper.cpp
+++ b/src/selectionmode/actiontexthelper.cpp
@@ -1,6 +1,6 @@
 /*
     This file is part of the KDE project
 /*
     This file is part of the KDE project

-    SPDX-FileCopyrightText: 2022 Felix Ernst <felixernst@zohomail.eu>
+    SPDX-FileCopyrightText: 2022 Felix Ernst <felixernst@kde.org>

 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */
 
     SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 */


@@ -9,9 +9,10 @@
 
 using namespace SelectionMode;
 
 
 using namespace SelectionMode;
 

-ActionTextHelper::ActionTextHelper(QObject *parent) :
-    QObject(parent)
-{   }
+ActionTextHelper::ActionTextHelper(QObject *parent)
+    : QObject(parent)
+{
+}

 
 void ActionTextHelper::registerTextWhenNothingIsSelected(QAction *action, QString registeredText)
 {
 
 void ActionTextHelper::registerTextWhenNothingIsSelected(QAction *action, QString registeredText)
 {


@@ -22,10 +23,13 @@ void ActionTextHelper::registerTextWhenNothingIsSelected(QAction *action, QStrin
 void ActionTextHelper::textsWhenNothingIsSelectedEnabled(bool enabled)
 {
     for (auto i = m_registeredActionTextChanges.begin(); i != m_registeredActionTextChanges.end(); ++i) {
 void ActionTextHelper::textsWhenNothingIsSelectedEnabled(bool enabled)
 {
     for (auto i = m_registeredActionTextChanges.begin(); i != m_registeredActionTextChanges.end(); ++i) {

-        if (!i->action) {
+        while (!i->action) {

             i = m_registeredActionTextChanges.erase(i);
             i = m_registeredActionTextChanges.erase(i);

-            continue;
+            if (i == m_registeredActionTextChanges.end()) {
+                break;
+            }

         }
         }

+

         if (enabled && i->textStateOfRegisteredText == TextWhenNothingIsSelected) {
             QString textWhenSomethingIsSelected = i->action->text();
             i->action->setText(i->registeredText);
         if (enabled && i->textStateOfRegisteredText == TextWhenNothingIsSelected) {
             QString textWhenSomethingIsSelected = i->action->text();
             i->action->setText(i->registeredText);