Mercurial Repositories > eric / file diff

diff -r b047181a4a33 -r 1950fe1a32c4 WebBrowser/QtHelp/QtHelpFiltersDialog.py
--- a/WebBrowser/QtHelp/QtHelpFiltersDialog.py	Sat Mar 11 18:08:42 2017 +0100
+++ b/WebBrowser/QtHelp/QtHelpFiltersDialog.py	Sat Mar 11 19:17:59 2017 +0100
@@ -43,22 +43,22 @@
         self.filtersList.clear()
         self.attributesList.clear()
         
-        help = QHelpEngineCore(self.__engine.collectionFile())
-        help.setupData()
+        helpEngineCore = QHelpEngineCore(self.__engine.collectionFile())
+        helpEngineCore.setupData()
         
         self.__removedFilters = []
         self.__filterMap = {}
         self.__filterMapBackup = {}
         self.__removedAttributes = []
         
-        for filter in help.customFilters():
-            atts = help.filterAttributes(filter)
-            self.__filterMapBackup[filter] = atts
-            if filter not in self.__filterMap:
-                self.__filterMap[filter] = atts
+        for customFilter in helpEngineCore.customFilters():
+            atts = helpEngineCore.filterAttributes(customFilter)
+            self.__filterMapBackup[customFilter] = atts
+            if customFilter not in self.__filterMap:
+                self.__filterMap[customFilter] = atts
         
         self.filtersList.addItems(sorted(self.__filterMap.keys()))
-        for attr in help.filterAttributes():
+        for attr in helpEngineCore.filterAttributes():
             QTreeWidgetItem(self.attributesList, [attr])
         self.attributesList.sortItems(0, Qt.AscendingOrder)
         
@@ -103,8 +103,8 @@
         if self.filtersList.currentItem() is None:
             return
         
-        filter = self.filtersList.currentItem().text()
-        if filter not in self.__filterMap:
+        customFilter = self.filtersList.currentItem().text()
+        if customFilter not in self.__filterMap:
             return
         
         newAtts = []
@@ -112,7 +112,7 @@
             itm = self.attributesList.topLevelItem(index)
             if itm.checkState(0) == Qt.Checked:
                 newAtts.append(itm.text(0))
-        self.__filterMap[filter] = newAtts
+        self.__filterMap[customFilter] = newAtts
     
     @pyqtSlot()
     def on_attributesList_itemSelectionChanged(self):
@@ -127,19 +127,20 @@
         """
         Private slot to add a new filter.
         """
-        filter, ok = QInputDialog.getText(
+        customFilter, ok = QInputDialog.getText(
             None,
             self.tr("Add Filter"),
             self.tr("Filter name:"),
             QLineEdit.Normal)
-        if not filter:
+        if not customFilter:
             return
         
-        if filter not in self.__filterMap:
-            self.__filterMap[filter] = []
-            self.filtersList.addItem(filter)
+        if customFilter not in self.__filterMap:
+            self.__filterMap[customFilter] = []
+            self.filtersList.addItem(customFilter)
         
-        itm = self.filtersList.findItems(filter, Qt.MatchCaseSensitive)[0]
+        itm = self.filtersList.findItems(
+            customFilter, Qt.MatchCaseSensitive)[0]
         self.filtersList.setCurrentItem(itm)
     
     @pyqtSlot()
@@ -193,9 +194,9 @@
             
             attr = itm.text(0)
             self.__removedAttributes.append(attr)
-            for filter in self.__filterMap:
-                if attr in self.__filterMap[filter]:
-                    self.__filterMap[filter].remove(attr)
+            for customFilter in self.__filterMap:
+                if attr in self.__filterMap[customFilter]:
+                    self.__filterMap[customFilter].remove(attr)
             
             del itm
     
@@ -206,8 +207,8 @@
         """
         # step 1: determine all used attributes
         attributes = set()
-        for filter in self.__filterMap:
-            attributes |= set(self.__filterMap[filter])
+        for customFilter in self.__filterMap:
+            attributes |= set(self.__filterMap[customFilter])
         
         # step 2: select all unused attribute items
         self.attributesList.clearSelection()
@@ -241,12 +242,12 @@
         if len(self.__filterMapBackup) != len(self.__filterMap):
             filtersChanged = True
         else:
-            for filter in self.__filterMapBackup:
-                if filter not in self.__filterMap:
+            for customFilter in self.__filterMapBackup:
+                if customFilter not in self.__filterMap:
                     filtersChanged = True
                 else:
-                    oldFilterAtts = self.__filterMapBackup[filter]
-                    newFilterAtts = self.__filterMap[filter]
+                    oldFilterAtts = self.__filterMapBackup[customFilter]
+                    newFilterAtts = self.__filterMap[customFilter]
                     if len(oldFilterAtts) != len(newFilterAtts):
                         filtersChanged = True
                     else:
@@ -259,10 +260,11 @@
                     break
         
         if filtersChanged:
-            for filter in self.__removedFilters:
-                self.__engine.removeCustomFilter(filter)
-            for filter in self.__filterMap:
-                self.__engine.addCustomFilter(filter, self.__filterMap[filter])
+            for customFilter in self.__removedFilters:
+                self.__engine.removeCustomFilter(customFilter)
+            for customFilter in self.__filterMap:
+                self.__engine.addCustomFilter(
+                    customFilter, self.__filterMap[customFilter])
         
         if self.__removedAttributes:
             self.__removeAttributes()