From e7375474b0697983b727a1efd32eb8b6bbbbd00d Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 22 Jun 2017 17:25:07 +1000
Subject: Merge Ilexer and ILexerWithSubStyles into ILexer4 to avoid need for
 version checking in 4.0. Use lvRelease4 ID.

---
 lexers/LexCPP.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lexers/LexCPP.cxx')

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) {
-- 
cgit v1.2.3