From 4ae93a9d275a1dd9bef666d2082d31ab3bee8e29 Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Thu, 4 Feb 2021 13:03:18 +0100 Subject: [PATCH] FakeVim: Fix Qt6 build Amends f626e27370bbc24b1750658dc3d7fd89116242f9 Change-Id: Id4681dc771a132bc6143b7e1f0b566a3930706e2 Reviewed-by: hjk --- src/plugins/fakevim/fakevimhandler.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 439c70b9e08..caaf9dbda26 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -7411,7 +7411,8 @@ void FakeVimHandler::Private::toggleComment(const Range &range) QStringList lines = text.split('\n'); - const QRegExp checkForComment("^\\s*" + QRegExp::escape(commentString)); + const QRegularExpression checkForComment("^\\s*" + + QRegularExpression::escape(commentString)); const bool firstLineIsComment = !lines.empty() && lines.front().contains(checkForComment); @@ -7419,13 +7420,13 @@ void FakeVimHandler::Private::toggleComment(const Range &range) for (auto& line : lines) { if (!line.isEmpty()) { if (firstLineIsComment) { - const bool hasSpaceAfterCommentString - = line.contains(QRegExp(checkForComment.pattern() + "\\s")); + const bool hasSpaceAfterCommentString = line.contains( + QRegularExpression(checkForComment.pattern() + "\\s")); const int sizeToReplace = hasSpaceAfterCommentString ? commentString.size() + 1 : commentString.size(); line.replace(line.indexOf(commentString), sizeToReplace, ""); } else { - const int indexOfFirstNonSpace = line.indexOf(QRegExp("[^\\s]")); + const int indexOfFirstNonSpace = line.indexOf(QRegularExpression("[^\\s]")); line = line.left(indexOfFirstNonSpace) + commentString + " " + line.right(line.size() - indexOfFirstNonSpace); } }