aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cocoa/ScintillaCocoa.mm2
-rwxr-xr-xgtk/ScintillaGTK.cxx2
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp2
-rw-r--r--src/CaseConvert.cxx38
-rw-r--r--src/CaseConvert.h16
-rw-r--r--src/CaseFolder.cxx2
-rw-r--r--win32/ScintillaWin.cxx6
7 files changed, 34 insertions, 34 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 4c3b50d28..36ae35bd0 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -631,7 +631,7 @@ std::string ScintillaCocoa::CaseMapString(const std::string &s, CaseMapping case
if (IsUnicodeMode()) {
std::string retMapped(s.length() * maxExpansionCaseConversion, 0);
size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(),
- (caseMapping == CaseMapping::upper) ? CaseConversionUpper : CaseConversionLower);
+ (caseMapping == CaseMapping::upper) ? CaseConversion::upper : CaseConversion::lower);
retMapped.resize(lenMapped);
return retMapped;
}
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index f0e2767f5..e492c9ede 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -1258,7 +1258,7 @@ std::string ScintillaGTK::CaseMapString(const std::string &s, CaseMapping caseMa
if (IsUnicodeMode()) {
std::string retMapped(s.length() * maxExpansionCaseConversion, 0);
const size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(),
- (caseMapping == CaseMapping::upper) ? CaseConversionUpper : CaseConversionLower);
+ (caseMapping == CaseMapping::upper) ? CaseConversion::upper : CaseConversion::lower);
retMapped.resize(lenMapped);
return retMapped;
}
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index bb6dad410..aad1da231 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -619,7 +619,7 @@ std::string ScintillaQt::CaseMapString(const std::string &s, CaseMapping caseMap
if (IsUnicodeMode()) {
std::string retMapped(s.length() * maxExpansionCaseConversion, 0);
size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(),
- (caseMapping == CaseMapping::upper) ? CaseConversionUpper : CaseConversionLower);
+ (caseMapping == CaseMapping::upper) ? CaseConversion::upper : CaseConversion::lower);
retMapped.resize(lenMapped);
return retMapped;
}
diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx
index 9d8c9c9f3..7be4e52ef 100644
--- a/src/CaseConvert.cxx
+++ b/src/CaseConvert.cxx
@@ -676,26 +676,26 @@ CaseConverter caseConvFold;
CaseConverter caseConvUp;
CaseConverter caseConvLow;
-void AddSymmetric(enum CaseConversion conversion, int lower,int upper) {
+void AddSymmetric(CaseConversion conversion, int lower,int upper) {
char lowerUTF8[UTF8MaxBytes+1];
UTF8FromUTF32Character(lower, lowerUTF8);
char upperUTF8[UTF8MaxBytes+1];
UTF8FromUTF32Character(upper, upperUTF8);
switch (conversion) {
- case CaseConversionFold:
+ case CaseConversion::fold:
caseConvFold.Add(upper, lowerUTF8);
break;
- case CaseConversionUpper:
+ case CaseConversion::upper:
caseConvUp.Add(lower, upperUTF8);
break;
- case CaseConversionLower:
+ case CaseConversion::lower:
caseConvLow.Add(upper, lowerUTF8);
break;
}
}
-void SetupConversions(enum CaseConversion conversion) {
+void SetupConversions(CaseConversion conversion) {
// First initialize for the symmetric ranges
for (size_t i=0; i<std::size(symmetricCaseConversionRanges);) {
const int lower = symmetricCaseConversionRanges[i++];
@@ -752,39 +752,39 @@ void SetupConversions(enum CaseConversion conversion) {
const int character = UnicodeFromUTF8(originUTF8);
- if (conversion == CaseConversionFold && foldedUTF8[0]) {
+ if (conversion == CaseConversion::fold && foldedUTF8[0]) {
caseConvFold.Add(character, foldedUTF8);
}
- if (conversion == CaseConversionUpper && upperUTF8[0]) {
+ if (conversion == CaseConversion::upper && upperUTF8[0]) {
caseConvUp.Add(character, upperUTF8);
}
- if (conversion == CaseConversionLower && lowerUTF8[0]) {
+ if (conversion == CaseConversion::lower && lowerUTF8[0]) {
caseConvLow.Add(character, lowerUTF8);
}
}
switch (conversion) {
- case CaseConversionFold:
+ case CaseConversion::fold:
caseConvFold.FinishedAdding();
break;
- case CaseConversionUpper:
+ case CaseConversion::upper:
caseConvUp.FinishedAdding();
break;
- case CaseConversionLower:
+ case CaseConversion::lower:
caseConvLow.FinishedAdding();
break;
}
}
-CaseConverter *ConverterForConversion(enum CaseConversion conversion) noexcept {
+CaseConverter *ConverterForConversion(CaseConversion conversion) noexcept {
switch (conversion) {
- case CaseConversionFold:
+ case CaseConversion::fold:
return &caseConvFold;
- case CaseConversionUpper:
+ case CaseConversion::upper:
return &caseConvUp;
- case CaseConversionLower:
+ case CaseConversion::lower:
return &caseConvLow;
}
return nullptr;
@@ -794,28 +794,28 @@ CaseConverter *ConverterForConversion(enum CaseConversion conversion) noexcept {
namespace Scintilla {
-ICaseConverter *ConverterFor(enum CaseConversion conversion) {
+ICaseConverter *ConverterFor(CaseConversion conversion) {
CaseConverter *pCaseConv = ConverterForConversion(conversion);
if (!pCaseConv->Initialised())
SetupConversions(conversion);
return pCaseConv;
}
-const char *CaseConvert(int character, enum CaseConversion conversion) {
+const char *CaseConvert(int character, CaseConversion conversion) {
CaseConverter *pCaseConv = ConverterForConversion(conversion);
if (!pCaseConv->Initialised())
SetupConversions(conversion);
return pCaseConv->Find(character);
}
-size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed, enum CaseConversion conversion) {
+size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed, CaseConversion conversion) {
CaseConverter *pCaseConv = ConverterForConversion(conversion);
if (!pCaseConv->Initialised())
SetupConversions(conversion);
return pCaseConv->CaseConvertString(converted, sizeConverted, mixed, lenMixed);
}
-std::string CaseConvertString(const std::string &s, enum CaseConversion conversion) {
+std::string CaseConvertString(const std::string &s, CaseConversion conversion) {
std::string retMapped(s.length() * maxExpansionCaseConversion, 0);
const size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(),
conversion);
diff --git a/src/CaseConvert.h b/src/CaseConvert.h
index e3057c841..c5f217d09 100644
--- a/src/CaseConvert.h
+++ b/src/CaseConvert.h
@@ -12,10 +12,10 @@
namespace Scintilla {
-enum CaseConversion {
- CaseConversionFold,
- CaseConversionUpper,
- CaseConversionLower
+enum class CaseConversion {
+ fold,
+ upper,
+ lower
};
class ICaseConverter {
@@ -23,10 +23,10 @@ public:
virtual size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed) = 0;
};
-ICaseConverter *ConverterFor(enum CaseConversion conversion);
+ICaseConverter *ConverterFor(CaseConversion conversion);
// Returns a UTF-8 string. Empty when no conversion
-const char *CaseConvert(int character, enum CaseConversion conversion);
+const char *CaseConvert(int character, CaseConversion conversion);
// When performing CaseConvertString, the converted value may be up to 3 times longer than the input.
// Ligatures are often decomposed into multiple characters and long cases include:
@@ -36,10 +36,10 @@ constexpr size_t maxExpansionCaseConversion = 3;
// Converts a mixed case string using a particular conversion.
// Result may be a different length to input and the length is the return value.
// If there is not enough space then 0 is returned.
-size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed, enum CaseConversion conversion);
+size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed, CaseConversion conversion);
// Converts a mixed case string using a particular conversion.
-std::string CaseConvertString(const std::string &s, enum CaseConversion conversion);
+std::string CaseConvertString(const std::string &s, CaseConversion conversion);
}
diff --git a/src/CaseFolder.cxx b/src/CaseFolder.cxx
index bce593a98..d093829ba 100644
--- a/src/CaseFolder.cxx
+++ b/src/CaseFolder.cxx
@@ -53,7 +53,7 @@ void CaseFolderTable::StandardASCII() noexcept {
CaseFolderUnicode::CaseFolderUnicode() {
StandardASCII();
- converter = ConverterFor(CaseConversionFold);
+ converter = ConverterFor(CaseConversion::fold);
}
size_t CaseFolderUnicode::Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) {
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 8779a3c20..19194a8bb 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -2357,7 +2357,7 @@ public:
for (size_t mixIndex=0; mixIndex < nUtf16Mixed; mixIndex++) {
if ((lenFlat + 20) > utf16Folded.size())
utf16Folded.resize(lenFlat + 60);
- const char *foldedUTF8 = CaseConvert(utf16Mixed[mixIndex], CaseConversionFold);
+ const char *foldedUTF8 = CaseConvert(utf16Mixed[mixIndex], CaseConversion::fold);
if (foldedUTF8) {
// Maximum length of a case conversion is 6 bytes, 3 characters
wchar_t wFolded[20];
@@ -2399,7 +2399,7 @@ std::unique_ptr<CaseFolder> ScintillaWin::CaseFolderForEncoding() {
const unsigned int lengthUTF16 = WideCharFromMultiByte(cpDest, sCharacter,
wCharacter, std::size(wCharacter));
if (lengthUTF16 == 1) {
- const char *caseFolded = CaseConvert(wCharacter[0], CaseConversionFold);
+ const char *caseFolded = CaseConvert(wCharacter[0], CaseConversion::fold);
if (caseFolded) {
wchar_t wLower[20];
const size_t charsConverted = UTF16FromUTF8(std::string_view(caseFolded),
@@ -2429,7 +2429,7 @@ std::string ScintillaWin::CaseMapString(const std::string &s, CaseMapping caseMa
const UINT cpDoc = CodePageOfDocument();
if (cpDoc == SC_CP_UTF8) {
- return CaseConvertString(s, (caseMapping == CaseMapping::upper) ? CaseConversionUpper : CaseConversionLower);
+ return CaseConvertString(s, (caseMapping == CaseMapping::upper) ? CaseConversion::upper : CaseConversion::lower);
}
// Change text to UTF-16
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 12:02:34 +0000