aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-04-20 12:52:30 +1000
committerNeil <nyamatongwe@gmail.com>2018-04-20 12:52:30 +1000
commitc896b7994fd83b5a4280801fe08803172ebea6a5 (patch)
treeb093651520f7278af90082a7d482b77d9165945c
parent4d9c84bfea91a1e22bbc4b94dd3bbae77af0e2e2 (diff)
downloadscintilla-mirror-c896b7994fd83b5a4280801fe08803172ebea6a5.tar.gz
Backport: Mark pointer to constant parameter as const.
Backport of changeset 6721:33bf16396488.
-rw-r--r--src/EditView.cxx2
-rw-r--r--src/EditView.h2
-rw-r--r--src/Editor.cxx2
-rw-r--r--src/Editor.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx
index ec7f8d4be..5b50e7732 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -2190,7 +2190,7 @@ static ColourDesired InvertedLight(ColourDesired orig) {
return ColourDesired(std::min(r, 0xffu), std::min(g, 0xffu), std::min(b, 0xffu));
}
-Sci::Position EditView::FormatRange(bool draw, Sci_RangeToFormat *pfr, Surface *surface, Surface *surfaceMeasure,
+Sci::Position EditView::FormatRange(bool draw, const Sci_RangeToFormat *pfr, Surface *surface, Surface *surfaceMeasure,
const EditModel &model, const ViewStyle &vs) {
// Can't use measurements cached for screen
posCache.Clear();
diff --git a/src/EditView.h b/src/EditView.h
index 82f2f93ee..f79147135 100644
--- a/src/EditView.h
+++ b/src/EditView.h
@@ -145,7 +145,7 @@ public:
const ViewStyle &vsDraw);
void FillLineRemainder(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
Sci::Line line, PRectangle rcArea, int subLine) const;
- Sci::Position FormatRange(bool draw, Sci_RangeToFormat *pfr, Surface *surface, Surface *surfaceMeasure,
+ Sci::Position FormatRange(bool draw, const Sci_RangeToFormat *pfr, Surface *surface, Surface *surfaceMeasure,
const EditModel &model, const ViewStyle &vs);
};
diff --git a/src/Editor.cxx b/src/Editor.cxx
index a65f5b235..730dd2e7e 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -1777,7 +1777,7 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
// This is mostly copied from the Paint method but with some things omitted
// such as the margin markers, line numbers, selection and caret
// Should be merged back into a combined Draw method.
-Sci::Position Editor::FormatRange(bool draw, Sci_RangeToFormat *pfr) {
+Sci::Position Editor::FormatRange(bool draw, const Sci_RangeToFormat *pfr) {
if (!pfr)
return 0;
diff --git a/src/Editor.h b/src/Editor.h
index 3f6f8f2c8..7e763d7db 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -378,7 +378,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
void PaintSelMargin(Surface *surfaceWindow, PRectangle &rc);
void RefreshPixMaps(Surface *surfaceWindow);
void Paint(Surface *surfaceWindow, PRectangle rcArea);
- Sci::Position FormatRange(bool draw, Sci_RangeToFormat *pfr);
+ Sci::Position FormatRange(bool draw, const Sci_RangeToFormat *pfr);
int TextWidth(int style, const char *text);
virtual void SetVerticalScrollPos() = 0;