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/ScintillaEdit/ScintillaDocument.cpp | |
| 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/ScintillaEdit/ScintillaDocument.cpp')
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp index c1605dbd2..cae99f64b 100644 --- a/qt/ScintillaEdit/ScintillaDocument.cpp +++ b/qt/ScintillaEdit/ScintillaDocument.cpp @@ -20,7 +20,7 @@ #include "ILexer.h" #include "Scintilla.h" -#include "CharacterCategory.h" +#include "CharacterCategoryMap.h" #include "Position.h" #include "UniqueString.h" #include "SplitVector.h" |