Rename CharacterSet and CharacterCategory modules in Scintilla to CharacterType

and CharacterCategoryMap to avoid clashes with Lexilla when building an
executable that includes both.

1 files changed, 0 insertions, 52 deletions

diff --git a/src/CharacterSet.cxx b/src/CharacterSet.cxx
deleted file mode 100644
index b934c2dd4..000000000
--- a/src/CharacterSet.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-// Scintilla source code edit control
-/** @file CharacterSet.cxx
- ** Simple case functions for ASCII.
- ** Lexer infrastructure.
- **/
-// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
-
-#include <cstdlib>
-#include <cassert>
-
-#include "CharacterSet.h"
-
-using namespace Scintilla;
-
-namespace Scintilla {
-
-int CompareCaseInsensitive(const char *a, const char *b) noexcept {
-	while (*a && *b) {
-		if (*a != *b) {
-			const char upperA = MakeUpperCase(*a);
-			const char upperB = MakeUpperCase(*b);
-			if (upperA != upperB)
-				return upperA - upperB;
-		}
-		a++;
-		b++;
-	}
-	// Either *a or *b is nul
-	return *a - *b;
-}
-
-int CompareNCaseInsensitive(const char *a, const char *b, size_t len) noexcept {
-	while (*a && *b && len) {
-		if (*a != *b) {
-			const char upperA = MakeUpperCase(*a);
-			const char upperB = MakeUpperCase(*b);
-			if (upperA != upperB)
-				return upperA - upperB;
-		}
-		a++;
-		b++;
-		len--;
-	}
-	if (len == 0)
-		return 0;
-	else
-		// Either *a or *b is nul
-		return *a - *b;
-}
-
-}