Rename files that have the same name in Scintilla

wxWidgets' generated Xcode project can't seem to deal with CharacterSet.h and CharacterCategory.h in both Scintilla and Lexilla.
MaartenBent · Mar 9, 2024 · 0115247 · 0115247
1 parent 24ffa10
commit 0115247
Show file tree

Hide file tree

Showing 133 changed files with 424 additions and 424 deletions.
diff --git a/examples/SimpleLexer/SimpleLexer.cxx b/examples/SimpleLexer/SimpleLexer.cxx
@@ -39,7 +39,7 @@ style.simple.1=fore:#FF0000
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "LexerBase.h"
 

diff --git a/lexers/LexA68k.cxx b/lexers/LexA68k.cxx
@@ -25,7 +25,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexAPDL.cxx b/lexers/LexAPDL.cxx
@@ -23,7 +23,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexASY.cxx b/lexers/LexASY.cxx
@@ -21,7 +21,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexAU3.cxx b/lexers/LexAU3.cxx
@@ -67,7 +67,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexAVE.cxx b/lexers/LexAVE.cxx
@@ -24,7 +24,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexAVS.cxx b/lexers/LexAVS.cxx
@@ -23,7 +23,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexAbaqus.cxx b/lexers/LexAbaqus.cxx
@@ -25,7 +25,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexAda.cxx b/lexers/LexAda.cxx
@@ -22,7 +22,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexAsciidoc.cxx b/lexers/LexAsciidoc.cxx
@@ -26,7 +26,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexAsm.cxx b/lexers/LexAsm.cxx
@@ -28,7 +28,7 @@
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
 #include "DefaultLexer.h"

diff --git a/lexers/LexAsn1.cxx b/lexers/LexAsn1.cxx
@@ -22,7 +22,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexBaan.cxx b/lexers/LexBaan.cxx
@@ -32,7 +32,7 @@
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
 #include "DefaultLexer.h"

diff --git a/lexers/LexBash.cxx b/lexers/LexBash.cxx
@@ -28,7 +28,7 @@
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
 #include "SubStyles.h"

diff --git a/lexers/LexBasic.cxx b/lexers/LexBasic.cxx
@@ -35,7 +35,7 @@
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
 #include "DefaultLexer.h"

diff --git a/lexers/LexBatch.cxx b/lexers/LexBatch.cxx
@@ -24,7 +24,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexBibTeX.cxx b/lexers/LexBibTeX.cxx
@@ -27,7 +27,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexBullant.cxx b/lexers/LexBullant.cxx
@@ -18,7 +18,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexCIL.cxx b/lexers/LexCIL.cxx
@@ -28,7 +28,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
 #include "DefaultLexer.h"

diff --git a/lexers/LexCLW.cxx b/lexers/LexCLW.cxx
@@ -23,7 +23,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexCOBOL.cxx b/lexers/LexCOBOL.cxx
@@ -25,7 +25,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
@@ -28,7 +28,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
 #include "SparseState.h"

diff --git a/lexers/LexCSS.cxx b/lexers/LexCSS.cxx
@@ -31,7 +31,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexCaml.cxx b/lexers/LexCaml.cxx
@@ -35,7 +35,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 #if defined(__clang__)

diff --git a/lexers/LexCmake.cxx b/lexers/LexCmake.cxx
@@ -23,7 +23,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexCoffeeScript.cxx b/lexers/LexCoffeeScript.cxx
@@ -26,7 +26,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexConf.cxx b/lexers/LexConf.cxx
@@ -26,7 +26,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexCrontab.cxx b/lexers/LexCrontab.cxx
@@ -24,7 +24,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexCsound.cxx b/lexers/LexCsound.cxx
@@ -23,7 +23,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexD.cxx b/lexers/LexD.cxx
@@ -25,7 +25,7 @@
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
 #include "DefaultLexer.h"

diff --git a/lexers/LexDMAP.cxx b/lexers/LexDMAP.cxx
@@ -23,7 +23,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 /***************************************/
 

diff --git a/lexers/LexDMIS.cxx b/lexers/LexDMIS.cxx
@@ -21,7 +21,7 @@
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "DefaultLexer.h"
 

diff --git a/lexers/LexDataflex.cxx b/lexers/LexDataflex.cxx
@@ -64,7 +64,7 @@ The list of keywords that can be used in dataflex.properties file (up to DataFle
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexDiff.cxx b/lexers/LexDiff.cxx
@@ -22,7 +22,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexECL.cxx b/lexers/LexECL.cxx
@@ -35,7 +35,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
 

diff --git a/lexers/LexEScript.cxx b/lexers/LexEScript.cxx
@@ -21,7 +21,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexEiffel.cxx b/lexers/LexEiffel.cxx
@@ -22,7 +22,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexErlang.cxx b/lexers/LexErlang.cxx
@@ -26,7 +26,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexErrorList.cxx b/lexers/LexErrorList.cxx
@@ -23,7 +23,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexFSharp.cxx b/lexers/LexFSharp.cxx
@@ -21,7 +21,7 @@
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
 #include "DefaultLexer.h"

diff --git a/lexers/LexFlagship.cxx b/lexers/LexFlagship.cxx
@@ -25,7 +25,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexForth.cxx b/lexers/LexForth.cxx
@@ -22,7 +22,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;

diff --git a/lexers/LexFortran.cxx b/lexers/LexFortran.cxx
@@ -23,7 +23,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 /***************************************/
 

diff --git a/lexers/LexGAP.cxx b/lexers/LexGAP.cxx
@@ -23,7 +23,7 @@
 #include "LexAccessor.h"
 #include "Accessor.h"
 #include "StyleContext.h"
-#include "CharacterSet.h"
+#include "LexCharacterSet.h"
 #include "LexerModule.h"
 
 using namespace Lexilla;