diff options
| -rw-r--r-- | lexers/LexHTML.cxx | 8 | ||||
| -rw-r--r-- | src/Editor.cxx | 6 | ||||
| -rw-r--r-- | src/PerLine.cxx | 2 | ||||
| -rw-r--r-- | src/PositionCache.cxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx index bd14534d4..028c5ec90 100644 --- a/lexers/LexHTML.cxx +++ b/lexers/LexHTML.cxx @@ -490,9 +490,9 @@ static bool isMakoBlockEnd(const int ch, const int chNext, const char *blockType return ((ch == '/') && (chNext == '>')); } else if (0 == strcmp(blockType, "%")) { if (ch == '/' && isLineEnd(chNext)) - return 1; + return true; else - return isLineEnd(ch); + return isLineEnd(ch); } else if (0 == strcmp(blockType, "{")) { return ch == '}'; } else { @@ -502,13 +502,13 @@ static bool isMakoBlockEnd(const int ch, const int chNext, const char *blockType static bool isDjangoBlockEnd(const int ch, const int chNext, const char *blockType) { if (strlen(blockType) == 0) { - return 0; + return false; } else if (0 == strcmp(blockType, "%")) { return ((ch == '%') && (chNext == '}')); } else if (0 == strcmp(blockType, "{")) { return ((ch == '}') && (chNext == '}')); } else { - return 0; + return false; } } diff --git a/src/Editor.cxx b/src/Editor.cxx index 2c7c2e5a2..81f3c1893 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -5331,7 +5331,7 @@ void Editor::FoldLine(Sci::Line line, int action) { if (action == SC_FOLDACTION_CONTRACT) { const Sci::Line lineMaxSubord = pdoc->GetLastChild(line); if (lineMaxSubord > line) { - cs.SetExpanded(line, 0); + cs.SetExpanded(line, false); cs.SetVisible(line + 1, lineMaxSubord, false); const Sci::Line lineCurrent = pdoc->LineFromPosition(sel.MainCaret()); @@ -5346,7 +5346,7 @@ void Editor::FoldLine(Sci::Line line, int action) { EnsureLineVisible(line, false); GoToLine(line); } - cs.SetExpanded(line, 1); + cs.SetExpanded(line, true); ExpandLine(line); } @@ -5419,7 +5419,7 @@ void Editor::EnsureLineVisible(Sci::Line lineDoc, bool enforcePolicy) { if (lineDoc != lineParent) EnsureLineVisible(lineParent, enforcePolicy); if (!cs.GetExpanded(lineParent)) { - cs.SetExpanded(lineParent, 1); + cs.SetExpanded(lineParent, true); ExpandLine(lineParent); } } diff --git a/src/PerLine.cxx b/src/PerLine.cxx index f26b48b77..41e767ab7 100644 --- a/src/PerLine.cxx +++ b/src/PerLine.cxx @@ -385,7 +385,7 @@ bool LineAnnotation::MultipleStyles(Sci::Line line) const { if (annotations.Length() && (line >= 0) && (line < annotations.Length()) && annotations[line]) return reinterpret_cast<AnnotationHeader *>(annotations[line])->style == IndividualStyles; else - return 0; + return false; } int LineAnnotation::Style(Sci::Line line) const { diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx index 6df915b8b..fff1d58a6 100644 --- a/src/PositionCache.cxx +++ b/src/PositionCache.cxx @@ -55,7 +55,7 @@ LineLayout::LineLayout(int maxLineLength_) : numCharsBeforeEOL(0), validity(llInvalid), xHighlightGuide(0), - highlightColumn(0), + highlightColumn(false), containsCaret(false), edgeColumn(0), chars(0), |