Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/History/HistoryModel.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/History/HistoryModel.py	Tue Mar 02 17:17:09 2021 +0100
@@ -16,12 +16,12 @@
     """
     Class implementing the history model.
     """
-    DateRole = Qt.UserRole + 1
-    DateTimeRole = Qt.UserRole + 2
-    UrlRole = Qt.UserRole + 3
-    UrlStringRole = Qt.UserRole + 4
-    TitleRole = Qt.UserRole + 5
-    VisitCountRole = Qt.UserRole + 6
+    DateRole = Qt.ItemDataRole.UserRole + 1
+    DateTimeRole = Qt.ItemDataRole.UserRole + 2
+    UrlRole = Qt.ItemDataRole.UserRole + 3
+    UrlStringRole = Qt.ItemDataRole.UserRole + 4
+    TitleRole = Qt.ItemDataRole.UserRole + 5
+    VisitCountRole = Qt.ItemDataRole.UserRole + 6
     MaxRole = VisitCountRole
     
     def __init__(self, historyManager, parent=None):
@@ -70,23 +70,27 @@
         idx = self.index(row, 0)
         self.dataChanged.emit(idx, idx)
     
-    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:
                 pass
         return QAbstractTableModel.headerData(self, section, orientation, role)
     
-    def data(self, index, role=Qt.DisplayRole):
+    def data(self, index, role=Qt.ItemDataRole.DisplayRole):
         """
         Public method to get data from the model.
         
@@ -111,14 +115,14 @@
             return itm.userTitle()
         elif role == self.VisitCountRole:
             return itm.visitCount
-        elif role in [Qt.DisplayRole, Qt.EditRole]:
+        elif role in [Qt.ItemDataRole.DisplayRole, Qt.ItemDataRole.EditRole]:
             if index.column() == 0:
                 return itm.userTitle()
             elif index.column() == 1:
                 return itm.url
             elif index.column() == 2:
                 return itm.visitCount
-        elif role == Qt.DecorationRole:
+        elif role == Qt.ItemDataRole.DecorationRole:
             if index.column() == 0:
                 return WebBrowser.WebBrowserWindow.WebBrowserWindow.icon(
                     QUrl(itm.url))