Mercurial Repositories > eric / file diff

--- a/eric7/WebBrowser/QtHelp/QtHelpDocumentationDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/WebBrowser/QtHelp/QtHelpDocumentationDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -10,11 +10,11 @@
 import sqlite3
 import contextlib
 
-from PyQt5.QtCore import pyqtSlot, Qt, QItemSelectionModel
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QItemSelectionModel
+from PyQt6.QtWidgets import (
     QDialog, QTreeWidgetItem, QListWidgetItem, QInputDialog, QLineEdit
 )
-from PyQt5.QtHelp import QHelpEngineCore
+from PyQt6.QtHelp import QHelpEngineCore
 
 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5Application import e5App
@@ -282,20 +282,22 @@
         self.attributesList.clear()
         
         helpEngineCore = QHelpEngineCore(self.__engine.collectionFile())
+        helpFilterEngine = helpEngineCore.filterEngine()
         
         self.__removedFilters = []
         self.__filterMap = {}
         self.__filterMapBackup = {}
         self.__removedAttributes = []
         
-        for customFilter in helpEngineCore.customFilters():
-            atts = helpEngineCore.filterAttributes(customFilter)
-            self.__filterMapBackup[customFilter] = atts
-            if customFilter not in self.__filterMap:
-                self.__filterMap[customFilter] = atts
+        for filterName in helpFilterEngine.filters():
+            filterData = helpFilterEngine.filterData(filterName)
+            self.__filterMapBackup[filterName] = filterData
+            if filterName not in self.__filterMap:
+                self.__filterMap[filterName] = filterData
         
+        # TODO: change code to use QHelpFilterEngine and QHelpFilterData
         self.filtersList.addItems(sorted(self.__filterMap.keys()))
-        for attr in helpEngineCore.filterAttributes():
+        for attr in helpFilterEngine.filterData():
             QTreeWidgetItem(self.attributesList, [attr])
         self.attributesList.sortItems(0, Qt.SortOrder.AscendingOrder)
         
@@ -497,7 +499,7 @@
             for customFilter in self.__removedFilters:
                 self.__engine.removeCustomFilter(customFilter)
             for customFilter in self.__filterMap:
-                self.__engine.addCustomFilter(
+                self.__engine.addFilterData(
                     customFilter, self.__filterMap[customFilter])
         
         if self.__removedAttributes: