[frameworks/ktexteditor] src: Update remove-trailing-spaces modeline

[Jan Paul Batrina]

Git commit d517f24441c67b3953b0826d44eca1a8c5ad116f by Jan Paul Batrina.
Committed on 09/03/2021 at 04:08.
Pushed by cullmann into branch 'master'.

Update remove-trailing-spaces modeline

This adds the "cursor" option and fixes VariableRemoveSpacesItem
which previously was always set to "none" in the textline.

GUI:

M  +2    -0    src/document/katedocument.cpp
M  +3    -2    src/variableeditor/variableeditor.cpp
M  +4    -0    src/variableeditor/variableitem.cpp

https://invent.kde.org/frameworks/ktexteditor/commit/d517f24441c67b3953b0826d44eca1a8c5ad116f

diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp
index dcf3a8c1..450916b9 100644
--- a/src/document/katedocument.cpp
+++ b/src/document/katedocument.cpp
@@ -4789,6 +4789,8 @@ void KTextEditor::DocumentPrivate::readVariableLine(const QString &t, bool onlyV
                     m_config->setRemoveSpaces(1);
                 } else if (val == QLatin1String("2") || val == QLatin1String("all") || val == QLatin1String("*")) {
                     m_config->setRemoveSpaces(2);
+                } else if (val == QLatin1String("3") || val == QLatin1String("cursor") || val == QLatin1String("cur")) {
+                    m_config->setRemoveSpaces(3);
                 } else {
                     m_config->setRemoveSpaces(0);
                 }
diff --git a/src/variableeditor/variableeditor.cpp b/src/variableeditor/variableeditor.cpp
index 020fe3b3..f19d8a51 100644
--- a/src/variableeditor/variableeditor.cpp
+++ b/src/variableeditor/variableeditor.cpp
@@ -309,6 +309,7 @@ VariableRemoveSpacesEditor::VariableRemoveSpacesEditor(VariableRemoveSpacesItem
     m_comboBox->addItem(i18nc("value for variable remove-trailing-spaces", "none"));
     m_comboBox->addItem(i18nc("value for variable remove-trailing-spaces", "modified"));
     m_comboBox->addItem(i18nc("value for variable remove-trailing-spaces", "all"));
+    m_comboBox->addItem(i18nc("value for variable remove-trailing-spaces", "cursor"));
     m_comboBox->setCurrentIndex(item->value());
     l->addWidget(m_comboBox, 0, 2, Qt::AlignLeft);
 
@@ -317,8 +318,8 @@ VariableRemoveSpacesEditor::VariableRemoveSpacesEditor(VariableRemoveSpacesItem
     connect(m_comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &VariableRemoveSpacesEditor::setItemValue);
 }
 
-void VariableRemoveSpacesEditor::setItemValue(int enabled)
+void VariableRemoveSpacesEditor::setItemValue(int removeMode)
 {
-    static_cast<VariableRemoveSpacesItem *>(item())->setValue(enabled == 0);
+    static_cast<VariableRemoveSpacesItem *>(item())->setValue(removeMode);
 }
 // END VariableRemoveSpacesEditor
diff --git a/src/variableeditor/variableitem.cpp b/src/variableeditor/variableitem.cpp
index a7038a1c..7199f811 100644
--- a/src/variableeditor/variableitem.cpp
+++ b/src/variableeditor/variableitem.cpp
@@ -324,6 +324,8 @@ QString VariableRemoveSpacesItem::valueAsString() const
         return QStringLiteral("all");
     } else if (m_value == 1) {
         return QStringLiteral("modified");
+    } else if (m_value == 3) {
+        return QStringLiteral("cursor");
     } else {
         return QStringLiteral("none");
     }
@@ -337,6 +339,8 @@ void VariableRemoveSpacesItem::setValueByString(const QString &value)
         m_value = 1;
     } else if (tmp == QLatin1String("2") || tmp == QLatin1String("all") || tmp == QLatin1String("*")) {
         m_value = 2;
+    } else if (tmp == QLatin1String("3") || tmp == QLatin1String("cursor") || tmp == QLatin1String("cur")) {
+        m_value = 3;
     } else {
         m_value = 0;
     }