diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-04-27 10:04:57 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-04-27 10:04:57 +1000 |
| commit | 13b6f88d9b4710e1c51b36a97c3b45a6441a7820 (patch) | |
| tree | a8f7b3fa0e91986f4d0a8125a705df771ddb5f83 /qt/ScintillaEditBase/ScintillaEditBase.pro | |
| parent | dd48a3b8b049ab42ac16108b428e947135f82877 (diff) | |
| download | scintilla-mirror-13b6f88d9b4710e1c51b36a97c3b45a6441a7820.tar.gz | |
Rename CharacterSet and CharacterCategory modules in Scintilla to CharacterType
and CharacterCategoryMap to avoid clashes with Lexilla when building an
executable that includes both.
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaEditBase.pro')
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index cc0d39c73..65e39ad87 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -42,8 +42,8 @@ SOURCES += \ ../../src/DBCS.cxx \ ../../src/ContractionState.cxx \ ../../src/CharClassify.cxx \ - ../../src/CharacterSet.cxx \ - ../../src/CharacterCategory.cxx \ + ../../src/CharacterType.cxx \ + ../../src/CharacterCategoryMap.cxx \ ../../src/CellBuffer.cxx \ ../../src/CaseFolder.cxx \ ../../src/CaseConvert.cxx \ @@ -77,8 +77,8 @@ HEADERS += \ ../../src/Decoration.h \ ../../src/ContractionState.h \ ../../src/CharClassify.h \ - ../../src/CharacterSet.h \ - ../../src/CharacterCategory.h \ + ../../src/CharacterType.h \ + ../../src/CharacterCategoryMap.h \ ../../src/CellBuffer.h \ ../../src/CaseFolder.h \ ../../src/CaseConvert.h \ |