From 46a96c25b04112b1e4043c13bfe77be72f6836fb Mon Sep 17 00:00:00 2001
From: Falco Hirschenberger <hirsch@bigfoot.de>
Date: Wed, 20 Jan 2010 16:54:07 +0100
Subject: [PATCH] Collapse or expand trailing whitespaces to one
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Merge-request: 1823
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
---
src/plugins/texteditor/basetexteditor.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index b17a3c2a3db..9cf2116abca 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -896,15 +896,19 @@ void BaseTextEditor::joinLineUpDown(bool up)
move.movePosition(QTextCursor::Up);
else
move.movePosition(QTextCursor::Down);
+
move.movePosition(QTextCursor::StartOfBlock);
move.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
QString cutLine = move.selectedText();
+ // collapse trailing whitespaces to one or insert whitespace
+ cutLine.replace(QRegExp("^\\s*"), " ");
move.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor);
move.removeSelectedText();
move.clearSelection();
if(!up)
move.movePosition(QTextCursor::Up);
+
move.movePosition(QTextCursor::EndOfBlock);
move.insertText(cutLine);
move.endEditBlock();
--
GitLab