From 9f9b24ae9bc0ae771454732868cdb136fe995e42 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Mon, 5 Apr 2021 15:48:13 +1000
Subject: Change CaseConversion to an enum class.

---
 src/CaseConvert.cxx | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/CaseConvert.cxx')

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);
-- 
cgit v1.2.3