diff options
author | Neil <nyamatongwe@gmail.com> | 2017-06-22 17:25:07 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2017-06-22 17:25:07 +1000 |
commit | e7375474b0697983b727a1efd32eb8b6bbbbd00d (patch) | |
tree | 157998ee0755ada4429c080a00a173eb84b07344 /lexers/LexCPP.cxx | |
parent | 3cd8489f5082c7b95fe5be45caf7fbdfc191f056 (diff) | |
download | scintilla-mirror-e7375474b0697983b727a1efd32eb8b6bbbbd00d.tar.gz |
Merge Ilexer and ILexerWithSubStyles into ILexer4 to avoid need for version
checking in 4.0. Use lvRelease4 ID.
Diffstat (limited to 'lexers/LexCPP.cxx')
-rw-r--r-- | lexers/LexCPP.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 238856b1c..5d75aa171 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -434,7 +434,7 @@ const char styleSubable[] = {SCE_C_IDENTIFIER, SCE_C_COMMENTDOCKEYWORD, 0}; } -class LexerCPP : public ILexerWithSubStyles { +class LexerCPP : public ILexer4 { bool caseSensitive; CharacterSet setWord; CharacterSet setNegationOp; @@ -489,7 +489,7 @@ public: delete this; } int SCI_METHOD Version() const override { - return lvSubStyles; + return lvRelease4; } const char * SCI_METHOD PropertyNames() override { return osCPP.PropertyNames(); @@ -546,10 +546,10 @@ public: return styleSubable; } - static ILexer *LexerFactoryCPP() { + static ILexer4 *LexerFactoryCPP() { return new LexerCPP(true); } - static ILexer *LexerFactoryCPPInsensitive() { + static ILexer4 *LexerFactoryCPPInsensitive() { return new LexerCPP(false); } static int MaskActive(int style) { |