Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/QtHelp/HelpIndexWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/QtHelp/HelpIndexWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -55,7 +55,8 @@
         self.__layout.addWidget(self.__searchEdit)
         
         self.__index = self.__engine.indexWidget()
-        self.__index.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.__index.setContextMenuPolicy(
+            Qt.ContextMenuPolicy.CustomContextMenu)
         
         self.__engine.indexModel().indexCreationStarted.connect(
             self.__disableSearchEdit)
@@ -85,13 +86,18 @@
             modifiers = QApplication.keyboardModifiers()
         if not url.isEmpty() and url.isValid():
             if (
-                modifiers & (Qt.ControlModifier | Qt.ShiftModifier) ==
-                    (Qt.ControlModifier | Qt.ShiftModifier)
+                modifiers & (
+                    Qt.KeyboardModifier.ControlModifier |
+                    Qt.KeyboardModifier.ShiftModifier
+                ) == (
+                    Qt.KeyboardModifier.ControlModifier |
+                    Qt.KeyboardModifier.ShiftModifier
+                )
             ):
                 self.newBackgroundTab.emit(url)
-            elif modifiers & Qt.ControlModifier:
+            elif modifiers & Qt.KeyboardModifier.ControlModifier:
                 self.newTab.emit(url)
-            elif modifiers & Qt.ShiftModifier:
+            elif modifiers & Qt.KeyboardModifier.ShiftModifier:
                 self.newWindow.emit(url)
             else:
                 self.openUrl.emit(url)
@@ -127,7 +133,7 @@
         link = QUrl()
         from .HelpTopicDialog import HelpTopicDialog
         dlg = HelpTopicDialog(self, keyword, links)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             link = dlg.link()
         return link
     
@@ -161,7 +167,7 @@
         
         @param evt reference to the focus event object (QFocusEvent)
         """
-        if evt.reason() != Qt.MouseFocusReason:
+        if evt.reason() != Qt.FocusReason.MouseFocusReason:
             self.__searchEdit.selectAll()
             self.__searchEdit.setFocus()
     
@@ -175,20 +181,20 @@
         """
         if (
             self.__searchEdit and watched == self.__searchEdit and
-            event.type() == QEvent.KeyPress
+            event.type() == QEvent.Type.KeyPress
         ):
             idx = self.__index.currentIndex()
-            if event.key() == Qt.Key_Up:
+            if event.key() == Qt.Key.Key_Up:
                 idx = self.__index.model().index(
                     idx.row() - 1, idx.column(), idx.parent())
                 if idx.isValid():
                     self.__index.setCurrentIndex(idx)
-            elif event.key() == Qt.Key_Down:
+            elif event.key() == Qt.Key.Key_Down:
                 idx = self.__index.model().index(
                     idx.row() + 1, idx.column(), idx.parent())
                 if idx.isValid():
                     self.__index.setCurrentIndex(idx)
-            elif event.key() == Qt.Key_Escape:
+            elif event.key() == Qt.Key.Key_Escape:
                 self.escapePressed.emit()
         
         return QWidget.eventFilter(self, watched, event)
@@ -212,7 +218,7 @@
             act = menu.exec()
             model = self.__index.model()
             if model is not None:
-                keyword = model.data(idx, Qt.DisplayRole)
+                keyword = model.data(idx, Qt.ItemDataRole.DisplayRole)
                 links = model.linksForKeyword(keyword)
                 if len(links) == 1:
                     link = QUrl(links[list(links.keys())[0]])