Mercurial Repositories > eric / file diff

--- a/QScintilla/EditorButtonsWidget.py	Sat Mar 11 13:11:29 2017 +0100
+++ b/QScintilla/EditorButtonsWidget.py	Sat Mar 11 14:35:22 2017 +0100
@@ -211,11 +211,11 @@
         
         self.__headerMenu.triggered.connect(self.__headerMenuTriggered)
     
-    def __addButton(self, format, iconName, toolTip):
+    def __addButton(self, formatName, iconName, toolTip):
         """
         Private method to add a format button.
         
-        @param format unique name of the format
+        @param formatName unique name of the format
         @type str
         @param iconName name of the icon for the button
         @type str
@@ -227,9 +227,9 @@
         button = QToolButton(self.__buttonsWidget)
         button.setIcon(UI.PixmapCache.getIcon(iconName))
         button.setToolTip(toolTip)
-        button.clicked.connect(lambda: self.__formatClicked(format))
+        button.clicked.connect(lambda: self.__formatClicked(formatName))
         self.__layout.addWidget(button)
-        self.__buttons[format] = button
+        self.__buttons[formatName] = button
         
         return button
     
@@ -288,40 +288,40 @@
             if Preferences.getEditor("HideFormatButtons"):
                 self.setVisible(self.__provider.kind() != "none")
     
-    def __formatClicked(self, format):
+    def __formatClicked(self, formatName):
         """
         Private slot to handle a format button being clicked.
         
-        @param format format type of the button
+        @param formatName format type of the button
         @type str
         """
-        if format == "bold":
+        if formatName == "bold":
             self.__provider.bold(self.__editor)
-        elif format == "italic":
+        elif formatName == "italic":
             self.__provider.italic(self.__editor)
-        elif format == "strikethrough":
+        elif formatName == "strikethrough":
             self.__provider.strikethrough(self.__editor)
-        elif format.startswith("header"):
+        elif formatName.startswith("header"):
             try:
-                level = int(format[-1])
+                level = int(formatName[-1])
                 self.__provider.header(self.__editor, level)
             except ValueError:
                 pass
-        elif format == "code":
+        elif formatName == "code":
             self.__provider.code(self.__editor)
-        elif format == "codeBlock":
+        elif formatName == "codeBlock":
             self.__provider.codeBlock(self.__editor)
-        elif format == "quote":
+        elif formatName == "quote":
             self.__provider.quote(self.__editor)
-        elif format == "hyperlink":
+        elif formatName == "hyperlink":
             self.__provider.hyperlink(self.__editor)
-        elif format == "line":
+        elif formatName == "line":
             self.__provider.line(self.__editor)
-        elif format == "image":
+        elif formatName == "image":
             self.__provider.image(self.__editor)
-        elif format == "bulletedList":
+        elif formatName == "bulletedList":
             self.__provider.bulletedList(self.__editor)
-        elif format == "numberedList":
+        elif formatName == "numberedList":
             self.__provider.numberedList(self.__editor)
     
     def __headerMenuTriggered(self, act):
@@ -331,8 +331,8 @@
         @param act action of the headers menu that was triggered
         @type QAction
         """
-        format = act.data()
-        self.__formatClicked(format)
+        formatName = act.data()
+        self.__formatClicked(formatName)
     
     def __editorSelectionChanged(self):
         """