From e979f8721731bc5f4cd0d65830548f9e70da2da5 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 26 Dec 2015 03:38:25 +0100 Subject: QLoggingRegistry: don't iterate over QHash::keys() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... but use the new key_iterators instead. Saves creating a temporary QList just to iterate over it and ~1.3KiB in text size on optimized GCC 4.9 Linux AMD64 builds. Change-Id: Id5223fc5fcb4a4e7c012718c1bb2674b8ea0439d Reviewed-by: Sérgio Martins --- src/corelib/io/qloggingregistry.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp index b53e251102..a12eab5a87 100644 --- a/src/corelib/io/qloggingregistry.cpp +++ b/src/corelib/io/qloggingregistry.cpp @@ -364,8 +364,8 @@ void QLoggingRegistry::updateRules() rules = qtConfigRules + configRules + apiRules + envRules; - foreach (QLoggingCategory *cat, categories.keys()) - (*categoryFilter)(cat); + for (auto it = categories.keyBegin(), end = categories.keyEnd(); it != end; ++it) + (*categoryFilter)(*it); } /*! @@ -383,8 +383,8 @@ QLoggingRegistry::installFilter(QLoggingCategory::CategoryFilter filter) QLoggingCategory::CategoryFilter old = categoryFilter; categoryFilter = filter; - foreach (QLoggingCategory *cat, categories.keys()) - (*categoryFilter)(cat); + for (auto it = categories.keyBegin(), end = categories.keyEnd(); it != end; ++it) + (*categoryFilter)(*it); return old; } -- cgit v1.2.3