From aba180b466ac4839bf06ebcc4ed373ae8428db71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Mon, 26 Nov 2007 17:17:45 +0000
Subject: [PATCH] kdebug no longer relies on NDEBUG

svn path=/trunk/KDE/kdebase/workspace/; revision=741888
---
 rules.cpp         | 2 --
 rules.h           | 5 -----
 scene_xrender.cpp | 5 -----
 toplevel.cpp      | 2 --
 toplevel.h        | 9 ---------
 5 files changed, 23 deletions(-)

diff --git a/rules.cpp b/rules.cpp
index dd43dd2193..2b01e3e701 100644
--- a/rules.cpp
+++ b/rules.cpp
@@ -673,12 +673,10 @@ void Rules::discardUsed( bool withdrawn )
 
 #endif
 
-#ifndef NDEBUG
 kdbgstream& operator<<( kdbgstream& stream, const Rules* r )
     {
     return stream << "[" << r->description << ":" << r->wmclass << "]" ;
     }
-#endif
 
 #ifndef KCMRULES
 void WindowRules::discardTemporary()
diff --git a/rules.h b/rules.h
index 9bfcd8386a..35eb49a7a6 100644
--- a/rules.h
+++ b/rules.h
@@ -299,12 +299,7 @@ void WindowRules::remove( Rules* rule )
 
 #endif
 
-#ifdef NDEBUG
-inline
-kndbgstream& operator<<( kndbgstream& stream, const Rules* ) { return stream; }
-#else
 kdbgstream& operator<<( kdbgstream& stream, const Rules* );
-#endif
 
 } // namespace
 
diff --git a/scene_xrender.cpp b/scene_xrender.cpp
index 0b37b85cb9..56a68882a4 100644
--- a/scene_xrender.cpp
+++ b/scene_xrender.cpp
@@ -52,10 +52,6 @@ struct RegionDebug
    XserverRegion rr;   
    };   
 
-#ifdef NDEBUG
-inline
-kndbgstream& operator<<( kndbgstream& stream, RegionDebug ) { return stream; }
-#else
 kdbgstream& operator<<( kdbgstream& stream, RegionDebug r )
     {       
     if( r.rr == None )
@@ -70,7 +66,6 @@ kdbgstream& operator<<( kdbgstream& stream, RegionDebug r )
        stream << "[" << rects[ i ].x << "+" << rects[ i ].y << " " << rects[ i ].width << "x" << rects[ i ].height << "]";
     return stream;
     }
-#endif
 
 Picture SceneXrender::buffer = None;
 ScreenPaintData SceneXrender::screen_paint;
diff --git a/toplevel.cpp b/toplevel.cpp
index 5860a8c343..0bcec698fc 100644
--- a/toplevel.cpp
+++ b/toplevel.cpp
@@ -45,7 +45,6 @@ Toplevel::~Toplevel()
     delete info;
     }
 
-#ifndef NDEBUG
 kdbgstream& operator<<( kdbgstream& stream, const Toplevel* cl )
     {
     if( cl == NULL )
@@ -87,7 +86,6 @@ kdbgstream& operator<<( kdbgstream& stream, const ConstToplevelList& list )
     stream << ")";
     return stream;
     }
-#endif
 
 void Toplevel::detectShape( Window id )
     {
diff --git a/toplevel.h b/toplevel.h
index d9bf7e4cbf..fe45a74e3b 100644
--- a/toplevel.h
+++ b/toplevel.h
@@ -382,18 +382,9 @@ inline pid_t Toplevel::pid() const
     return info->pid();
     }
 
-#ifdef NDEBUG
-inline
-kndbgstream& operator<<( kndbgstream& stream, const Toplevel* ) { return stream; }
-inline
-kndbgstream& operator<<( kndbgstream& stream, const ToplevelList& ) { return stream; }
-inline
-kndbgstream& operator<<( kndbgstream& stream, const ConstToplevelList& ) { return stream; }
-#else
 kdbgstream& operator<<( kdbgstream& stream, const Toplevel* );
 kdbgstream& operator<<( kdbgstream& stream, const ToplevelList& );
 kdbgstream& operator<<( kdbgstream& stream, const ConstToplevelList& );
-#endif
 
 KWIN_COMPARE_PREDICATE( WindowMatchPredicate, Toplevel, Window, cl->window() == value );
 KWIN_COMPARE_PREDICATE( FrameIdMatchPredicate, Toplevel, Window, cl->frameId() == value );