Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsGit/GitPushDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitPushDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -57,14 +57,15 @@
             itm = QTreeWidgetItem(self.branchesTree, ["", localBranch, "", ""])
             combo = QComboBox()
             combo.setEditable(True)
-            combo.setSizeAdjustPolicy(QComboBox.AdjustToContents)
+            combo.setSizeAdjustPolicy(
+                QComboBox.SizeAdjustPolicy.AdjustToContents)
             self.branchesTree.setItemWidget(
                 itm, GitPushDialog.RemoteBranchColumn, combo)
         
         self.__resizeColumns()
         
         self.branchesTree.header().setSortIndicator(
-            GitPushDialog.LocalBranchColumn, Qt.AscendingOrder)
+            GitPushDialog.LocalBranchColumn, Qt.SortOrder.AscendingOrder)
         
         self.forceWarningLabel.setVisible(False)
         
@@ -99,10 +100,13 @@
             index = combo.findText(localBranch)
             if index != -1:
                 combo.setCurrentIndex(index)
-                itm.setCheckState(GitPushDialog.PushColumn, Qt.Checked)
+                itm.setCheckState(GitPushDialog.PushColumn,
+                                  Qt.CheckState.Checked)
             else:
-                itm.setCheckState(GitPushDialog.PushColumn, Qt.Unchecked)
-            itm.setCheckState(GitPushDialog.ForceColumn, Qt.Unchecked)
+                itm.setCheckState(GitPushDialog.PushColumn,
+                                  Qt.CheckState.Unchecked)
+            itm.setCheckState(GitPushDialog.ForceColumn,
+                              Qt.CheckState.Unchecked)
         
         self.__resizeColumns()
     
@@ -117,7 +121,8 @@
         if column == GitPushDialog.PushColumn:
             # step 1: set the item's remote branch, if it is empty
             if (
-                item.checkState(GitPushDialog.PushColumn) == Qt.Checked and
+                item.checkState(GitPushDialog.PushColumn) ==
+                Qt.CheckState.Checked and
                 (self.branchesTree.itemWidget(
                     item,
                     GitPushDialog.RemoteBranchColumn
@@ -131,20 +136,27 @@
             checkedItemsCount = 0
             for row in range(self.branchesTree.topLevelItemCount()):
                 itm = self.branchesTree.topLevelItem(row)
-                if itm.checkState(GitPushDialog.PushColumn) == Qt.Checked:
+                if (
+                    itm.checkState(GitPushDialog.PushColumn) ==
+                    Qt.CheckState.Checked
+                ):
                     checkedItemsCount += 1
             if checkedItemsCount == len(self.__localBranches):
-                self.selectAllCheckBox.setCheckState(Qt.Checked)
+                self.selectAllCheckBox.setCheckState(Qt.CheckState.Checked)
             elif checkedItemsCount == 0:
-                self.selectAllCheckBox.setCheckState(Qt.Unchecked)
+                self.selectAllCheckBox.setCheckState(Qt.CheckState.Unchecked)
             else:
-                self.selectAllCheckBox.setCheckState(Qt.PartiallyChecked)
+                self.selectAllCheckBox.setCheckState(
+                    Qt.CheckState.PartiallyChecked)
         
         elif column == GitPushDialog.ForceColumn:
             forceItemsCount = 0
             for row in range(self.branchesTree.topLevelItemCount()):
                 itm = self.branchesTree.topLevelItem(row)
-                if itm.checkState(GitPushDialog.ForceColumn) == Qt.Checked:
+                if (
+                    itm.checkState(GitPushDialog.ForceColumn) ==
+                    Qt.CheckState.Checked
+                ):
                     forceItemsCount += 1
             self.forceWarningLabel.setVisible(forceItemsCount > 0)
     
@@ -155,7 +167,7 @@
         
         @param state check state of the check box (Qt.CheckState)
         """
-        if state != Qt.PartiallyChecked:
+        if state != Qt.CheckState.PartiallyChecked:
             for row in range(self.branchesTree.topLevelItemCount()):
                 itm = self.branchesTree.topLevelItem(row)
                 if itm.checkState(GitPushDialog.PushColumn) != state:
@@ -173,8 +185,14 @@
         refspecs = []
         for row in range(self.branchesTree.topLevelItemCount()):
             itm = self.branchesTree.topLevelItem(row)
-            force = itm.checkState(GitPushDialog.ForceColumn) == Qt.Checked
-            if itm.checkState(GitPushDialog.PushColumn) == Qt.Checked:
+            force = (
+                itm.checkState(GitPushDialog.ForceColumn) ==
+                Qt.CheckState.Checked
+            )
+            if (
+                itm.checkState(GitPushDialog.PushColumn) ==
+                Qt.CheckState.Checked
+            ):
                 localBranch = itm.text(GitPushDialog.LocalBranchColumn)
                 remoteBranch = self.branchesTree.itemWidget(
                     itm, GitPushDialog.RemoteBranchColumn).currentText()