Mercurial Repositories > eric / file diff

--- a/src/eric7/DocumentationTools/APIGenerator.py	Wed Jan 03 12:12:44 2024 +0100
+++ b/src/eric7/DocumentationTools/APIGenerator.py	Wed Jan 03 16:29:32 2024 +0100
@@ -85,18 +85,18 @@
         """
         Private method to generate the api section for global variables.
         """
-        from eric7.QScintilla.Editor import Editor
+        from eric7.QScintilla.Editor import EditorIconId
 
         moduleNameStr = "{0}".format(self.moduleName)
 
         for globalName in sorted(self.module.globals):
             if not self.__isPrivate(self.module.globals[globalName]):
                 if self.module.globals[globalName].isPublic():
-                    iconId = Editor.AttributeID
+                    iconId = EditorIconId.Attribute
                 elif self.module.globals[globalName].isProtected():
-                    iconId = Editor.AttributeProtectedID
+                    iconId = EditorIconId.AttributeProtected
                 else:
-                    iconId = Editor.AttributePrivateID
+                    iconId = EditorIconId.AttributePrivate
                 self.api.append(
                     "{0}{1}?{2:d}".format(moduleNameStr, globalName, iconId)
                 )
@@ -118,18 +118,18 @@
         @param className name of the class containing the method
         @type str
         """
-        from eric7.QScintilla.Editor import Editor
+        from eric7.QScintilla.Editor import EditorIconId
 
         _class = self.module.classes[className]
         methods = sorted(_class.methods)
         if "__init__" in methods:
             methods.remove("__init__")
             if _class.isPublic():
-                iconId = Editor.ClassID
+                iconId = EditorIconId.Class
             elif _class.isProtected():
-                iconId = Editor.ClassProtectedID
+                iconId = EditorIconId.ClassProtected
             else:
-                iconId = Editor.ClassPrivateID
+                iconId = EditorIconId.ClassPrivate
             self.api.append(
                 "{0}{1}?{2:d}({3})".format(
                     self.moduleName,
@@ -143,11 +143,11 @@
         for method in methods:
             if not self.__isPrivate(_class.methods[method]):
                 if _class.methods[method].isPublic():
-                    iconId = Editor.MethodID
+                    iconId = EditorIconId.Method
                 elif _class.methods[method].isProtected():
-                    iconId = Editor.MethodProtectedID
+                    iconId = EditorIconId.MethodProtected
                 else:
-                    iconId = Editor.MethodPrivateID
+                    iconId = EditorIconId.MethodPrivate
                 self.api.append(
                     "{0}{1}?{2:d}({3})".format(
                         classNameStr,
@@ -164,35 +164,35 @@
         @param className name of the class containing the class variables
         @type str
         """
-        from eric7.QScintilla.Editor import Editor
+        from eric7.QScintilla.Editor import EditorIconId
 
         _class = self.module.classes[className]
         classNameStr = "{0}{1}.".format(self.moduleName, className)
         for variable in sorted(_class.globals):
             if not self.__isPrivate(_class.globals[variable]):
                 if _class.globals[variable].isPublic():
-                    iconId = Editor.AttributeID
+                    iconId = EditorIconId.Attribute
                 elif _class.globals[variable].isProtected():
-                    iconId = Editor.AttributeProtectedID
+                    iconId = EditorIconId.AttributeProtected
                 else:
-                    iconId = Editor.AttributePrivateID
+                    iconId = EditorIconId.AttributePrivate
                 self.api.append("{0}{1}?{2:d}".format(classNameStr, variable, iconId))
 
     def __addFunctionsAPI(self):
         """
         Private method to generate the api section for functions.
         """
-        from eric7.QScintilla.Editor import Editor
+        from eric7.QScintilla.Editor import EditorIconId
 
         funcNames = sorted(self.module.functions)
         for funcName in funcNames:
             if not self.__isPrivate(self.module.functions[funcName]):
                 if self.module.functions[funcName].isPublic():
-                    iconId = Editor.MethodID
+                    iconId = EditorIconId.Method
                 elif self.module.functions[funcName].isProtected():
-                    iconId = Editor.MethodProtectedID
+                    iconId = EditorIconId.MethodProtected
                 else:
-                    iconId = Editor.MethodPrivateID
+                    iconId = EditorIconId.MethodPrivate
                 self.api.append(
                     "{0}{1}?{2:d}({3})".format(
                         self.moduleName,