Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/ConfigurationPages/EditorGeneralPage.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Preferences/ConfigurationPages/EditorGeneralPage.py	Tue Mar 02 17:17:09 2021 +0100
@@ -158,7 +158,7 @@
         overrides = Preferences.getEditor("TabIndentOverride")
         for language, (tabWidth, indentWidth) in overrides.items():
             self.__createOverrideItem(language, tabWidth, indentWidth)
-        self.languageOverrideWidget.sortItems(0, Qt.AscendingOrder)
+        self.languageOverrideWidget.sortItems(0, Qt.SortOrder.AscendingOrder)
         self.__resizeOverrideColumns()
         self.on_languageOverrideWidget_itemSelectionChanged()
     
@@ -177,15 +177,15 @@
             language,
             "{0:2d}".format(tabWidth),
             "{0:2d}".format(indentWidth)])
-        itm.setTextAlignment(1, Qt.AlignHCenter)
-        itm.setTextAlignment(2, Qt.AlignHCenter)
+        itm.setTextAlignment(1, Qt.AlignmentFlag.AlignHCenter)
+        itm.setTextAlignment(2, Qt.AlignmentFlag.AlignHCenter)
         
     def __resizeOverrideColumns(self):
         """
         Private method to resize the list columns.
         """
         self.languageOverrideWidget.header().resizeSections(
-            QHeaderView.ResizeToContents)
+            QHeaderView.ResizeMode.ResizeToContents)
         self.languageOverrideWidget.header().setStretchLastSection(True)
     
     def __saveLanguageOverrides(self):
@@ -229,10 +229,11 @@
             tabWidth=self.tabwidthSlider.value(),
             indentWidth=self.indentwidthSlider.value(),
         )
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             language, tabWidth, indentWidth = dlg.getData()
             self.__createOverrideItem(language, tabWidth, indentWidth)
-            self.languageOverrideWidget.sortItems(0, Qt.AscendingOrder)
+            self.languageOverrideWidget.sortItems(
+                0, Qt.SortOrder.AscendingOrder)
             self.__resizeOverrideColumns()
     
     @pyqtSlot()
@@ -262,7 +263,7 @@
             tabWidth=int(itm.text(1)),
             indentWidth=int(itm.text(2)),
         )
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             language, tabWidth, indentWidth = dlg.getData()
             itm.setText(1, "{0:2d}".format(tabWidth))
             itm.setText(2, "{0:2d}".format(indentWidth))