[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktexteditor] src/vimode: Continue moving Command-related stuff into CommandMode.
From:       Simon St James <kdedevel () etotheipiplusone ! com>
Date:       2016-06-17 8:18:10
Message-ID: E1bDoyg-0002ZN-3r () scm ! kde ! org
[Download RAW message or body]

Git commit fa4b4a236d3ed58b212019fe9c7d2f2ac0101745 by Simon St James.
Committed on 17/06/2016 at 08:14.
Pushed by sstjames into branch 'master'.

Continue moving Command-related stuff into CommandMode.

M  +15   -15   src/vimode/emulatedcommandbar.h

http://commits.kde.org/ktexteditor/fa4b4a236d3ed58b212019fe9c7d2f2ac0101745

diff --git a/src/vimode/emulatedcommandbar.h b/src/vimode/emulatedcommandba=
r.h
index a9a5705..3927530 100644
--- a/src/vimode/emulatedcommandbar.h
+++ b/src/vimode/emulatedcommandbar.h
@@ -202,6 +202,19 @@ private:
         QString executeCommand(const QString &commandToExecute);
         CompletionStartParams completionInvoked(CompletionInvocation invoc=
ationType);
         void completionChosen();
+    private:
+        CompletionStartParams activateCommandCompletion();
+        CompletionStartParams activateCommandHistoryCompletion();
+        CompletionStartParams activateSedFindHistoryCompletion();
+        CompletionStartParams activateSedReplaceHistoryCompletion();
+        QString withoutRangeExpression();
+        QString rangeExpression();
+        QString withSedFindTermReplacedWith(const QString &newFindTerm);
+        QString withSedDelimiterEscaped(const QString &text);
+        bool isCursorInFindTermOfSed();
+        bool isCursorInReplaceTermOfSed();
+        QString sedFindTerm();
+        QString sedReplaceTerm();
         /**
         * Stuff to do with expressions of the form:
         *
@@ -214,25 +227,12 @@ private:
             int replaceBeginPos;
             int replaceEndPos;
             QChar delimiter;
-        }; // TODO - make private.
+        };
         /**
         * The "range expression" is the (optional) expression before the c=
ommand that describes
         * the range over which the command should be run e.g. '<,'>.  @see=
 CommandRangeExpressionParser
         */
-        CommandMode::ParsedSedExpression parseAsSedExpression(); // TODO -=
 make private
-    private:
-        CompletionStartParams activateCommandCompletion();
-        CompletionStartParams activateCommandHistoryCompletion();
-        CompletionStartParams activateSedFindHistoryCompletion();
-        CompletionStartParams activateSedReplaceHistoryCompletion();
-        QString withoutRangeExpression();
-        QString rangeExpression();
-        QString withSedFindTermReplacedWith(const QString &newFindTerm);
-        QString withSedDelimiterEscaped(const QString &text);
-        bool isCursorInFindTermOfSed();
-        bool isCursorInReplaceTermOfSed();
-        QString sedFindTerm();
-        QString sedReplaceTerm();
+        CommandMode::ParsedSedExpression parseAsSedExpression();
         void replaceCommandBeforeCursorWith(const QString &newCommand);
         int commandBeforeCursorBegin();
         QLineEdit *m_edit;

[prev in list] [next in list] [prev in thread] [next in thread]