Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -429,7 +429,7 @@
                                 host,
                                 self.__minimumProtocols[protocol]
                             ])
-                            itm.setData(1, Qt.UserRole, protocol)
+                            itm.setData(1, Qt.ItemDataRole.UserRole, protocol)
             
             self.__finalizeFingerprintsColumns()
             self.__finalizeProtocolsColumns()
@@ -523,7 +523,7 @@
         Private slot to add a fingerprints entry.
         """
         dlg = HgUserConfigHostFingerprintDialog(self, version=self.__version)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             host, fingerprint = dlg.getData()
             itm = QTreeWidgetItem(self.fingerprintsList, [host, fingerprint])
             self.__finalizeFingerprintsColumns()
@@ -560,7 +560,7 @@
             fingerprint = itm.text(1)
             dlg = HgUserConfigHostFingerprintDialog(self, host, fingerprint,
                                                     version=self.__version)
-            if dlg.exec() == QDialog.Accepted:
+            if dlg.exec() == QDialog.DialogCode.Accepted:
                 host, fingerprint = dlg.getData()
                 itm.setText(0, host)
                 itm.setText(1, fingerprint)
@@ -573,7 +573,7 @@
         """
         for col in range(self.fingerprintsList.columnCount()):
             self.fingerprintsList.resizeColumnToContents(col)
-        self.fingerprintsList.sortItems(0, Qt.AscendingOrder)
+        self.fingerprintsList.sortItems(0, Qt.SortOrder.AscendingOrder)
     
     def __updateFingerprintsButtons(self):
         """
@@ -608,7 +608,7 @@
         for row in range(self.protocolsList.topLevelItemCount()):
             itm = self.protocolsList.topLevelItem(row)
             host = itm.text(0)
-            minimumProtocol = itm.data(1, Qt.UserRole)
+            minimumProtocol = itm.data(1, Qt.ItemDataRole.UserRole)
             minimumProtocols[host] = minimumProtocol
         return minimumProtocols
     
@@ -631,13 +631,13 @@
         """
         dlg = HgUserConfigHostMinimumProtocolDialog(self.__minimumProtocols,
                                                     self)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             host, protocol = dlg.getData()
             itm = QTreeWidgetItem(self.protocolsList, [
                 host,
                 self.__minimumProtocols[protocol]
             ])
-            itm.setData(1, Qt.UserRole, protocol)
+            itm.setData(1, Qt.ItemDataRole.UserRole, protocol)
             self.__finalizeProtocolsColumns()
             self.protocolsList.setCurrentItem(itm)
             self.protocolsList.scrollToItem(itm)
@@ -669,14 +669,14 @@
         itm = self.protocolsList.currentItem()
         if itm is not None:
             host = itm.text(0)
-            protocol = itm.data(1, Qt.UserRole)
+            protocol = itm.data(1, Qt.ItemDataRole.UserRole)
             dlg = HgUserConfigHostMinimumProtocolDialog(
                 self.__minimumProtocols, self, host, protocol)
-            if dlg.exec() == QDialog.Accepted:
+            if dlg.exec() == QDialog.DialogCode.Accepted:
                 host, protocol = dlg.getData()
                 itm.setText(0, host)
                 itm.setText(1, self.__minimumProtocols[protocol])
-                itm.setData(1, Qt.UserRole, protocol)
+                itm.setData(1, Qt.ItemDataRole.UserRole, protocol)
                 self.__finalizeProtocolsColumns()
                 self.protocolsList.scrollToItem(itm)
     
@@ -686,7 +686,7 @@
         """
         for col in range(self.protocolsList.columnCount()):
             self.protocolsList.resizeColumnToContents(col)
-        self.protocolsList.sortItems(0, Qt.AscendingOrder)
+        self.protocolsList.sortItems(0, Qt.SortOrder.AscendingOrder)
     
     def __updateProtocolsButtons(self):
         """
@@ -719,7 +719,7 @@
             self.writeUserConfig()
         
         self.__editor = MiniEditor(cfgFile, "Properties", self)
-        self.__editor.setWindowModality(Qt.WindowModal)
+        self.__editor.setWindowModality(Qt.WindowModality.WindowModal)
         self.__editor.installEventFilter(self)
         self.__editor.show()
     
@@ -734,7 +734,7 @@
         @return flag indicating, if we handled the event
         @rtype bool
         """
-        if watched is self.__editor and event.type() == QEvent.Close:
+        if watched is self.__editor and event.type() == QEvent.Type.Close:
             self.__editor.closeEvent(event)
             if event.isAccepted():
                 self.__clearDialog()