diff options
author | Justin Dailey <unknown> | 2017-07-09 10:25:15 +1000 |
---|---|---|
committer | Justin Dailey <unknown> | 2017-07-09 10:25:15 +1000 |
commit | 761803cb377f059915ccb6e53d10f2839277ccee (patch) | |
tree | 58ce7875f01fb055de9209fe23ff31b2a039ea74 | |
parent | 735b519ec1b9dc7557c94dd2a6831c361708669f (diff) | |
download | scintilla-mirror-761803cb377f059915ccb6e53d10f2839277ccee.tar.gz |
Bug [#1955]. The data parameter to ILoader::AddData made const.
-rw-r--r-- | doc/ScintillaDoc.html | 2 | ||||
-rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
-rw-r--r-- | include/ILexer.h | 2 | ||||
-rw-r--r-- | src/Document.cxx | 2 | ||||
-rw-r--r-- | src/Document.h | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index 20a2925c6..21b110e34 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -5761,7 +5761,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){ <span class="S5">public</span><span class="S10">:</span><br /> <span class="S0"> </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>Release<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br /> <span class="S0"> </span><span class="S2">// Returns a status code from SC_STATUS_*</span><br /> -<span class="S0"> </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>AddData<span class="S10">(</span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>data<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>length<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br /> +<span class="S0"> </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>AddData<span class="S10">(</span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>data<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>length<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br /> <span class="S0"> </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>ConvertToDocument<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br /> <span class="S10">};</span><br /> </div> diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 6053fed1e..0cf3d09cb 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -542,6 +542,10 @@ An SCN_AUTOCSELECTIONCHANGE notification is sent when items are highlighted in an autocompletion or user list. </li> <li> + The data parameter to ILoader::AddData made const. + <a href="http://sourceforge.net/p/scintilla/bugs/1955/">Bug #1955</a>. + </li> + <li> SciTE's embedded Lua interpreter updated to Lua 5.3. </li> <li> diff --git a/include/ILexer.h b/include/ILexer.h index 5680acb4e..d18b307d1 100644 --- a/include/ILexer.h +++ b/include/ILexer.h @@ -85,7 +85,7 @@ class ILoader { public: virtual int SCI_METHOD Release() = 0; // Returns a status code from SC_STATUS_* - virtual int SCI_METHOD AddData(char *data, Sci_Position length) = 0; + virtual int SCI_METHOD AddData(const char *data, Sci_Position length) = 0; virtual void * SCI_METHOD ConvertToDocument() = 0; }; diff --git a/src/Document.cxx b/src/Document.cxx index 209060e5e..98baf9180 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -1138,7 +1138,7 @@ void Document::ChangeInsertion(const char *s, Sci::Position length) { insertion.assign(s, length); } -int SCI_METHOD Document::AddData(char *data, Sci_Position length) { +int SCI_METHOD Document::AddData(const char *data, Sci_Position length) { try { Sci::Position position = static_cast<Sci::Position>(Length()); InsertString(position, data, static_cast<Sci::Position>(length)); diff --git a/src/Document.h b/src/Document.h index 520755ae3..bf44b6c3b 100644 --- a/src/Document.h +++ b/src/Document.h @@ -316,7 +316,7 @@ public: bool DeleteChars(Sci::Position pos, Sci::Position len); Sci::Position InsertString(Sci::Position position, const char *s, Sci::Position insertLength); void ChangeInsertion(const char *s, Sci::Position length); - int SCI_METHOD AddData(char *data, Sci_Position length); + int SCI_METHOD AddData(const char *data, Sci_Position length); void * SCI_METHOD ConvertToDocument(); Sci::Position Undo(); Sci::Position Redo(); |