diff options
author | nyamatongwe <unknown> | 2011-07-11 11:17:48 +1000 |
---|---|---|
committer | nyamatongwe <unknown> | 2011-07-11 11:17:48 +1000 |
commit | 0cf1225ab37cfb1426f47018c0c1e9e615ee1eef (patch) | |
tree | 59e341c45ce2e1fe6ef113dab72004b30895ddfc /src/Document.cxx | |
parent | ebe47b5ef1aeb3d971b2166b9c3eae2f6fd25447 (diff) | |
download | scintilla-mirror-0cf1225ab37cfb1426f47018c0c1e9e615ee1eef.tar.gz |
Avoid shadowing of fields even for static methods to stop warnings.
Diffstat (limited to 'src/Document.cxx')
-rw-r--r-- | src/Document.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index da07b6b73..8a825650a 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -1112,17 +1112,17 @@ void Document::Indent(bool forwards, int lineBottom, int lineTop) { // Convert line endings for a piece of text to a particular mode. // Stop at len or when a NUL is found. // Caller must delete the returned pointer. -char *Document::TransformLineEnds(int *pLenOut, const char *s, size_t len, int eolMode) { +char *Document::TransformLineEnds(int *pLenOut, const char *s, size_t len, int eolModeWanted) { char *dest = new char[2 * len + 1]; const char *sptr = s; char *dptr = dest; for (size_t i = 0; (i < len) && (*sptr != '\0'); i++) { if (*sptr == '\n' || *sptr == '\r') { - if (eolMode == SC_EOL_CR) { + if (eolModeWanted == SC_EOL_CR) { *dptr++ = '\r'; - } else if (eolMode == SC_EOL_LF) { + } else if (eolModeWanted == SC_EOL_LF) { *dptr++ = '\n'; - } else { // eolMode == SC_EOL_CRLF + } else { // eolModeWanted == SC_EOL_CRLF *dptr++ = '\r'; *dptr++ = '\n'; } |