yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kdebug no longer relies on NDEBUG

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=741888
This commit is contained in:
Luboš Luňák 2007-11-26 17:17:45 +00:00
parent 74b89e491d
commit aba180b466
5 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rules.cpp
View file

@ -673,12 +673,10 @@ void Rules::discardUsed( bool withdrawn )
#endif #endif
#ifndef NDEBUG
kdbgstream& operator<<( kdbgstream& stream, const Rules* r ) kdbgstream& operator<<( kdbgstream& stream, const Rules* r )
{ {
return stream << "[" << r->description << ":" << r->wmclass << "]" ; return stream << "[" << r->description << ":" << r->wmclass << "]" ;
} }
#endif
#ifndef KCMRULES #ifndef KCMRULES
void WindowRules::discardTemporary() void WindowRules::discardTemporary()

5
rules.h
View file

@ -299,12 +299,7 @@ void WindowRules::remove( Rules* rule )
#endif #endif
#ifdef NDEBUG
inline
kndbgstream& operator<<( kndbgstream& stream, const Rules* ) { return stream; }
#else
kdbgstream& operator<<( kdbgstream& stream, const Rules* ); kdbgstream& operator<<( kdbgstream& stream, const Rules* );
#endif
} // namespace } // namespace

5
scene_xrender.cpp
View file

@ -52,10 +52,6 @@ struct RegionDebug
XserverRegion rr; XserverRegion rr;
}; };
#ifdef NDEBUG
inline
kndbgstream& operator<<( kndbgstream& stream, RegionDebug ) { return stream; }
#else
kdbgstream& operator<<( kdbgstream& stream, RegionDebug r ) kdbgstream& operator<<( kdbgstream& stream, RegionDebug r )
{ {
if( r.rr == None ) 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 << "]"; stream << "[" << rects[ i ].x << "+" << rects[ i ].y << " " << rects[ i ].width << "x" << rects[ i ].height << "]";
return stream; return stream;
} }
#endif
Picture SceneXrender::buffer = None; Picture SceneXrender::buffer = None;
ScreenPaintData SceneXrender::screen_paint; ScreenPaintData SceneXrender::screen_paint;

2
toplevel.cpp
View file

@ -45,7 +45,6 @@ Toplevel::~Toplevel()
delete info; delete info;
} }
#ifndef NDEBUG
kdbgstream& operator<<( kdbgstream& stream, const Toplevel* cl ) kdbgstream& operator<<( kdbgstream& stream, const Toplevel* cl )
{ {
if( cl == NULL ) if( cl == NULL )
@ -87,7 +86,6 @@ kdbgstream& operator<<( kdbgstream& stream, const ConstToplevelList& list )
stream << ")"; stream << ")";
return stream; return stream;
} }
#endif
void Toplevel::detectShape( Window id ) void Toplevel::detectShape( Window id )
{ {

9
toplevel.h
View file

@ -382,18 +382,9 @@ inline pid_t Toplevel::pid() const
return info->pid(); 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 Toplevel* );
kdbgstream& operator<<( kdbgstream& stream, const ToplevelList& ); kdbgstream& operator<<( kdbgstream& stream, const ToplevelList& );
kdbgstream& operator<<( kdbgstream& stream, const ConstToplevelList& ); kdbgstream& operator<<( kdbgstream& stream, const ConstToplevelList& );
#endif
KWIN_COMPARE_PREDICATE( WindowMatchPredicate, Toplevel, Window, cl->window() == value ); KWIN_COMPARE_PREDICATE( WindowMatchPredicate, Toplevel, Window, cl->window() == value );
KWIN_COMPARE_PREDICATE( FrameIdMatchPredicate, Toplevel, Window, cl->frameId() == value ); KWIN_COMPARE_PREDICATE( FrameIdMatchPredicate, Toplevel, Window, cl->frameId() == value );