Mercurial Repositories > eric / file diff

--- a/QScintilla/Lexers/LexerCPP.py	Sat Mar 16 20:17:06 2019 +0100
+++ b/QScintilla/Lexers/LexerCPP.py	Sun Mar 17 11:56:51 2019 +0100
@@ -9,7 +9,6 @@
 
 from __future__ import unicode_literals
 
-from PyQt5.QtCore import QCoreApplication
 from PyQt5.Qsci import QsciLexerCPP, QsciScintilla
 
 from .SubstyledLexer import SubstyledLexer
@@ -46,14 +45,16 @@
         ## default sub-style definitions
         ##############################################################
         
+        diffToSecondary = 0x40
+        # This may need to be changed to be in line with Scintilla C++ lexer.
+        
         # list of style numbers, that support sub-styling
-        self.baseStyles = [11, 17, 75, 81]
+        self.baseStyles = [11, 17, 11 + diffToSecondary, 17 + diffToSecondary]
         
         self.defaultSubStyles = {
             11: {
                 0: {
-                    "Description": QCoreApplication.translate(
-                        "LexerCPP", "Extra Identifiers"),
+                    "Description": self.tr("Additional Identifier"),
                     "Words": "std map string vector",
                     "Style": {
                         "fore": 0xEE00AA,
@@ -62,28 +63,26 @@
             },
             17: {
                 0: {
-                    "Description": QCoreApplication.translate(
-                        "LexerCPP", "Extra Doc Comment Keywords"),
+                    "Description": self.tr("Additional JavaDoc keyword"),
                     "Words": "check",
                     "Style": {
                         "fore": 0x00AAEE,
                     }
                 },
             },
-            75: {
+            11 + diffToSecondary: {
                 0: {
-                    "Description": QCoreApplication.translate(
-                        "LexerCPP", "Inactive Extra Identifiers"),
+                    "Description": self.tr("Inactive additional identifier"),
                     "Words": "std map string vector",
                     "Style": {
                         "fore": 0xBB6666,
                     }
                 },
             },
-            81: {
+            17 + diffToSecondary: {
                 0: {
-                    "Description": QCoreApplication.translate(
-                        "LexerCPP", "Inactive Extra Doc Comment Keywords"),
+                    "Description": self.tr(
+                        "Inactive additional JavaDoc keyword"),
                     "Words": "check",
                     "Style": {
                         "fore": 0x6699AA,