Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsGit/GitCommitDialog.py	Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitCommitDialog.py	Sun Mar 28 15:00:11 2021 +0200
@@ -34,7 +34,7 @@
         @param parent parent widget (QWidget)
         """
         super(GitCommitDialog, self).__init__(
-            parent, Qt.WindowFlags(Qt.Window))
+            parent, Qt.WindowFlags(Qt.WindowType.Window))
         self.setupUi(self)
         
         self.__vcs = vcs
@@ -58,7 +58,7 @@
                 abbrMsg += "..."
             self.recentComboBox.addItem(abbrMsg, message)
         
-        self.logEdit.setFocus(Qt.OtherFocusReason)
+        self.logEdit.setFocus(Qt.FocusReason.OtherFocusReason)
     
     def logMessage(self):
         """
@@ -109,7 +109,9 @@
         
         @param button button that was clicked (QAbstractButton)
         """
-        if button == self.buttonBox.button(QDialogButtonBox.Cancel):
+        if button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel
+        ):
             self.logEdit.clear()
     
     def on_buttonBox_accepted(self):
@@ -126,12 +128,14 @@
         self.close()
         self.rejected.emit()
     
-    @pyqtSlot(str)
-    def on_recentComboBox_activated(self, txt):
+    @pyqtSlot(int)
+    def on_recentComboBox_activated(self, index):
         """
         Private slot to select a commit message from recent ones.
         
-        @param txt text of the selected entry (string)
+        @param index index of the selected entry
+        @type int
         """
+        txt = self.recentComboBox.itemText(index)
         if txt:
             self.logEdit.setPlainText(self.recentComboBox.currentData())