aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/Document.cxx6
-rw-r--r--src/Document.h2
-rw-r--r--src/PositionCache.cxx4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Document.cxx b/src/Document.cxx
index 07ed604fd..8d250b9ab 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -1175,11 +1175,11 @@ int Document::SafeSegment(const char *text, int length, int lengthSegment) const
EncodingFamily Document::CodePageFamily() const noexcept {
if (SC_CP_UTF8 == dbcsCodePage)
- return efUnicode;
+ return EncodingFamily::unicode;
else if (dbcsCodePage)
- return efDBCS;
+ return EncodingFamily::dbcs;
else
- return efEightBit;
+ return EncodingFamily::eightBit;
}
void Document::ModifiedAt(Sci::Position pos) noexcept {
diff --git a/src/Document.h b/src/Document.h
index 37c37c4b8..ce0178695 100644
--- a/src/Document.h
+++ b/src/Document.h
@@ -18,7 +18,7 @@ class LineLevels;
class LineState;
class LineAnnotation;
-enum EncodingFamily { efEightBit, efUnicode, efDBCS };
+enum class EncodingFamily { eightBit, unicode, dbcs };
/**
* The range class represents a range of text in a document.
diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx
index 28d2632fe..40dfe5829 100644
--- a/src/PositionCache.cxx
+++ b/src/PositionCache.cxx
@@ -613,10 +613,10 @@ TextSegment BreakFinder::Next() {
const int prev = nextBreak;
while (nextBreak < lineRange.end) {
int charWidth = 1;
- if (encodingFamily == efUnicode)
+ if (encodingFamily == EncodingFamily::unicode)
charWidth = UTF8DrawBytes(reinterpret_cast<unsigned char *>(&ll->chars[nextBreak]),
static_cast<int>(lineRange.end - nextBreak));
- else if (encodingFamily == efDBCS)
+ else if (encodingFamily == EncodingFamily::dbcs)
charWidth = pdoc->DBCSDrawBytes(
std::string_view(&ll->chars[nextBreak], lineRange.end - nextBreak));
const Representation *repr = preprs->RepresentationFromCharacter(&ll->chars[nextBreak], charWidth);