From 32f27b4367c4e042a3f0cda671579494e31c1d69 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Fri, 27 Sep 2013 13:37:37 +0200
Subject: Replace QLoggingCategory::isEnabled by non-template functions

This yields the same results as previously and is more in line
with existing interfaces.

Change-Id: I0bf0372bf18f3bfde579385cddbe594bf71e3c52
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
 src/corelib/io/qloggingcategory.h | 45 +++++++++------------------------------
 1 file changed, 10 insertions(+), 35 deletions(-)

(limited to 'src/corelib/io/qloggingcategory.h')

diff --git a/src/corelib/io/qloggingcategory.h b/src/corelib/io/qloggingcategory.h
index 70192fef13..35da04c8f2 100644
--- a/src/corelib/io/qloggingcategory.h
+++ b/src/corelib/io/qloggingcategory.h
@@ -59,15 +59,14 @@ public:
     explicit QLoggingCategory(const char *category);
     ~QLoggingCategory();
 
-    template <QtMsgType T>
-    bool isEnabled() const
-    {
-        return isEnabled(T);
-    }
-
     bool isEnabled(QtMsgType type) const;
     void setEnabled(QtMsgType type, bool enable);
 
+    bool isDebugEnabled() const { return enabledDebug; }
+    bool isWarningEnabled() const { return enabledWarning; }
+    bool isCriticalEnabled() const { return enabledCritical; }
+    bool isTraceEnabled() const { return enabledTrace; }
+
     const char *categoryName() const { return name; }
 
     // allows usage of both factory method and variable in qCX macros
@@ -95,30 +94,6 @@ private:
     bool enabledTrace;
 };
 
-template <>
-inline bool QLoggingCategory::isEnabled<QtDebugMsg>() const
-{
-    return enabledDebug;
-}
-
-template <>
-inline bool QLoggingCategory::isEnabled<QtWarningMsg>() const
-{
-    return enabledWarning;
-}
-
-template <>
-inline bool QLoggingCategory::isEnabled<QtCriticalMsg>() const
-{
-    return enabledCritical;
-}
-
-template <>
-inline bool QLoggingCategory::isEnabled<QtTraceMsg>() const
-{
-    return enabledTrace;
-}
-
 class Q_CORE_EXPORT QTracer
 {
     Q_DISABLE_COPY(QTracer)
@@ -141,7 +116,7 @@ class Q_CORE_EXPORT QTraceGuard
 public:
     QTraceGuard(QLoggingCategory &category)
     {
-        target = category.isEnabled<QtTraceMsg>() ? &category : 0;
+        target = category.isTraceEnabled() ? &category : 0;
         if (target)
             start();
     }
@@ -175,16 +150,16 @@ private:
     }
 
 #define qCDebug(category) \
-    for (bool enabled = category().isEnabled<QtDebugMsg>(); enabled; enabled = false) \
+    for (bool enabled = category().isDebugEnabled(); enabled; enabled = false) \
         QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category().categoryName()).debug()
 #define qCWarning(category) \
-    for (bool enabled = category().isEnabled<QtWarningMsg>(); enabled; enabled = false) \
+    for (bool enabled = category().isWarningEnabled(); enabled; enabled = false) \
         QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category().categoryName()).warning()
 #define qCCritical(category) \
-    for (bool enabled = category().isEnabled<QtCriticalMsg>(); enabled; enabled = false) \
+    for (bool enabled = category().isCriticalEnabled(); enabled; enabled = false) \
         QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category().categoryName()).critical()
 #define qCTrace(category) \
-    for (bool enabled = category.isEnabled<QtTraceMsg>(); enabled; enabled = false) \
+    for (bool enabled = category.isTraceEnabled(); enabled; enabled = false) \
         QTraceGuard(category)
 
 
-- 
cgit v1.2.3