diff options
Diffstat (limited to 'win32')
-rw-r--r-- | win32/ScintillaWin.cxx | 2 | ||||
-rw-r--r-- | win32/deps.mak | 40 | ||||
-rw-r--r-- | win32/makefile | 4 | ||||
-rw-r--r-- | win32/nmdeps.mak | 40 | ||||
-rw-r--r-- | win32/scintilla.mak | 4 |
5 files changed, 45 insertions, 45 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 4888c286e..dc12d78ee 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -58,7 +58,7 @@ #include "ILexer.h" #include "Scintilla.h" -#include "CharacterCategory.h" +#include "CharacterCategoryMap.h" #include "Position.h" #include "UniqueString.h" #include "SplitVector.h" diff --git a/win32/deps.mak b/win32/deps.mak index 3fd1b4765..d9f44d995 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -29,7 +29,7 @@ ScintillaWin.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -68,7 +68,7 @@ AutoComplete.o: \ ../src/Platform.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ - ../src/CharacterSet.h \ + ../src/CharacterType.h \ ../src/Position.h \ ../src/AutoComplete.h CallTip.o: \ @@ -98,15 +98,15 @@ CellBuffer.o: \ ../src/Partitioning.h \ ../src/CellBuffer.h \ ../src/UniConversion.h -CharacterCategory.o: \ - ../src/CharacterCategory.cxx \ - ../src/CharacterCategory.h -CharacterSet.o: \ - ../src/CharacterSet.cxx \ - ../src/CharacterSet.h +CharacterCategoryMap.o: \ + ../src/CharacterCategoryMap.cxx \ + ../src/CharacterCategoryMap.h +CharacterType.o: \ + ../src/CharacterType.cxx \ + ../src/CharacterType.h CharClassify.o: \ ../src/CharClassify.cxx \ - ../src/CharacterSet.h \ + ../src/CharacterType.h \ ../src/CharClassify.h ContractionState.o: \ ../src/ContractionState.cxx \ @@ -138,8 +138,8 @@ Document.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterSet.h \ - ../src/CharacterCategory.h \ + ../src/CharacterType.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/SplitVector.h \ ../src/Partitioning.h \ @@ -162,7 +162,7 @@ EditModel.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -192,8 +192,8 @@ Editor.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterSet.h \ - ../src/CharacterCategory.h \ + ../src/CharacterType.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -228,8 +228,8 @@ EditView.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterSet.h \ - ../src/CharacterCategory.h \ + ../src/CharacterType.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -291,7 +291,7 @@ MarginView.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -335,7 +335,7 @@ PositionCache.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -378,7 +378,7 @@ ScintillaBase.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -413,7 +413,7 @@ ScintillaBaseL.o: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ diff --git a/win32/makefile b/win32/makefile index 7dd2604bb..9a49602ef 100644 --- a/win32/makefile +++ b/win32/makefile @@ -86,8 +86,8 @@ SRC_OBJS = \ CaseConvert.o \ CaseFolder.o \ CellBuffer.o \ - CharacterCategory.o \ - CharacterSet.o \ + CharacterCategoryMap.o \ + CharacterType.o \ CharClassify.o \ ContractionState.o \ DBCS.o \ diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak index b831d6add..0f7f0fcbb 100644 --- a/win32/nmdeps.mak +++ b/win32/nmdeps.mak @@ -29,7 +29,7 @@ $(DIR_O)/ScintillaWin.obj: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -68,7 +68,7 @@ $(DIR_O)/AutoComplete.obj: \ ../src/Platform.h \ ../include/Scintilla.h \ ../include/Sci_Position.h \ - ../src/CharacterSet.h \ + ../src/CharacterType.h \ ../src/Position.h \ ../src/AutoComplete.h $(DIR_O)/CallTip.obj: \ @@ -98,15 +98,15 @@ $(DIR_O)/CellBuffer.obj: \ ../src/Partitioning.h \ ../src/CellBuffer.h \ ../src/UniConversion.h -$(DIR_O)/CharacterCategory.obj: \ - ../src/CharacterCategory.cxx \ - ../src/CharacterCategory.h -$(DIR_O)/CharacterSet.obj: \ - ../src/CharacterSet.cxx \ - ../src/CharacterSet.h +$(DIR_O)/CharacterCategoryMap.obj: \ + ../src/CharacterCategoryMap.cxx \ + ../src/CharacterCategoryMap.h +$(DIR_O)/CharacterType.obj: \ + ../src/CharacterType.cxx \ + ../src/CharacterType.h $(DIR_O)/CharClassify.obj: \ ../src/CharClassify.cxx \ - ../src/CharacterSet.h \ + ../src/CharacterType.h \ ../src/CharClassify.h $(DIR_O)/ContractionState.obj: \ ../src/ContractionState.cxx \ @@ -138,8 +138,8 @@ $(DIR_O)/Document.obj: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterSet.h \ - ../src/CharacterCategory.h \ + ../src/CharacterType.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/SplitVector.h \ ../src/Partitioning.h \ @@ -162,7 +162,7 @@ $(DIR_O)/EditModel.obj: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -192,8 +192,8 @@ $(DIR_O)/Editor.obj: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterSet.h \ - ../src/CharacterCategory.h \ + ../src/CharacterType.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -228,8 +228,8 @@ $(DIR_O)/EditView.obj: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterSet.h \ - ../src/CharacterCategory.h \ + ../src/CharacterType.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -291,7 +291,7 @@ $(DIR_O)/MarginView.obj: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -335,7 +335,7 @@ $(DIR_O)/PositionCache.obj: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -378,7 +378,7 @@ $(DIR_O)/ScintillaBase.obj: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ @@ -413,7 +413,7 @@ $(DIR_O)/ScintillaBaseL.obj: \ ../include/Sci_Position.h \ ../include/ILexer.h \ ../include/Scintilla.h \ - ../src/CharacterCategory.h \ + ../src/CharacterCategoryMap.h \ ../src/Position.h \ ../src/UniqueString.h \ ../src/SplitVector.h \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index edb0c7de8..1858368da 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -79,8 +79,8 @@ SRC_OBJS=\ $(DIR_O)\CaseConvert.obj \ $(DIR_O)\CaseFolder.obj \ $(DIR_O)\CellBuffer.obj \ - $(DIR_O)\CharacterCategory.obj \ - $(DIR_O)\CharacterSet.obj \ + $(DIR_O)\CharacterCategoryMap.obj \ + $(DIR_O)\CharacterType.obj \ $(DIR_O)\CharClassify.obj \ $(DIR_O)\ContractionState.obj \ $(DIR_O)\DBCS.obj \ |