Mercurial Repositories > eric / file diff

--- a/E5Gui/E5ProgressDialog.py	Tue Mar 07 18:46:09 2017 +0100
+++ b/E5Gui/E5ProgressDialog.py	Tue Mar 07 18:53:18 2017 +0100
@@ -19,7 +19,7 @@
     label.
     """
     def __init__(self, labelText, cancelButtonText, minimum, maximum,
-                 format=None, parent=None, flags=Qt.WindowFlags()):
+                 labelFormat=None, parent=None, flags=Qt.WindowFlags()):
         """
         Constructor
         
@@ -27,7 +27,7 @@
         @param cancelButtonText text of the cancel button (string)
         @param minimum minimum value (integer)
         @param maximum maximum value (integer)
-        @keyparam format label format of the progress bar (string)
+        @keyparam labelFormat label format of the progress bar (string)
         @keyparam parent reference to the parent widget (QWidget)
         @keyparam flags window flags of the dialog (Qt.WindowFlags)
         """
@@ -37,8 +37,8 @@
         self.__progressBar = QProgressBar(self)
         self.__progressBar.setMinimum(minimum)
         self.__progressBar.setMaximum(maximum)
-        if format:
-            self.__progressBar.setFormat(format)
+        if labelFormat:
+            self.__progressBar.setFormat(labelFormat)
         
         self.setBar(self.__progressBar)
     
@@ -50,10 +50,10 @@
         """
         return self.__progressBar.format()
     
-    def setFormat(self, format):
+    def setFormat(self, labelFormat):
         """
         Public method to set the progress bar format.
         
-        @param format progress bar format (string)
+        @param labelFormat progress bar format (string)
         """
-        self.__progressBar.setFormat(format)
+        self.__progressBar.setFormat(labelFormat)