Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/OpenSearch/OpenSearchEngineModel.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/OpenSearch/OpenSearchEngineModel.py	Tue Mar 02 17:17:09 2021 +0100
@@ -98,9 +98,16 @@
         @return flags (Qt.ItemFlags)
         """
         if index.column() == 1:
-            return Qt.ItemIsEnabled | Qt.ItemIsSelectable | Qt.ItemIsEditable
+            return (
+                Qt.ItemFlag.ItemIsEnabled |
+                Qt.ItemFlag.ItemIsSelectable |
+                Qt.ItemFlag.ItemIsEditable
+            )
         else:
-            return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+            return (
+                Qt.ItemFlag.ItemIsEnabled |
+                Qt.ItemFlag.ItemIsSelectable
+            )
     
     def data(self, index, role):
         """
@@ -120,10 +127,10 @@
             return None
         
         if index.column() == 0:
-            if role == Qt.DisplayRole:
+            if role == Qt.ItemDataRole.DisplayRole:
                 return engine.name()
                 
-            elif role == Qt.DecorationRole:
+            elif role == Qt.ItemDataRole.DecorationRole:
                 image = engine.image()
                 if image.isNull():
                     from WebBrowser.WebBrowserWindow import WebBrowserWindow
@@ -132,7 +139,7 @@
                     icon = QIcon(QPixmap.fromImage(image))
                 return icon
                 
-            elif role == Qt.ToolTipRole:
+            elif role == Qt.ItemDataRole.ToolTipRole:
                 description = self.tr(
                     "<strong>Description:</strong> {0}"
                 ).format(engine.description())
@@ -143,9 +150,9 @@
                 
                 return description
         elif index.column() == 1:
-            if role in [Qt.EditRole, Qt.DisplayRole]:
+            if role in [Qt.ItemDataRole.EditRole, Qt.ItemDataRole.DisplayRole]:
                 return ",".join(self.__manager.keywordsForEngine(engine))
-            elif role == Qt.ToolTipRole:
+            elif role == Qt.ItemDataRole.ToolTipRole:
                 return self.tr(
                     "Comma-separated list of keywords that may"
                     " be entered in the location bar followed by search terms"
@@ -153,7 +160,7 @@
         
         return None
     
-    def setData(self, index, value, role=Qt.EditRole):
+    def setData(self, index, value, role=Qt.ItemDataRole.EditRole):
         """
         Public method to set the data of a model cell.
         
@@ -168,7 +175,7 @@
         if index.row() >= self.rowCount() or index.row() < 0:
             return False
         
-        if role != Qt.EditRole:
+        if role != Qt.ItemDataRole.EditRole:
             return False
         
         engineName = self.__manager.allEnginesNames()[index.row()]
@@ -178,16 +185,20 @@
         
         return True
     
-    def headerData(self, section, orientation, role=Qt.DisplayRole):
+    def headerData(self, section, orientation,
+                   role=Qt.ItemDataRole.DisplayRole):
         """
         Public method to get the header data.
         
         @param section section number (integer)
         @param orientation header orientation (Qt.Orientation)
-        @param role data role (integer)
+        @param role data role (Qt.ItemDataRole)
         @return header data
         """
-        if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+        if (
+            orientation == Qt.Orientation.Horizontal and
+            role == Qt.ItemDataRole.DisplayRole
+        ):
             try:
                 return self.__headers[section]
             except IndexError: