From 4549e84e05f0112ce1ce468b38f7d7c310ab728c Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sat, 11 Oct 2014 23:59:11 +0100 Subject: [PATCH] refs #336 Renaming. --- src/blackmisc/loghandler.cpp | 12 ++++++------ src/blackmisc/loghandler.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blackmisc/loghandler.cpp b/src/blackmisc/loghandler.cpp index 7e0a0ce2f..bfb36eb7c 100644 --- a/src/blackmisc/loghandler.cpp +++ b/src/blackmisc/loghandler.cpp @@ -46,20 +46,20 @@ namespace BlackMisc } } - CLogCategoryHandler *CLogHandler::handlerForCategory(const QString &category) + CLogCategoryHandler *CLogHandler::handlerForCategoryPrefix(const QString &category) { - if (! m_categoryHandlers.contains(category)) + if (! m_categoryPrefixHandlers.contains(category)) { - m_categoryHandlers[category] = new CLogCategoryHandler(this, m_enableFallThrough); + m_categoryPrefixHandlers[category] = new CLogCategoryHandler(this, m_enableFallThrough); } - return m_categoryHandlers[category]; + return m_categoryPrefixHandlers[category]; } QList CLogHandler::handlersForCategory(const QString &category) const { QList m_handlers; - for (auto i = m_categoryHandlers.begin(); i != m_categoryHandlers.end(); ++i) + for (auto i = m_categoryPrefixHandlers.begin(); i != m_categoryPrefixHandlers.end(); ++i) { if (category.startsWith(i.key())) { @@ -72,7 +72,7 @@ namespace BlackMisc void CLogHandler::enableConsoleOutput(bool enable) { m_enableFallThrough = enable; - for (auto *handler : m_categoryHandlers.values()) + for (auto *handler : m_categoryPrefixHandlers.values()) { handler->enableConsoleOutput(enable); } diff --git a/src/blackmisc/loghandler.h b/src/blackmisc/loghandler.h index 150d01af1..ecb4c15d6 100644 --- a/src/blackmisc/loghandler.h +++ b/src/blackmisc/loghandler.h @@ -41,8 +41,8 @@ namespace BlackMisc //! Tell the CLogHandler to install itself with qInstallMessageHandler. void install(); - //! Return a category handler for subscribing to all messages whose category string starts with the given prefix. - CLogCategoryHandler *handlerForCategory(const QString &prefix); + //! Return a category handler for subscribing to all messages with a category starting with the given prefix. + CLogCategoryHandler *handlerForCategoryPrefix(const QString &prefix); //! Enable or disable the default Qt handler. void enableConsoleOutput(bool enable); @@ -66,7 +66,7 @@ namespace BlackMisc QtMessageHandler m_oldHandler = nullptr; bool m_enableFallThrough = true; bool isFallThroughEnabled(const QList &handlers) const; - QMap m_categoryHandlers; + QMap m_categoryPrefixHandlers; QList handlersForCategory(const QString &category) const; };