Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Fri Oct 18 23:00:41 2013 +0200
@@ -19,12 +19,15 @@
     """
     Class implementing a dialog to enter the data for a merge operation.
     """
-    def __init__(self, mergelist1, mergelist2, targetlist, force=False, parent=None):
+    def __init__(self, mergelist1, mergelist2, targetlist, force=False,
+                 parent=None):
         """
         Constructor
         
-        @param mergelist1 list of previously entered URLs/revisions (list of strings)
-        @param mergelist2 list of previously entered URLs/revisions (list of strings)
+        @param mergelist1 list of previously entered URLs/revisions
+            (list of strings)
+        @param mergelist2 list of previously entered URLs/revisions
+            (list of strings)
         @param targetlist list of previously entered targets (list of strings)
         @param force flag indicating a forced merge (boolean)
         @param parent parent widget (QWidget)
@@ -50,8 +53,6 @@
     def __enableOkButton(self):
         """
         Private method used to enable/disable the OK-button.
-        
-        @param text ignored
         """
         self.okButton.setDisabled(
             self.tag1Combo.currentText() != "" or \
@@ -66,12 +67,16 @@
     def on_tag1Combo_editTextChanged(self, text):
         """
         Private slot to handle the tag1Combo editTextChanged signal.
+        
+        @param text text of the combo (string)
         """
         self.__enableOkButton()
         
     def on_tag2Combo_editTextChanged(self, text):
         """
         Private slot to handle the tag2Combo editTextChanged signal.
+        
+        @param text text of the combo (string)
         """
         self.__enableOkButton()