Mercurial Repositories > eric / file diff

--- a/src/eric7/QScintilla/EditorMarkerMap.py	Tue Apr 04 17:26:54 2023 +0200
+++ b/src/eric7/QScintilla/EditorMarkerMap.py	Wed Apr 05 11:58:22 2023 +0200
@@ -66,7 +66,7 @@
         @param painter reference to the painter (QPainter)
         @param color color to be used (QColor)
         """
-        displayLine = self._master.getVisibleLineFromDocLine(line)
+        displayLine = self._controller.getVisibleLineFromDocLine(line)
         position = self.value2Position(displayLine)
         painter.setPen(color)
         painter.setBrush(color)
@@ -82,44 +82,44 @@
 
         # 1. changes
         if Preferences.getEditor("ShowMarkerChanges"):
-            for line in self._master.getChangeLines():
+            for line in self._controller.getChangeLines():
                 self.__drawIndicator(line, painter, self.__changeColor)
 
         # 2. coverage
         if Preferences.getEditor("ShowMarkerCoverage"):
-            for line in self._master.getCoverageLines():
+            for line in self._controller.getCoverageLines():
                 self.__drawIndicator(line, painter, self.__coverageColor)
 
         # 3. tasks
-        for line in self._master.getTaskLines():
+        for line in self._controller.getTaskLines():
             self.__drawIndicator(line, painter, self.__taskColor)
 
         # 4. breakpoints
-        for line in self._master.getBreakpointLines():
+        for line in self._controller.getBreakpointLines():
             self.__drawIndicator(line, painter, self.__breakpointColor)
 
         # 5. bookmarks
-        for line in self._master.getBookmarkLines():
+        for line in self._controller.getBookmarkLines():
             self.__drawIndicator(line, painter, self.__bookmarkColor)
 
         # 6. search markers
         if Preferences.getEditor("ShowMarkerSearch"):
-            for line in self._master.getSearchIndicatorLines():
+            for line in self._controller.getSearchIndicatorLines():
                 self.__drawIndicator(line, painter, self.__searchMarkerColor)
 
         # 7. warnings
-        for line in self._master.getWarningLines():
+        for line in self._controller.getWarningLines():
             self.__drawIndicator(line, painter, self.__warningColor)
 
         # 8. VCS conflict markers
-        for line in self._master.getVcsConflictMarkerLines():
+        for line in self._controller.getVcsConflictMarkerLines():
             self.__drawIndicator(line, painter, self.__vcsConflictMarkerColor)
 
         # 9. errors
-        for line in self._master.getSyntaxErrorLines():
+        for line in self._controller.getSyntaxErrorLines():
             self.__drawIndicator(line, painter, self.__errorColor)
 
         # 10. current line
         self.__drawIndicator(
-            self._master.getCursorPosition()[0], painter, self.__currentLineMarker
+            self._controller.getCursorPosition()[0], painter, self.__currentLineMarker
         )