mirror of https://github.com/qt/qtbase.git
dfc2a4a537
It only contained a concatenation of the individual rule sets, probably to fix their order in a central place, as well as simplifying iteration in defaultCategoryFilter(). Fix these two issues differently, but introducing a RuleSet enum that lists rule sets in the order in which they should be applied by defaultCategoryFilter(), and turn individual rule sets vectors into a C array of vectors. This enables two nested loops in defaultCategoryFilter to replace the one loop over 'rules'. Apart from building up 'rules' in updateRules(), this was the only access to that member. That leaves updateRules() with just the task of running defaultCategoryFilter() on the new rule sets. Consequently, a call to updateRules() can now replace the identical loop in installFilter(). Performance should not suffer. Iterating over a fixed-size array of vectors is hardly any slower than iterating over a single vector, and while the construction of 'rules' was probably a one-off task in most programs, this way of keeping the rules also saves memory because rules are not kept in two different vectors. It is also more maintainable, of course. Change-Id: Ibc132d096c8137dd02b034752646212e51208637 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> |
||
|---|---|---|
| bin | ||
| config.tests | ||
| dist | ||
| doc | ||
| examples | ||
| lib | ||
| mkspecs | ||
| qmake | ||
| src | ||
| tests | ||
| util | ||
| .gitattributes | ||
| .gitignore | ||
| .qmake.conf | ||
| .tag | ||
| INSTALL | ||
| LGPL_EXCEPTION.txt | ||
| LICENSE.FDL | ||
| LICENSE.GPL2 | ||
| LICENSE.GPL3 | ||
| LICENSE.GPL3-EXCEPT | ||
| LICENSE.GPLv3 | ||
| LICENSE.LGPL3 | ||
| LICENSE.LGPLv3 | ||
| LICENSE.LGPLv21 | ||
| LICENSE.PREVIEW.COMMERCIAL | ||
| config_help.txt | ||
| configure | ||
| configure.bat | ||
| configure.json | ||
| configure.pri | ||
| header.BSD | ||
| header.BSD-OLD | ||
| header.COMM | ||
| header.FDL | ||
| header.FDL-OLD | ||
| header.GPL | ||
| header.GPL-EXCEPT | ||
| header.LGPL | ||
| header.LGPL-NOGPL2 | ||
| header.LGPL-ONLY | ||
| header.LGPL3 | ||
| header.LGPL3-COMM | ||
| header.LGPL21 | ||
| qtbase.pro | ||
| sync.profile | ||