From 0fa10f318db7fa949cebac2688bfb46c9e50c37b Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 6 Feb 2006 14:47:18 +0000 Subject: [PATCH] Deprecated-- svn path=/trunk/KDE/kdebase/workspace/; revision=506323 --- HACKING | 2 +- activation.cpp | 24 ++++++------ client.cpp | 16 ++++---- clients/kwmtheme/cli_installer/main.cpp | 8 ++-- clients/kwmtheme/kwmthemeclient.cpp | 4 +- events.cpp | 6 +-- geometry.cpp | 48 +++++++++++------------ group.cpp | 46 +++++++++++----------- kcmkwin/kwindecoration/kwindecoration.cpp | 2 +- layers.cpp | 18 ++++----- lib/kdecoration_plugins_p.cpp | 4 +- rules.cpp | 2 +- sm.cpp | 4 +- tabbox.cpp | 6 +-- tools/decobenchmark/main.cpp | 10 ++--- tools/decobenchmark/preview.cpp | 8 ++-- workspace.cpp | 22 +++++------ 17 files changed, 115 insertions(+), 115 deletions(-) diff --git a/HACKING b/HACKING index e3b04e02aa..e14a12e5ac 100644 --- a/HACKING +++ b/HACKING @@ -128,7 +128,7 @@ changes may have extensive consequences. Various notes: -- kdDebug has overloaded operator << for the Client class, so you can e.g. use 'kdDebug() << this << endl;' +- kDebug has overloaded operator << for the Client class, so you can e.g. use 'kDebug() << this << endl;' in class Client and it will print information about the window. - KWin itself cannot create any normal windows, because it would have trouble managing its own windows. diff --git a/activation.cpp b/activation.cpp index e17d4d4394..331b189abd 100644 --- a/activation.cpp +++ b/activation.cpp @@ -354,7 +354,7 @@ void Workspace::takeActivity( Client* c, int flags, bool handled ) } if( !c->isShown( true )) // shouldn't happen, call activateClient() if needed { - kdWarning( 1212 ) << "takeActivity: not shown" << endl; + kWarning( 1212 ) << "takeActivity: not shown" << endl; return; } c->takeActivity( flags, handled, Allowed ); @@ -497,20 +497,20 @@ bool Workspace::allowClientActivation( const Client* c, Time time, bool focus_in return true; if( ac == NULL || ac->isDesktop()) { - kdDebug( 1212 ) << "Activation: No client active, allowing" << endl; + kDebug( 1212 ) << "Activation: No client active, allowing" << endl; return true; // no active client -> always allow } // TODO window urgency -> return true? if( Client::belongToSameApplication( c, ac, true )) { - kdDebug( 1212 ) << "Activation: Belongs to active application" << endl; + kDebug( 1212 ) << "Activation: Belongs to active application" << endl; return true; } if( level == 3 ) // high return false; if( time == -1U ) // no time known { - kdDebug( 1212 ) << "Activation: No timestamp at all" << endl; + kDebug( 1212 ) << "Activation: No timestamp at all" << endl; if( level == 1 ) // low return true; // no timestamp at all, don't activate - because there's also creation timestamp @@ -520,7 +520,7 @@ bool Workspace::allowClientActivation( const Client* c, Time time, bool focus_in } // level == 2 // normal Time user_time = ac->userTime(); - kdDebug( 1212 ) << "Activation, compared:" << c << ":" << time << ":" << user_time + kDebug( 1212 ) << "Activation, compared:" << c << ":" << time << ":" << user_time << ":" << ( timestampCompare( time, user_time ) >= 0 ) << endl; return timestampCompare( time, user_time ) >= 0; // time >= user_time } @@ -543,7 +543,7 @@ bool Workspace::allowFullClientRaising( const Client* c, Time time ) return false; if( ac == NULL || ac->isDesktop()) { - kdDebug( 1212 ) << "Raising: No client active, allowing" << endl; + kDebug( 1212 ) << "Raising: No client active, allowing" << endl; return true; // no active client -> always allow } if( c->ignoreFocusStealing()) @@ -551,13 +551,13 @@ bool Workspace::allowFullClientRaising( const Client* c, Time time ) // TODO window urgency -> return true? if( Client::belongToSameApplication( c, ac, true )) { - kdDebug( 1212 ) << "Raising: Belongs to active application" << endl; + kDebug( 1212 ) << "Raising: Belongs to active application" << endl; return true; } if( level == 3 ) // high return false; Time user_time = ac->userTime(); - kdDebug( 1212 ) << "Raising, compared:" << time << ":" << user_time + kDebug( 1212 ) << "Raising, compared:" << time << ":" << user_time << ":" << ( timestampCompare( time, user_time ) >= 0 ) << endl; return timestampCompare( time, user_time ) >= 0; // time >= user_time } @@ -710,7 +710,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar bool session ) const { Time time = info->userTime(); - kdDebug( 1212 ) << "User timestamp, initial:" << time << endl; + kDebug( 1212 ) << "User timestamp, initial:" << time << endl; // newer ASN timestamp always replaces user timestamp, unless user timestamp is 0 // helps e.g. with konqy reusing if( asn_data != NULL && time != 0 ) @@ -727,7 +727,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar time = asn_data->timestamp(); } } - kdDebug( 1212 ) << "User timestamp, ASN:" << time << endl; + kDebug( 1212 ) << "User timestamp, ASN:" << time << endl; if( time == -1U ) { // The window doesn't have any timestamp. // If it's the first window for its application @@ -759,7 +759,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar // don't refuse if focus stealing prevention is turned off if( !first_window && rules()->checkFSP( options->focusStealingPreventionLevel ) > 0 ) { - kdDebug( 1212 ) << "User timestamp, already exists:" << 0 << endl; + kDebug( 1212 ) << "User timestamp, already exists:" << 0 << endl; return 0; // refuse activation } } @@ -779,7 +779,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar else time = readUserCreationTime(); } - kdDebug( 1212 ) << "User timestamp, final:" << this << ":" << time << endl; + kDebug( 1212 ) << "User timestamp, final:" << this << ":" << time << endl; return time; } diff --git a/client.cpp b/client.cpp index 53a94370a2..5d051e90ae 100644 --- a/client.cpp +++ b/client.cpp @@ -1027,7 +1027,7 @@ void Client::closeWindow() */ void Client::killWindow() { - kdDebug( 1212 ) << "Client::killWindow():" << caption() << endl; + kDebug( 1212 ) << "Client::killWindow():" << caption() << endl; // not sure if we need an Notify::Kill or not.. until then, use // Notify::Close Notify::raise( Notify::Close ); @@ -1076,7 +1076,7 @@ void Client::gotPing( Time timestamp ) void Client::pingTimeout() { - kdDebug( 1212 ) << "Ping timeout:" << caption() << endl; + kDebug( 1212 ) << "Ping timeout:" << caption() << endl; delete ping_timer; ping_timer = NULL; killProcess( true, ping_timestamp ); @@ -1091,7 +1091,7 @@ void Client::killProcess( bool ask, Time timestamp ) pid_t pid = info->pid(); if( pid <= 0 || machine.isEmpty()) // needed properties missing return; - kdDebug( 1212 ) << "Kill process:" << pid << "(" << machine << ")" << endl; + kDebug( 1212 ) << "Kill process:" << pid << "(" << machine << ")" << endl; if( !ask ) { if( machine != "localhost" ) @@ -1125,7 +1125,7 @@ void Client::killProcess( bool ask, Time timestamp ) void Client::processKillerExited() { - kdDebug( 1212 ) << "Killer exited" << endl; + kDebug( 1212 ) << "Killer exited" << endl; delete process_killer; process_killer = NULL; } @@ -1220,8 +1220,8 @@ void Client::takeActivity( int flags, bool handled, allowed_t ) static Client* previous_client; if( previous_activity_timestamp == QX11Info::appTime() && previous_client != this ) { - kdDebug( 1212 ) << "Repeated use of the same X timestamp for activity" << endl; - kdDebug( 1212 ) << kdBacktrace() << endl; + kDebug( 1212 ) << "Repeated use of the same X timestamp for activity" << endl; + kDebug( 1212 ) << kBacktrace() << endl; } previous_activity_timestamp = QX11Info::appTime(); previous_client = this; @@ -1237,8 +1237,8 @@ void Client::takeFocus( allowed_t ) static Client* previous_client; if( previous_focus_timestamp == QX11Info::appTime() && previous_client != this ) { - kdDebug( 1212 ) << "Repeated use of the same X timestamp for focus" << endl; - kdDebug( 1212 ) << kdBacktrace() << endl; + kDebug( 1212 ) << "Repeated use of the same X timestamp for focus" << endl; + kDebug( 1212 ) << kBacktrace() << endl; } previous_focus_timestamp = QX11Info::appTime(); previous_client = this; diff --git a/clients/kwmtheme/cli_installer/main.cpp b/clients/kwmtheme/cli_installer/main.cpp index 45498e76e5..e228f58b7a 100644 --- a/clients/kwmtheme/cli_installer/main.cpp +++ b/clients/kwmtheme/cli_installer/main.cpp @@ -22,11 +22,11 @@ void copy(const QString &src, const QString &dest) QFile copyInput(src); QFile copyOutput(dest); if(!copyInput.open(QIODevice::ReadOnly)){ - kdWarning() << "Couldn't open " << src << endl; + kWarning() << "Couldn't open " << src << endl; return; } if(!copyOutput.open(QIODevice::WriteOnly)){ - kdWarning() << "Couldn't open " << dest << endl; + kWarning() << "Couldn't open " << dest << endl; copyInput.close(); return; } @@ -44,7 +44,7 @@ int main(int argc, char **argv) KApplication app(argc, argv); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if(!args->count()){ - kdWarning() << "You need to specify the path to a theme config file!" << endl; + kWarning() << "You need to specify the path to a theme config file!" << endl; return(1); } @@ -53,7 +53,7 @@ int main(int argc, char **argv) QString tmpStr; if(!f.exists()){ - kdWarning() << "Specified theme config file doesn't exist!" << endl; + kWarning() << "Specified theme config file doesn't exist!" << endl; return(2); } diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp index fb9fecb514..bb46bd78a6 100644 --- a/clients/kwmtheme/kwmthemeclient.cpp +++ b/clients/kwmtheme/kwmthemeclient.cpp @@ -92,7 +92,7 @@ static void create_pixmaps() framePixmaps[i] = new QPixmap(locate("data", "kwin/pics/"+config->readEntry(keys[i], " "))); if(framePixmaps[i]->isNull()) - kdWarning() << "Unable to load frame pixmap for " << keys[i] << endl; + kWarning() << "Unable to load frame pixmap for " << keys[i] << endl; } /* *framePixmaps[FrameTop] = stretchPixmap(*framePixmaps[FrameTop], false); @@ -335,7 +335,7 @@ void KWMThemeClient::init() if((val != "Off") && ((val == "Iconify") && !isMinimizable()) && ((val == "Maximize") && !isMaximizable())) - kdWarning() << "KWin: Unrecognized button value: " << val << endl; + kWarning() << "KWin: Unrecognized button value: " << val << endl; } } diff --git a/events.cpp b/events.cpp index 4e58726a1d..6594c2c305 100644 --- a/events.cpp +++ b/events.cpp @@ -223,7 +223,7 @@ bool Workspace::workspaceEvent( XEvent * e ) was_user_interaction = true; KKeyNative keyX( (XEvent*)e ); uint keyQt = keyX.keyCodeQt(); - kdDebug(125) << "Workspace::keyPress( " << keyX.key().toString() << " )" << endl; + kDebug(125) << "Workspace::keyPress( " << keyX.key().toString() << " )" << endl; if (movingClient) { movingClient->keyPressEvent(keyQt); @@ -442,7 +442,7 @@ bool Workspace::workspaceEvent( XEvent * e ) XGetInputFocus( QX11Info::display(), &focus, &revert ); if( focus == None || focus == PointerRoot ) { - //kdWarning( 1212 ) << "X focus set to None/PointerRoot, reseting focus" << endl; + //kWarning( 1212 ) << "X focus set to None/PointerRoot, reseting focus" << endl; Client *c = mostRecentlyActivatedClient(); if( c != NULL ) requestFocus( c, true ); @@ -1267,7 +1267,7 @@ void Client::processMousePressEvent( QMouseEvent* e ) { if( e->type() != QEvent::MouseButtonPress ) { - kdWarning() << "processMousePressEvent()" << endl; + kWarning() << "processMousePressEvent()" << endl; return; } int button; diff --git a/geometry.cpp b/geometry.cpp index 04934e3e5a..a88565796c 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -63,7 +63,7 @@ void Workspace::updateClientArea( bool force ) { QDesktopWidget *desktopwidget = KApplication::desktop(); int nscreens = desktopwidget -> numScreens (); -// kdDebug () << "screens: " << nscreens << endl; +// kDebug () << "screens: " << nscreens << endl; QRect* new_wareas = new QRect[ numberOfDesktops() + 1 ]; QRect** new_sareas = new QRect*[ numberOfDesktops() + 1]; QRect* screens = new QRect [ nscreens ]; @@ -111,7 +111,7 @@ void Workspace::updateClientArea( bool force ) iS < nscreens; iS ++ ) { -// kdDebug () << "adjusting new_sarea: " << screens[ iS ] << endl; +// kDebug () << "adjusting new_sarea: " << screens[ iS ] << endl; new_sareas[ (*it)->desktop() ][ iS ] = new_sareas[ (*it)->desktop() ][ iS ].intersect( (*it)->adjustedClientArea( desktopArea, screens[ iS ] ) @@ -127,7 +127,7 @@ void Workspace::updateClientArea( bool force ) for( int iS = 0; iS < nscreens; iS ++ ) - kdDebug () << "new_sarea: " << new_sareas[ i ][ iS ] << endl; + kDebug () << "new_sarea: " << new_sareas[ i ][ iS ] << endl; } #endif // TODO topmenu update for screenarea changes? @@ -740,38 +740,38 @@ QRect Client::adjustedClientArea( const QRect &desktopArea, const QRect& area ) if (stareaT.top() == geometry().top() && stareaT.bottom() == geometry().bottom()) { stareaT.setLeft(geometry().left()); stareaT.setRight(geometry().right()); -// kdDebug () << "Trimming top-strut to geometry() to: " << stareaT << endl; +// kDebug () << "Trimming top-strut to geometry() to: " << stareaT << endl; } if (stareaB.top() == geometry().top() && stareaB.bottom() == geometry().bottom()) { stareaB.setLeft(geometry().left()); stareaB.setRight(geometry().right()); -// kdDebug () << "Trimming bottom-strut to geometry(): " << stareaB << endl; +// kDebug () << "Trimming bottom-strut to geometry(): " << stareaB << endl; } if (stareaL.left() == geometry().left() && stareaL.right() == geometry().right()) { stareaL.setTop(geometry().top()); stareaL.setBottom(geometry().bottom()); -// kdDebug () << "Trimming left-strut to geometry(): " << stareaL << endl; +// kDebug () << "Trimming left-strut to geometry(): " << stareaL << endl; } if (stareaR.left() == geometry().left() && stareaR.right() == geometry().right()) { stareaR.setTop(geometry().top()); stareaR.setBottom(geometry().bottom()); -// kdDebug () << "Trimming right-strut to geometry(): " << stareaR << endl; +// kDebug () << "Trimming right-strut to geometry(): " << stareaR << endl; } } if (stareaL . intersects (area)) { -// kdDebug () << "Moving left of: " << r << " to " << stareaL.right() + 1 << endl; +// kDebug () << "Moving left of: " << r << " to " << stareaL.right() + 1 << endl; r . setLeft( stareaL . right() + 1 ); } if (stareaR . intersects (area)) { -// kdDebug () << "Moving right of: " << r << " to " << stareaR.left() - 1 << endl; +// kDebug () << "Moving right of: " << r << " to " << stareaR.left() - 1 << endl; r . setRight( stareaR . left() - 1 ); } if (stareaT . intersects (area)) { -// kdDebug () << "Moving top of: " << r << " to " << stareaT.bottom() + 1 << endl; +// kDebug () << "Moving top of: " << r << " to " << stareaT.bottom() + 1 << endl; r . setTop( stareaT . bottom() + 1 ); } if (stareaB . intersects (area)) { -// kdDebug () << "Moving bottom of: " << r << " to " << stareaB.top() - 1 << endl; +// kDebug () << "Moving bottom of: " << r << " to " << stareaB.top() - 1 << endl; r . setBottom( stareaB . top() - 1 ); } return r; @@ -891,7 +891,7 @@ void Client::checkWorkspacePosition() else area = workspace()->clientArea( MaximizeFullArea, QPoint( 0, 0 ), desktop()); area.setHeight( workspace()->topMenuHeight()); -// kdDebug() << "TOPMENU size adjust: " << area << ":" << this << endl; +// kDebug() << "TOPMENU size adjust: " << area << ":" << this << endl; setGeometry( area ); } return; @@ -1028,8 +1028,8 @@ QSize Client::sizeForClientSize( const QSize& wsize, Sizemode mode, bool noframe int h = wsize.height(); if( w < 1 || h < 1 ) { - kdWarning() << "sizeForClientSize() with empty size!" << endl; - kdWarning() << kdBacktrace() << endl; + kWarning() << "sizeForClientSize() with empty size!" << endl; + kWarning() << kBacktrace() << endl; } if (w<1) w = 1; if (h<1) h = 1; @@ -1456,8 +1456,8 @@ void Client::resizeWithChecks( int w, int h, ForceGeometry_t force ) { if( h == border_top + border_bottom ) { - kdWarning() << "Shaded geometry passed for size:" << endl; - kdWarning() << kdBacktrace() << endl; + kWarning() << "Shaded geometry passed for size:" << endl; + kWarning() << kBacktrace() << endl; } } int newx = x(); @@ -1631,8 +1631,8 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force ) { if( h == border_top + border_bottom ) { - kdDebug() << "Shaded geometry passed for size:" << endl; - kdDebug() << kdBacktrace() << endl; + kDebug() << "Shaded geometry passed for size:" << endl; + kDebug() << kBacktrace() << endl; } else { @@ -1681,8 +1681,8 @@ void Client::plainResize( int w, int h, ForceGeometry_t force ) { if( h == border_top + border_bottom ) { - kdDebug() << "Shaded geometry passed for size:" << endl; - kdDebug() << kdBacktrace() << endl; + kDebug() << "Shaded geometry passed for size:" << endl; + kDebug() << kBacktrace() << endl; } else { @@ -1696,8 +1696,8 @@ void Client::plainResize( int w, int h, ForceGeometry_t force ) } if( QSize( w, h ) != rules()->checkSize( QSize( w, h ))) { - kdDebug() << "forced size fail:" << QSize( w,h ) << ":" << rules()->checkSize( QSize( w, h )) << endl; - kdDebug() << kdBacktrace() << endl; + kDebug() << "forced size fail:" << QSize( w,h ) << ":" << rules()->checkSize( QSize( w, h )) << endl; + kDebug() << kBacktrace() << endl; } if( force == NormalGeometrySet && frame_geometry.size() == QSize( w, h )) return; @@ -1985,8 +1985,8 @@ void Client::checkMaximizeGeometry() static int recursion_protection = 0; if( recursion_protection > 3 ) { - kdWarning( 1212 ) << "Check maximize overflow - you loose!" << endl; - kdWarning( 1212 ) << kdBacktrace() << endl; + kWarning( 1212 ) << "Check maximize overflow - you loose!" << endl; + kWarning( 1212 ) << kBacktrace() << endl; return; } ++recursion_protection; diff --git a/group.cpp b/group.cpp index 3d82a324b3..f4706ef953 100644 --- a/group.cpp +++ b/group.cpp @@ -91,14 +91,14 @@ QPixmap Group::miniIcon() const void Group::addMember( Client* member_P ) { _members.append( member_P ); -// kdDebug() << "GROUPADD:" << this << ":" << member_P << endl; -// kdDebug() << kdBacktrace() << endl; +// kDebug() << "GROUPADD:" << this << ":" << member_P << endl; +// kDebug() << kBacktrace() << endl; } void Group::removeMember( Client* member_P ) { -// kdDebug() << "GROUPREMOVE:" << this << ":" << member_P << endl; -// kdDebug() << kdBacktrace() << endl; +// kDebug() << "GROUPREMOVE:" << this << ":" << member_P << endl; +// kDebug() << kBacktrace() << endl; Q_ASSERT( _members.contains( member_P )); _members.remove( member_P ); if( _members.isEmpty()) @@ -445,28 +445,28 @@ void Client::removeFromMainClients() // related lists. void Client::cleanGrouping() { -// kdDebug() << "CLEANGROUPING:" << this << endl; +// kDebug() << "CLEANGROUPING:" << this << endl; // for( ClientList::ConstIterator it = group()->members().begin(); // it != group()->members().end(); // ++it ) -// kdDebug() << "CL:" << *it << endl; +// kDebug() << "CL:" << *it << endl; // ClientList mains; // mains = mainClients(); // for( ClientList::ConstIterator it = mains.begin(); // it != mains.end(); // ++it ) -// kdDebug() << "MN:" << *it << endl; +// kDebug() << "MN:" << *it << endl; removeFromMainClients(); -// kdDebug() << "CLEANGROUPING2:" << this << endl; +// kDebug() << "CLEANGROUPING2:" << this << endl; // for( ClientList::ConstIterator it = group()->members().begin(); // it != group()->members().end(); // ++it ) -// kdDebug() << "CL2:" << *it << endl; +// kDebug() << "CL2:" << *it << endl; // mains = mainClients(); // for( ClientList::ConstIterator it = mains.begin(); // it != mains.end(); // ++it ) -// kdDebug() << "MN2:" << *it << endl; +// kDebug() << "MN2:" << *it << endl; for( ClientList::ConstIterator it = transients_list.begin(); it != transients_list.end(); ) @@ -479,16 +479,16 @@ void Client::cleanGrouping() else ++it; } -// kdDebug() << "CLEANGROUPING3:" << this << endl; +// kDebug() << "CLEANGROUPING3:" << this << endl; // for( ClientList::ConstIterator it = group()->members().begin(); // it != group()->members().end(); // ++it ) -// kdDebug() << "CL3:" << *it << endl; +// kDebug() << "CL3:" << *it << endl; // mains = mainClients(); // for( ClientList::ConstIterator it = mains.begin(); // it != mains.end(); // ++it ) -// kdDebug() << "MN3:" << *it << endl; +// kDebug() << "MN3:" << *it << endl; // HACK // removeFromMainClients() did remove 'this' from transient // lists of all group members, but then made windows that @@ -501,11 +501,11 @@ void Client::cleanGrouping() it != group_members.end(); ++it ) (*it)->removeTransient( this ); -// kdDebug() << "CLEANGROUPING4:" << this << endl; +// kDebug() << "CLEANGROUPING4:" << this << endl; // for( ClientList::ConstIterator it = group_members.begin(); // it != group_members.end(); // ++it ) -// kdDebug() << "CL4:" << *it << endl; +// kDebug() << "CL4:" << *it << endl; } // Make sure that no group transient is considered transient @@ -582,7 +582,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined ) return None; if( new_transient_for == window()) // pointing to self { // also fix the property itself - kdWarning( 1216 ) << "Client " << this << " has WM_TRANSIENT_FOR poiting to itself." << endl; + kWarning( 1216 ) << "Client " << this << " has WM_TRANSIENT_FOR poiting to itself." << endl; new_property_value = new_transient_for = workspace()->rootWin(); } // The transient_for window may be embedded in another application, @@ -607,7 +607,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined ) { if( new_transient_for != before_search ) { - kdDebug( 1212 ) << "Client " << this << " has WM_TRANSIENT_FOR poiting to non-toplevel window " + kDebug( 1212 ) << "Client " << this << " has WM_TRANSIENT_FOR poiting to non-toplevel window " << before_search << ", child of " << new_transient_for_client << ", adjusting." << endl; new_property_value = new_transient_for; // also fix the property } @@ -627,7 +627,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined ) loop_pos = pos->transient_for_id; if( --count == 0 ) { - kdWarning( 1216 ) << "Client " << this << " caused WM_TRANSIENT_FOR loop." << endl; + kWarning( 1216 ) << "Client " << this << " caused WM_TRANSIENT_FOR loop." << endl; new_transient_for = workspace()->rootWin(); } } @@ -649,18 +649,18 @@ void Client::addTransient( Client* cl ) transients_list.append( cl ); if( workspace()->mostRecentlyActivatedClient() == this && cl->isModal()) check_active_modal = true; -// kdDebug() << "ADDTRANS:" << this << ":" << cl << endl; -// kdDebug() << kdBacktrace() << endl; +// kDebug() << "ADDTRANS:" << this << ":" << cl << endl; +// kDebug() << kBacktrace() << endl; // for( ClientList::ConstIterator it = transients_list.begin(); // it != transients_list.end(); // ++it ) -// kdDebug() << "AT:" << (*it) << endl; +// kDebug() << "AT:" << (*it) << endl; } void Client::removeTransient( Client* cl ) { -// kdDebug() << "REMOVETRANS:" << this << ":" << cl << endl; -// kdDebug() << kdBacktrace() << endl; +// kDebug() << "REMOVETRANS:" << this << ":" << cl << endl; +// kDebug() << kBacktrace() << endl; transients_list.remove( cl ); // cl is transient for this, but this is going away // make cl group transient diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index 3384671611..b43ffc7462 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kcmkwin/kwindecoration/kwindecoration.cpp @@ -609,7 +609,7 @@ void KWinDecorationModule::resetKWin() bool ok = kapp->dcopClient()->send("kwin*", "KWinInterface", "reconfigure()", QByteArray()); if (!ok) - kdDebug() << "kcmkwindecoration: Could not reconfigure kwin" << endl; + kDebug() << "kcmkwindecoration: Could not reconfigure kwin" << endl; } #include "kwindecoration.moc" diff --git a/layers.cpp b/layers.cpp index 1fb08c8725..76d39f7346 100644 --- a/layers.cpp +++ b/layers.cpp @@ -106,13 +106,13 @@ void Workspace::updateStackingOrder( bool propagate_new_clients ) bool changed = ( new_stacking_order != stacking_order ); stacking_order = new_stacking_order; #if 0 - kdDebug() << "stacking:" << changed << endl; + kDebug() << "stacking:" << changed << endl; if( changed || propagate_new_clients ) { for( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it ) - kdDebug() << (void*)(*it) << *it << ":" << (*it)->layer() << endl; + kDebug() << (void*)(*it) << *it << ":" << (*it)->layer() << endl; } #endif if( changed || propagate_new_clients ) @@ -450,7 +450,7 @@ ClientList Workspace::constrainedStackingOrder() ClientList layer[ NumLayers ]; #if 0 - kdDebug() << "stacking1:" << endl; + kDebug() << "stacking1:" << endl; #endif // build the order from layers QMap< Group*, Layer > minimum_layer; @@ -477,11 +477,11 @@ ClientList Workspace::constrainedStackingOrder() ++lay ) stacking += layer[ lay ]; #if 0 - kdDebug() << "stacking2:" << endl; + kDebug() << "stacking2:" << endl; for( ClientList::ConstIterator it = stacking.begin(); it != stacking.end(); ++it ) - kdDebug() << (void*)(*it) << *it << ":" << (*it)->layer() << endl; + kDebug() << (void*)(*it) << *it << ":" << (*it)->layer() << endl; #endif // now keep transients above their mainwindows // TODO this could(?) use some optimization @@ -530,7 +530,7 @@ ClientList Workspace::constrainedStackingOrder() break; } } -// kdDebug() << "STACK:" << stacking[ i ] << ":" << ( i2 == -1 ? ((Client*)0) : stacking[ i2 ] ) << endl; +// kDebug() << "STACK:" << stacking[ i ] << ":" << ( i2 == -1 ? ((Client*)0) : stacking[ i2 ] ) << endl; if( i2 == -1 ) { --i; @@ -545,12 +545,12 @@ ClientList Workspace::constrainedStackingOrder() stacking.insert( i2, current ); } #if 0 - kdDebug() << "stacking3:" << endl; + kDebug() << "stacking3:" << endl; for( ClientList::ConstIterator it = stacking.begin(); it != stacking.end(); ++it ) - kdDebug() << (void*)(*it) << *it << ":" << (*it)->layer() << endl; - kdDebug() << "\n\n" << endl; + kDebug() << (void*)(*it) << *it << ":" << (*it)->layer() << endl; + kDebug() << "\n\n" << endl; #endif return stacking; } diff --git a/lib/kdecoration_plugins_p.cpp b/lib/kdecoration_plugins_p.cpp index 4aa4d15710..8dee092bf0 100644 --- a/lib/kdecoration_plugins_p.cpp +++ b/lib/kdecoration_plugins_p.cpp @@ -106,7 +106,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr ) KDecorationFactory* oldFactory = fact; QString path = KLibLoader::findLibrary(QFile::encodeName(nameStr)); - kdDebug() << "kwin : path " << path << " for " << nameStr << endl; + kDebug() << "kwin : path " << path << " for " << nameStr << endl; // If the plugin was not found, try to find the default if (path.isEmpty()) @@ -132,7 +132,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr ) // If that fails, fall back to the default plugin if (!library) { - kdDebug() << " could not load library, try default plugin again" << endl; + kDebug() << " could not load library, try default plugin again" << endl; nameStr = defaultPlugin; if ( pluginStr == nameStr ) return true; diff --git a/rules.cpp b/rules.cpp index ff9e08fa58..4f440a93af 100644 --- a/rules.cpp +++ b/rules.cpp @@ -924,7 +924,7 @@ WindowRules Workspace::findWindowRules( const Client* c, bool ignore_temporary ) if( (*it)->match( c )) { Rules* rule = *it; - kdDebug( 1212 ) << "Rule found:" << rule << ":" << c << endl; + kDebug( 1212 ) << "Rule found:" << rule << ":" << c << endl; if( rule->isTemporary()) it = rules.remove( it ); else diff --git a/sm.cpp b/sm.cpp index 3db8bfdaf6..2b0efb6349 100644 --- a/sm.cpp +++ b/sm.cpp @@ -273,7 +273,7 @@ bool Workspace::windowRoleMatch( const QByteArray& role1, const QByteArray& role ret = role1 == role2; else ret = qstrncmp( role1, role2, pos1 ) == 0; - kdDebug() << "WR:" << role1 << ":" << pos1 << ":" << role2 << ":" << pos2 << ":::" << ret << endl; + kDebug() << "WR:" << role1 << ":" << pos1 << ":" << role2 << ":" << pos2 << ":::" << ret << endl; return ret; } #endif @@ -291,7 +291,7 @@ const char* Workspace::windowTypeToTxt( NET::WindowType type ) return window_type_names[ type + 1 ]; // +1 (unknown==-1) if( type == -2 ) // undefined (not really part of NET::WindowType) return "Undefined"; - kdFatal() << "Unknown Window Type" << endl; + kFatal() << "Unknown Window Type" << endl; return NULL; } diff --git a/tabbox.cpp b/tabbox.cpp index 8fbb9cd168..db3ece7505 100644 --- a/tabbox.cpp +++ b/tabbox.cpp @@ -626,7 +626,7 @@ bool areKeySymXsDepressed( bool bAll, const uint keySyms[], int nKeySyms ) { char keymap[32]; - kdDebug(125) << "areKeySymXsDepressed: " << (bAll ? "all of " : "any of ") << nKeySyms << endl; + kDebug(125) << "areKeySymXsDepressed: " << (bAll ? "all of " : "any of ") << nKeySyms << endl; XQueryKeymap( QX11Info::display(), keymap ); @@ -637,7 +637,7 @@ bool areKeySymXsDepressed( bool bAll, const uint keySyms[], int nKeySyms ) int i = keyCodeX / 8; char mask = 1 << (keyCodeX - (i * 8)); - kdDebug(125) << iKeySym << ": keySymX=0x" << QString::number( keySymX, 16 ) + kDebug(125) << iKeySym << ": keySymX=0x" << QString::number( keySymX, 16 ) << " i=" << i << " mask=0x" << QString::number( mask, 16 ) << " keymap[i]=0x" << QString::number( keymap[i], 16 ) << endl; @@ -1015,7 +1015,7 @@ void Workspace::tabBoxKeyPress( const KKeyNative& keyX ) backward = cutWalkThroughWindowsReverse.contains( keyX ); if (forward || backward) { - kdDebug(125) << "== " << cutWalkThroughWindows.toStringInternal() + kDebug(125) << "== " << cutWalkThroughWindows.toStringInternal() << " or " << cutWalkThroughWindowsReverse.toStringInternal() << endl; KDEWalkThroughWindows( forward ); } diff --git a/tools/decobenchmark/main.cpp b/tools/decobenchmark/main.cpp index 847fef69c9..79e05e372c 100644 --- a/tools/decobenchmark/main.cpp +++ b/tools/decobenchmark/main.cpp @@ -56,14 +56,14 @@ DecoBenchApplication::DecoBenchApplication(const QString &library, Tests tests, preview = new KDecorationPreview( plugins, 0 ); if (plugins->loadPlugin(library) ) - kdDebug() << "Decoration library " << library << " loaded..." << endl; + kDebug() << "Decoration library " << library << " loaded..." << endl; else - kdError() << "Error loading decoration library " << library << "!" << endl; + kError() << "Error loading decoration library " << library << "!" << endl; if (preview->recreateDecoration() ) - kdDebug() << "Decoration created..." << endl; + kDebug() << "Decoration created..." << endl; else - kdError() << "Error creating decoration!" << endl; + kError() << "Error creating decoration!" << endl; preview->show(); } @@ -93,7 +93,7 @@ void DecoBenchApplication::executeTest() ftime(&aend); long long time_diff = (aend.time - astart.time)*1000+aend.millitm - astart.millitm; - kdDebug() << "Total:" << (float(time_diff)/1000) << endl; + kDebug() << "Total:" << (float(time_diff)/1000) << endl; quit(); } diff --git a/tools/decobenchmark/preview.cpp b/tools/decobenchmark/preview.cpp index 2a982e9b46..0d36448cef 100644 --- a/tools/decobenchmark/preview.cpp +++ b/tools/decobenchmark/preview.cpp @@ -62,7 +62,7 @@ KDecorationPreview::~KDecorationPreview() void KDecorationPreview::performRepaintTest(int n) { - kdDebug() << "start " << n << " repaints..." << endl; + kDebug() << "start " << n << " repaints..." << endl; bridge->setCaption("Deco Benchmark"); deco->captionChange(); positionPreviews(0); @@ -74,7 +74,7 @@ void KDecorationPreview::performRepaintTest(int n) void KDecorationPreview::performCaptionTest(int n) { - kdDebug() << "start " << n << " caption changes..." << endl; + kDebug() << "start " << n << " caption changes..." << endl; QString caption = "Deco Benchmark %1"; positionPreviews(0); for (int i = 0; i < n; ++i) { @@ -87,7 +87,7 @@ void KDecorationPreview::performCaptionTest(int n) void KDecorationPreview::performResizeTest(int n) { - kdDebug() << "start " << n << " resizes..." << endl; + kDebug() << "start " << n << " resizes..." << endl; bridge->setCaption("Deco Benchmark"); deco->captionChange(); for (int i = 0; i < n; ++i) { @@ -98,7 +98,7 @@ void KDecorationPreview::performResizeTest(int n) void KDecorationPreview::performRecreationTest(int n) { - kdDebug() << "start " << n << " resizes..." << endl; + kDebug() << "start " << n << " resizes..." << endl; bridge->setCaption("Deco Benchmark"); deco->captionChange(); positionPreviews(0); diff --git a/workspace.cpp b/workspace.cpp index 78dc708e2f..de18c6029d 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -662,7 +662,7 @@ void Workspace::updateCurrentTopMenu() } } -// kdDebug() << "CURRENT TOPMENU:" << menubar << ":" << active_client << endl; +// kDebug() << "CURRENT TOPMENU:" << menubar << ":" << active_client << endl; if ( menubar ) { if( active_client && !menubar->isOnDesktop( active_client->desktop())) @@ -813,7 +813,7 @@ void Workspace::reconfigure() void Workspace::slotSettingsChanged(int category) { - kdDebug(1212) << "Workspace::slotSettingsChanged()" << endl; + kDebug(1212) << "Workspace::slotSettingsChanged()" << endl; if( category == (int) KApplication::SETTINGS_SHORTCUTS ) readShortcuts(); } @@ -825,7 +825,7 @@ KWIN_PROCEDURE( CheckBorderSizesProcedure, cl->checkBorderSizes() ); void Workspace::slotReconfigure() { - kdDebug(1212) << "Workspace::slotReconfigure()" << endl; + kDebug(1212) << "Workspace::slotReconfigure()" << endl; reconfigureTimer.stop(); KGlobal::config()->reparseConfiguration(); @@ -1204,7 +1204,7 @@ bool Workspace::setCurrentDesktop( int new_desktop ) // Update focus chain: // If input: chain = { 1, 2, 3, 4 } and current_desktop = 3, // Output: chain = { 3, 1, 2, 4 }. -// kdDebug(1212) << QString("Switching to desktop #%1, at focus_chain index %2\n") +// kDebug(1212) << QString("Switching to desktop #%1, at focus_chain index %2\n") // .arg(current_desktop).arg(desktop_focus_chain.find( current_desktop )); for( int i = desktop_focus_chain.indexOf( current_desktop ); i > 0; i-- ) desktop_focus_chain[i] = desktop_focus_chain[i-1]; @@ -1213,7 +1213,7 @@ bool Workspace::setCurrentDesktop( int new_desktop ) // QString s = "desktop_focus_chain[] = { "; // for( uint i = 0; i < desktop_focus_chain.size(); i++ ) // s += QString::number(desktop_focus_chain[i]) + ", "; -// kdDebug(1212) << s << "}\n"; +// kDebug(1212) << s << "}\n"; if( old_desktop != 0 ) // not for the very first time popupinfo->showInfo( desktopName(currentDesktop()) ); @@ -2203,13 +2203,13 @@ void Workspace::addTopMenu( Client* c ) updateTopMenuGeometry( c ); updateCurrentTopMenu(); } -// kdDebug() << "NEW TOPMENU:" << c << endl; +// kDebug() << "NEW TOPMENU:" << c << endl; } void Workspace::removeTopMenu( Client* c ) { // if( c->isTopMenu()) -// kdDebug() << "REMOVE TOPMENU:" << c << endl; +// kDebug() << "REMOVE TOPMENU:" << c << endl; assert( c->isTopMenu()); assert( topmenus.contains( c )); topmenus.remove( c ); @@ -2219,7 +2219,7 @@ void Workspace::removeTopMenu( Client* c ) void Workspace::lostTopMenuSelection() { -// kdDebug() << "lost TopMenu selection" << endl; +// kDebug() << "lost TopMenu selection" << endl; // make sure this signal is always set when not owning the selection disconnect( topmenu_watcher, SIGNAL( lostOwner()), this, SLOT( lostTopMenuOwner())); connect( topmenu_watcher, SIGNAL( lostOwner()), this, SLOT( lostTopMenuOwner())); @@ -2241,13 +2241,13 @@ void Workspace::lostTopMenuOwner() { if( !options->topMenuEnabled()) return; -// kdDebug() << "TopMenu selection lost owner" << endl; +// kDebug() << "TopMenu selection lost owner" << endl; if( !topmenu_selection->claim( false )) { -// kdDebug() << "Failed to claim TopMenu selection" << endl; +// kDebug() << "Failed to claim TopMenu selection" << endl; return; } -// kdDebug() << "claimed TopMenu selection" << endl; +// kDebug() << "claimed TopMenu selection" << endl; setupTopMenuHandling(); }