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 | |
| 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')
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.cpp | 2 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaEdit.pro | 4 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.pro | 8 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.h | 2 |
4 files changed, 8 insertions, 8 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" diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index ba1d93d10..9e53524ad 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -44,8 +44,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 \ 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 \ diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index 617635e55..e8ef4d403 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -35,7 +35,7 @@ #include "Platform.h" #include "ILoader.h" #include "ILexer.h" -#include "CharacterCategory.h" +#include "CharacterCategoryMap.h" #include "Position.h" #include "UniqueString.h" #include "SplitVector.h" |