From 1ed0341ddad1f26bb5a4ad4bf5de823ff5aa5833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 14 Apr 2005 19:06:37 +0000
Subject: [PATCH] no more duplicated traces, better filtering for Qt

---
 mrw/log4cxxconfiguration.cpp | 61 +++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/mrw/log4cxxconfiguration.cpp b/mrw/log4cxxconfiguration.cpp
index 0a42053..3685cfc 100644
--- a/mrw/log4cxxconfiguration.cpp
+++ b/mrw/log4cxxconfiguration.cpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.2  2005/04/14 19:06:37  marc
+    no more duplicated traces, better filtering for Qt
+
     Revision 1.1  2005/04/07 20:57:36  marc
     initial version
 
@@ -55,18 +58,20 @@ namespace mrw {
        -# if no configuration file is found, use default configuration:
           @verbatim
 log4j.rootLogger = DEBUG, A1
-log4j.logger.mrw.fn = DEBUG, A1
-log4j.logger.mrw.fn.log4cxx = OFF, A1
-log4j.logger.mrw.fn.boost = OFF, A1
-log4j.logger.mrw.fn.Thread = OFF, A1
-log4j.logger.mrw.fn.QString = OFF, A1
-log4j.logger.mrw.fn.QShared = OFF, A1
-log4j.logger.mrw.fn.QWidget = OFF, A1
-log4j.logger.mrw.fn.mrw = OFF, A1
-log4j.logger.mrw.fn.std = OFF, A1
-log4j.logger.mrw.fn.new = OFF, A1
-log4j.logger.mrw.fn.CppUnit = OFF, A1
-log4j.logger.mrw.fn.__gnu_cxx = OFF, A1
+log4j.logger.mrw.fn = DEBUG
+log4j.logger.mrw.fn.log4cxx = OFF
+log4j.logger.mrw.fn.boost = OFF
+log4j.logger.mrw.fn.Thread = OFF
+log4j.logger.mrw.fn.QString = OFF
+log4j.logger.mrw.fn.QShared = OFF
+log4j.logger.mrw.fn.QWidget = OFF
+log4j.logger.mrw.fn.QRect = OFF
+log4j.logger.mrw.fn.qstrcmp = OFF
+log4j.logger.mrw.fn.*.qt_cast = OFF
+log4j.logger.mrw.fn.mrw = OFF
+log4j.logger.mrw.fn.std = OFF
+log4j.logger.mrw.fn.CppUnit = OFF
+log4j.logger.mrw.fn.__gnu_cxx = OFF
 log4j.appender.A1 = org.apache.log4j.ConsoleAppender
 log4j.appender.A1.layout = org.apache.log4j.PatternLayout
 @endverbatim
@@ -89,7 +94,7 @@ log4j.appender.A1.layout.ConversionPattern = 60c%m%n
               - disable function trace for @c boost
               - disable function trace for @c Qt base classes
               - disable function trace for @c libmrw
-              - disable function trace for @c std and @c new
+              - disable function trace for @c std
               - disable function trace for @c CppUnit
               - disable function trace for @c gcc internals
       */
@@ -117,29 +122,33 @@ log4j.appender.A1.layout.ConversionPattern = 60c%m%n
         properties.setProperty("log4j.rootLogger",
                                "DEBUG, A1");
         properties.setProperty("log4j.logger.mrw.fn",
-                               "DEBUG, A1");
+                               "DEBUG");
         properties.setProperty("log4j.logger.mrw.fn.log4cxx",
-                               "OFF, A1");
+                               "OFF");
         properties.setProperty("log4j.logger.mrw.fn.boost",
-                               "OFF, A1");
+                               "OFF");
         properties.setProperty("log4j.logger.mrw.fn.Thread",
-                               "OFF, A1");
+                               "OFF");
         properties.setProperty("log4j.logger.mrw.fn.QString",
-                               "OFF, A1");
+                               "OFF");
         properties.setProperty("log4j.logger.mrw.fn.QShared",
-                               "OFF, A1");
+                               "OFF");
         properties.setProperty("log4j.logger.mrw.fn.QWidget",
-                               "OFF, A1");
+                               "OFF");
+        properties.setProperty("log4j.logger.mrw.fn.QRect",
+                               "OFF");
+        properties.setProperty("log4j.logger.mrw.fn.qstrcmp",
+                               "OFF");
+        properties.setProperty("log4j.logger.mrw.fn.*.qt_cast",
+                               "OFF");
         properties.setProperty("log4j.logger.mrw.fn.mrw",
-                               "OFF, A1");
+                               "OFF");
         properties.setProperty("log4j.logger.mrw.fn.std",
-                               "OFF, A1");
-        properties.setProperty("log4j.logger.mrw.fn.new",
-                               "OFF, A1");
+                               "OFF");
         properties.setProperty("log4j.logger.mrw.fn.CppUnit",
-                               "OFF, A1");
+                               "OFF");
         properties.setProperty("log4j.logger.mrw.fn.__gnu_cxx",
-                               "OFF, A1");
+                               "OFF");
         properties.setProperty("log4j.appender.A1",
                                "org.apache.log4j.ConsoleAppender");
         properties.setProperty("log4j.appender.A1.layout",