Don't rely on the kdgstream typedef which is deprecated. Use QDebug

directly.

svn path=/trunk/KDE/kdebase/workspace/; revision=1190379
This commit is contained in:
Kevin Ottens 2010-10-27 14:16:56 +00:00
parent 0174887114
commit ff61f40d8d
11 changed files with 18 additions and 18 deletions

View file

@ -2214,7 +2214,7 @@ void Client::cancelAutoRaise()
autoRaiseTimer = 0;
}
void Client::debug( kdbgstream& stream ) const
void Client::debug( QDebug& stream ) const
{
stream << "\'ID:" << window() << ";WMCLASS:" << resourceClass() << ":"
<< resourceName() << ";Caption:" << caption() << "\'";

View file

@ -447,7 +447,7 @@ class Client
bool ignoreMenu = false );
protected:
virtual void debug( kdbgstream& stream ) const;
virtual void debug( QDebug& stream ) const;
virtual bool shouldUnredirect() const;
private slots:

View file

@ -127,7 +127,7 @@ QSize Deleted::clientSize() const
return contentsRect.size();
}
void Deleted::debug( kdbgstream& stream ) const
void Deleted::debug( QDebug& stream ) const
{
stream << "\'ID:" << window() << "\' (deleted)";
}

View file

@ -50,7 +50,7 @@ class Deleted
virtual void addRepaintFull(); // in composite.cpp
QRect decorationRect() const;
protected:
virtual void debug( kdbgstream& stream ) const;
virtual void debug( QDebug& stream ) const;
virtual bool shouldUnredirect() const;
private:
Deleted( Workspace *ws ); // use create()

View file

@ -718,7 +718,7 @@ void Rules::discardUsed( bool withdrawn )
#endif
kdbgstream& operator<<( kdbgstream& stream, const Rules* r )
QDebug& operator<<( QDebug& stream, const Rules* r )
{
return stream << "[" << r->description << ":" << r->wmclass << "]" ;
}

View file

@ -268,7 +268,7 @@ class Rules
SetRule shortcutrule;
bool disableglobalshortcuts;
ForceRule disableglobalshortcutsrule;
friend kdbgstream& operator<<( kdbgstream& stream, const Rules* );
friend QDebug& operator<<( QDebug& stream, const Rules* );
};
#ifndef KCMRULES
@ -329,7 +329,7 @@ void WindowRules::remove( Rules* rule )
#endif
kdbgstream& operator<<( kdbgstream& stream, const Rules* );
QDebug& operator<<( QDebug& stream, const Rules* );
} // namespace

View file

@ -68,7 +68,7 @@ struct RegionDebug
XserverRegion rr;
};
kdbgstream& operator<<( kdbgstream& stream, RegionDebug r )
QDebug& operator<<( QDebug& stream, RegionDebug r )
{
if( r.rr == None )
return stream << "EMPTY";

View file

@ -57,7 +57,7 @@ Toplevel::~Toplevel()
delete info;
}
kdbgstream& operator<<( kdbgstream& stream, const Toplevel* cl )
QDebug& operator<<( QDebug& stream, const Toplevel* cl )
{
if( cl == NULL )
return stream << "\'NULL\'";
@ -65,7 +65,7 @@ kdbgstream& operator<<( kdbgstream& stream, const Toplevel* cl )
return stream;
}
kdbgstream& operator<<( kdbgstream& stream, const ToplevelList& list )
QDebug& operator<<( QDebug& stream, const ToplevelList& list )
{
stream << "LIST:(";
bool first = true;
@ -82,7 +82,7 @@ kdbgstream& operator<<( kdbgstream& stream, const ToplevelList& list )
return stream;
}
kdbgstream& operator<<( kdbgstream& stream, const ConstToplevelList& list )
QDebug& operator<<( QDebug& stream, const ConstToplevelList& list )
{
stream << "LIST:(";
bool first = true;

View file

@ -152,10 +152,10 @@ class Toplevel
void getWmClientMachine();
void getResourceClass();
void getWindowRole();
virtual void debug( kdbgstream& stream ) const = 0;
virtual void debug( QDebug& stream ) const = 0;
void copyToDeleted( Toplevel* c );
void disownDataPassedToDeleted();
friend kdbgstream& operator<<( kdbgstream& stream, const Toplevel* );
friend QDebug& operator<<( QDebug& stream, const Toplevel* );
void deleteEffectWindow();
virtual bool shouldUnredirect() const = 0;
QRect geom;
@ -442,9 +442,9 @@ inline bool Toplevel::unredirected() const
return unredirect;
}
kdbgstream& operator<<( kdbgstream& stream, const Toplevel* );
kdbgstream& operator<<( kdbgstream& stream, const ToplevelList& );
kdbgstream& operator<<( kdbgstream& stream, const ConstToplevelList& );
QDebug& operator<<( QDebug& stream, const Toplevel* );
QDebug& operator<<( QDebug& stream, const ToplevelList& );
QDebug& operator<<( QDebug& stream, const ConstToplevelList& );
KWIN_COMPARE_PREDICATE( WindowMatchPredicate, Toplevel, Window, cl->window() == value );
KWIN_COMPARE_PREDICATE( FrameIdMatchPredicate, Toplevel, Window, cl->frameId() == value );

View file

@ -132,7 +132,7 @@ QRect Unmanaged::transparentRect() const
return QRect(clientPos(), clientSize());
}
void Unmanaged::debug( kdbgstream& stream ) const
void Unmanaged::debug( QDebug& stream ) const
{
stream << "\'ID:" << window() << "\'";
}

View file

@ -44,7 +44,7 @@ class Unmanaged
virtual QSize clientSize() const;
virtual QRect transparentRect() const;
protected:
virtual void debug( kdbgstream& stream ) const;
virtual void debug( QDebug& stream ) const;
virtual bool shouldUnredirect() const;
private:
virtual ~Unmanaged(); // use release()