Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/Feeds/FeedsManager.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/Feeds/FeedsManager.py	Tue Mar 02 17:17:09 2021 +0100
@@ -38,8 +38,8 @@
     newWindow = pyqtSignal(QUrl, str)
     newPrivateWindow = pyqtSignal(QUrl, str)
     
-    UrlStringRole = Qt.UserRole
-    ErrorDataRole = Qt.UserRole + 1
+    UrlStringRole = Qt.ItemDataRole.UserRole
+    ErrorDataRole = Qt.ItemDataRole.UserRole + 1
     
     def __init__(self, parent=None):
         """
@@ -49,7 +49,7 @@
         """
         super(FeedsManager, self).__init__(parent)
         self.setupUi(self)
-        self.setWindowFlags(Qt.Window)
+        self.setWindowFlags(Qt.WindowType.Window)
         
         self.__wasShown = False
         self.__loaded = False
@@ -58,7 +58,8 @@
         # dict key is the id of the request object
         # dict value is a tuple of request and tree item
         
-        self.feedsTree.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.feedsTree.setContextMenuPolicy(
+            Qt.ContextMenuPolicy.CustomContextMenu)
         self.feedsTree.customContextMenuRequested.connect(
             self.__customContextMenuRequested)
         self.feedsTree.itemActivated.connect(self.__itemActivated)
@@ -175,7 +176,7 @@
             
             from .FeedEditDialog import FeedEditDialog
             dlg = FeedEditDialog(origUrlString, origTitle)
-            if dlg.exec() == QDialog.Accepted:
+            if dlg.exec() == QDialog.DialogCode.Accepted:
                 urlString, title = dlg.getData()
                 for feed in self.__feeds:
                     if feed[0] == urlString:
@@ -280,7 +281,7 @@
         topItem = self.__replies[id(reply)][1]
         del self.__replies[id(reply)]
         
-        if reply.error() == QNetworkReply.NoError:
+        if reply.error() == QNetworkReply.NetworkError.NoError:
             linkString = ""
             titleString = ""
             
@@ -377,9 +378,15 @@
         if self.feedsTree.indexOfTopLevelItem(itm) != -1:
             return
         
-        if QApplication.keyboardModifiers() & Qt.ControlModifier:
+        if (
+            QApplication.keyboardModifiers() &
+            Qt.KeyboardModifier.ControlModifier
+        ):
             self.__openMessageInNewTab()
-        elif QApplication.keyboardModifiers() & Qt.ShiftModifier:
+        elif (
+            QApplication.keyboardModifiers() &
+            Qt.KeyboardModifier.ShiftModifier
+        ):
             self.__openMessageInNewWindow()
         else:
             self.__openMessageInCurrentTab()