aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Editor.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/Editor.cxx')
-rw-r--r--src/Editor.cxx46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx
index ce5a70ce5..b918f1be3 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4143,7 +4143,7 @@ Sci::Position Editor::SearchText(
///< @c FindOption::WordStart, @c FindOption::RegExp or @c FindOption::Posix.
sptr_t lParam) { ///< The text to search for.
- const char *txt = CharPtrFromSPtr(lParam);
+ const char *txt = ConstCharPtrFromSPtr(lParam);
Sci::Position pos = Sci::invalidPosition;
Sci::Position lengthFound = strlen(txt);
if (!pdoc->HasCaseFolder())
@@ -5741,7 +5741,7 @@ void Editor::StyleSetMessage(Message iMessage, uptr_t wParam, sptr_t lParam) {
break;
case Message::StyleSetFont:
if (lParam != 0) {
- vs.SetStyleFontName(static_cast<int>(wParam), CharPtrFromSPtr(lParam));
+ vs.SetStyleFontName(static_cast<int>(wParam), ConstCharPtrFromSPtr(lParam));
}
break;
case Message::StyleSetUnderline:
@@ -5904,7 +5904,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
UndoGroup ug(pdoc);
pdoc->DeleteChars(0, pdoc->Length());
SetEmptySelection(0);
- const char *text = CharPtrFromSPtr(lParam);
+ const char *text = ConstCharPtrFromSPtr(lParam);
pdoc->InsertString(0, text, strlen(text));
return 1;
}
@@ -5942,7 +5942,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
break;
case Message::CopyText:
- CopyText(wParam, CharPtrFromSPtr(lParam));
+ CopyText(wParam, ConstCharPtrFromSPtr(lParam));
break;
case Message::Paste:
@@ -5958,7 +5958,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
if (!sel.Empty()) {
ClearSelection(); // want to replace rectangular selection contents
}
- InsertPasteShape(CharPtrFromSPtr(lParam), PositionFromUPtr(wParam), PasteShape::rectangular);
+ InsertPasteShape(ConstCharPtrFromSPtr(lParam), PositionFromUPtr(wParam), PasteShape::rectangular);
break;
}
@@ -6076,7 +6076,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
return 0;
UndoGroup ug(pdoc);
ClearSelection();
- const char *replacement = CharPtrFromSPtr(lParam);
+ const char *replacement = ConstCharPtrFromSPtr(lParam);
const Sci::Position lengthInserted = pdoc->InsertString(
sel.MainCaret(), replacement, strlen(replacement));
SetEmptySelection(sel.MainCaret() + lengthInserted);
@@ -6135,15 +6135,15 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
case Message::ReplaceTarget:
PLATFORM_ASSERT(lParam);
- return ReplaceTarget(false, CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+ return ReplaceTarget(false, ConstCharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
case Message::ReplaceTargetRE:
PLATFORM_ASSERT(lParam);
- return ReplaceTarget(true, CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+ return ReplaceTarget(true, ConstCharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
case Message::SearchInTarget:
PLATFORM_ASSERT(lParam);
- return SearchInTarget(CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+ return SearchInTarget(ConstCharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
case Message::SetSearchFlags:
searchFlags = static_cast<FindOption>(wParam);
@@ -6270,14 +6270,14 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
if (lParam == 0)
return 0;
const Sci::Position lengthInserted = pdoc->InsertString(
- CurrentPosition(), CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+ CurrentPosition(), ConstCharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
SetEmptySelection(sel.MainCaret() + lengthInserted);
return 0;
}
case Message::AddStyledText:
if (lParam)
- AddStyledText(CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+ AddStyledText(ConstCharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
return 0;
case Message::InsertText: {
@@ -6287,7 +6287,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
if (insertPos == -1)
insertPos = CurrentPosition();
Sci::Position newCurrent = CurrentPosition();
- const char *sz = CharPtrFromSPtr(lParam);
+ const char *sz = ConstCharPtrFromSPtr(lParam);
const Sci::Position lengthInserted = pdoc->InsertString(insertPos, sz, strlen(sz));
if (newCurrent > insertPos)
newCurrent += lengthInserted;
@@ -6297,12 +6297,12 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
case Message::ChangeInsertion:
PLATFORM_ASSERT(lParam);
- pdoc->ChangeInsertion(CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+ pdoc->ChangeInsertion(ConstCharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
return 0;
case Message::AppendText:
pdoc->InsertString(pdoc->Length(),
- CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+ ConstCharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
return 0;
case Message::ClearAll:
@@ -6603,7 +6603,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
case Message::SetStylingEx: // Specify a complete styling buffer
if (lParam == 0)
return 0;
- pdoc->SetStyles(PositionFromUPtr(wParam), CharPtrFromSPtr(lParam));
+ pdoc->SetStyles(PositionFromUPtr(wParam), ConstCharPtrFromSPtr(lParam));
break;
case Message::SetBufferedDraw:
@@ -6842,7 +6842,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
case Message::TextWidth:
PLATFORM_ASSERT(wParam < vs.styles.size());
PLATFORM_ASSERT(lParam);
- return TextWidth(wParam, CharPtrFromSPtr(lParam));
+ return TextWidth(wParam, ConstCharPtrFromSPtr(lParam));
case Message::TextHeight:
RefreshStyleData();
@@ -7086,7 +7086,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
case Message::MarkerDefinePixmap:
if (wParam <= MarkerMax) {
- vs.markers[wParam].SetXPM(CharPtrFromSPtr(lParam));
+ vs.markers[wParam].SetXPM(ConstCharPtrFromSPtr(lParam));
vs.CalcLargestMarkerHeight();
}
InvalidateStyleData();
@@ -7275,7 +7275,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
case Message::SetFontLocale:
if (lParam) {
- vs.SetFontLocaleName(CharPtrFromSPtr(lParam));
+ vs.SetFontLocaleName(ConstCharPtrFromSPtr(lParam));
InvalidateStyleRedraw();
}
break;
@@ -7437,7 +7437,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
break;
case Message::ToggleFoldShowText:
- pcs->SetFoldDisplayText(LineFromUPtr(wParam), CharPtrFromSPtr(lParam));
+ pcs->SetFoldDisplayText(LineFromUPtr(wParam), ConstCharPtrFromSPtr(lParam));
FoldLine(LineFromUPtr(wParam), FoldAction::Toggle);
break;
@@ -7450,7 +7450,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
return static_cast<sptr_t>(foldDisplayTextStyle);
case Message::SetDefaultFoldDisplayText:
- SetDefaultFoldDisplayText(CharPtrFromSPtr(lParam));
+ SetDefaultFoldDisplayText(ConstCharPtrFromSPtr(lParam));
Redraw();
break;
@@ -8281,7 +8281,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
return static_cast<sptr_t>(marginOptions);
case Message::MarginSetText:
- pdoc->MarginSetText(LineFromUPtr(wParam), CharPtrFromSPtr(lParam));
+ pdoc->MarginSetText(LineFromUPtr(wParam), ConstCharPtrFromSPtr(lParam));
break;
case Message::MarginGetText: {
@@ -8312,7 +8312,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
break;
case Message::AnnotationSetText:
- pdoc->AnnotationSetText(LineFromUPtr(wParam), CharPtrFromSPtr(lParam));
+ pdoc->AnnotationSetText(LineFromUPtr(wParam), ConstCharPtrFromSPtr(lParam));
break;
case Message::AnnotationGetText: {
@@ -8361,7 +8361,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
return vs.annotationStyleOffset;
case Message::EOLAnnotationSetText:
- pdoc->EOLAnnotationSetText(LineFromUPtr(wParam), CharPtrFromSPtr(lParam));
+ pdoc->EOLAnnotationSetText(LineFromUPtr(wParam), ConstCharPtrFromSPtr(lParam));
break;
case Message::EOLAnnotationGetText: {
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 10:08:26 +0000