aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2020-08-03 13:57:18 +1000
committerNeil <nyamatongwe@gmail.com>2020-08-03 13:57:18 +1000
commitcb7a184522caa09495c645f70b0a392f6fa71737 (patch)
tree4a0dc1b2a538632fc2127c4e8268aaab1b46af7b /src
parent36a8db7334b7f5c8f27c3d1a1499cb8cf8133493 (diff)
downloadscintilla-mirror-cb7a184522caa09495c645f70b0a392f6fa71737.tar.gz
Backport: Use const. Use separate lines for variable declarations.
Backport of changeset 8473:29ece1e94078.
Diffstat (limited to 'src')
-rw-r--r--src/Editor.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 8ff94b39f..a5a0aba31 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4432,7 +4432,8 @@ void Editor::TrimAndSetSelection(Sci::Position currentPos_, Sci::Position anchor
}
void Editor::LineSelection(Sci::Position lineCurrentPos_, Sci::Position lineAnchorPos_, bool wholeLine) {
- Sci::Position selCurrentPos, selAnchorPos;
+ Sci::Position selCurrentPos;
+ Sci::Position selAnchorPos;
if (wholeLine) {
const Sci::Line lineCurrent_ = pdoc->SciLineFromPosition(lineCurrentPos_);
const Sci::Line lineAnchor_ = pdoc->SciLineFromPosition(lineAnchorPos_);
@@ -4582,7 +4583,8 @@ void Editor::ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifie
charPos = MovePositionOutsideChar(charPos, -1);
}
- Sci::Position startWord, endWord;
+ Sci::Position startWord;
+ Sci::Position endWord;
if ((sel.MainCaret() >= originalAnchorPos) && !pdoc->IsLineEndPosition(charPos)) {
startWord = pdoc->ExtendWordSelect(pdoc->MovePositionOutsideChar(charPos + 1, 1), -1);
endWord = pdoc->ExtendWordSelect(charPos, 1);
@@ -5612,7 +5614,7 @@ Sci::Position Editor::ReplaceTarget(bool replacePatterns, const char *text, Sci:
targetRange.end = targetRange.start;
// Realize virtual space of target start
- Sci::Position startAfterSpaceInsertion = RealizeVirtualSpace(targetRange.start.Position(), targetRange.start.VirtualSpace());
+ const Sci::Position startAfterSpaceInsertion = RealizeVirtualSpace(targetRange.start.Position(), targetRange.start.VirtualSpace());
targetRange.start.SetPosition(startAfterSpaceInsertion);
targetRange.end = targetRange.start;