From 935851a2b5963b2458926a9d26bfa77be57baab5 Mon Sep 17 00:00:00 2001 From: Bhushan Shah Date: Fri, 1 Nov 2013 16:59:05 +0530 Subject: [PATCH] kDebug -> qDebug in kwin --- activation.cpp | 2 +- activities.cpp | 2 +- client.cpp | 12 ++++++------ clients/b2/b2client.cpp | 2 +- events.cpp | 2 +- geometry.cpp | 16 ++++++++-------- kcmkwin/kwincompositing/ktimerdialog.cpp | 2 +- kcmkwin/kwincompositing/main.cpp | 2 +- kcmkwin/kwinoptions/mouse.cpp | 2 +- kcmkwin/kwinrules/detectwidget.cpp | 2 +- kcmkwin/kwinrules/ruleslist.cpp | 2 +- kcmkwin/kwinscreenedges/monitor.cpp | 2 +- kcmkwin/kwinscreenedges/screenpreviewwidget.cpp | 2 +- useractions.cpp | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/activation.cpp b/activation.cpp index 0fbcb5aeb1..cfad01a479 100644 --- a/activation.cpp +++ b/activation.cpp @@ -715,7 +715,7 @@ xcb_timestamp_t Client::readUserTimeMapTimestamp(const KStartupInfoId *asn_id, c bool session) const { xcb_timestamp_t time = info->userTime(); - //kDebug( 1212 ) << "User timestamp, initial:" << time; + //qDebug() << "User timestamp, initial:" << time; //^^ this deadlocks kwin --replace sometimes. // newer ASN timestamp always replaces user timestamp, unless user timestamp is 0 diff --git a/activities.cpp b/activities.cpp index 8bf1b90966..96f583323a 100644 --- a/activities.cpp +++ b/activities.cpp @@ -171,7 +171,7 @@ void Activities::reallyStop(const QString &id) continue; //TODO support old wm_command apps too? } - //kDebug() << sessionId; + //qDebug() << sessionId; //if it's on the activity that's closing, it needs saving //but if a process is on some other open activity, I don't wanna close it yet diff --git a/client.cpp b/client.cpp index 7ba49bc165..065b10fc34 100644 --- a/client.cpp +++ b/client.cpp @@ -1635,8 +1635,8 @@ void Client::takeActivity(int flags, bool handled) //if ( previous_activity_timestamp == xTime() && previous_client != this ) // { - // kDebug( 1212 ) << "Repeated use of the same X timestamp for activity"; - // kDebug( 1212 ) << kBacktrace(); + // qDebug() << "Repeated use of the same X timestamp for activity"; + // qDebug() << kBacktrace(); // } previous_activity_timestamp = xTime(); @@ -1657,8 +1657,8 @@ void Client::takeFocus() //if ( previous_focus_timestamp == xTime() && previous_client != this ) // { - // kDebug( 1212 ) << "Repeated use of the same X timestamp for focus"; - // kDebug( 1212 ) << kBacktrace(); + // qDebug() << "Repeated use of the same X timestamp for focus"; + // qDebug() << kBacktrace(); // } previous_focus_timestamp = xTime(); @@ -2376,13 +2376,13 @@ void Client::checkActivities() //otherwise, somebody else changed it. we need to validate before reacting QStringList allActivities = Activities::self()->all(); if (allActivities.isEmpty()) { - kDebug() << "no activities!?!?"; + qDebug() << "no activities!?!?"; //don't touch anything, there's probably something bad going on and we don't wanna make it worse return; } for (int i = 0; i < newActivitiesList.size(); ++i) { if (! allActivities.contains(newActivitiesList.at(i))) { - kDebug() << "invalid:" << newActivitiesList.at(i); + qDebug() << "invalid:" << newActivitiesList.at(i); newActivitiesList.removeAt(i--); } } diff --git a/clients/b2/b2client.cpp b/clients/b2/b2client.cpp index 97fd2d7901..077dccd31d 100644 --- a/clients/b2/b2client.cpp +++ b/clients/b2/b2client.cpp @@ -57,7 +57,7 @@ along with this program. If not, see . #include #include #include -#include +#include namespace B2 { diff --git a/events.cpp b/events.cpp index 1d64b49a16..cb003ffb3c 100644 --- a/events.cpp +++ b/events.cpp @@ -202,7 +202,7 @@ bool Workspace::workspaceEvent(xcb_generic_event_t *e) was_user_interaction = true; int keyQt; KKeyServer::xcbKeyPressEventToQt(reinterpret_cast(e), &keyQt); -// kDebug(125) << "Workspace::keyPress( " << keyQt << " )"; +// qDebug() << "Workspace::keyPress( " << keyQt << " )"; if (movingClient) { movingClient->keyPressEvent(keyQt); return true; diff --git a/geometry.cpp b/geometry.cpp index 3887bef5bd..637f8a5548 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -180,7 +180,7 @@ void Workspace::updateClientArea(bool force) for (int iS = 0; iS < nscreens; iS ++) { -// kDebug (1212) << "adjusting new_sarea: " << screens[ iS ]; +// qDebug() << "adjusting new_sarea: " << screens[ iS ]; new_sareas[(*it)->desktop()][ iS ] = new_sareas[(*it)->desktop()][ iS ].intersected( (*it)->adjustedClientArea(desktopArea, screens[ iS ])); @@ -917,19 +917,19 @@ QRect Client::adjustedClientArea(const QRect &desktopArea, const QRect& area) co stareaB.setBottom(qMin(stareaB.bottom(), screenarea.bottom())); if (stareaL . intersects(area)) { -// kDebug (1212) << "Moving left of: " << r << " to " << stareaL.right() + 1; +// qDebug() << "Moving left of: " << r << " to " << stareaL.right() + 1; r . setLeft(stareaL . right() + 1); } if (stareaR . intersects(area)) { -// kDebug (1212) << "Moving right of: " << r << " to " << stareaR.left() - 1; +// qDebug() << "Moving right of: " << r << " to " << stareaR.left() - 1; r . setRight(stareaR . left() - 1); } if (stareaT . intersects(area)) { -// kDebug (1212) << "Moving top of: " << r << " to " << stareaT.bottom() + 1; +// qDebug() << "Moving top of: " << r << " to " << stareaT.bottom() + 1; r . setTop(stareaT . bottom() + 1); } if (stareaB . intersects(area)) { -// kDebug (1212) << "Moving bottom of: " << r << " to " << stareaB.top() - 1; +// qDebug() << "Moving bottom of: " << r << " to " << stareaB.top() - 1; r . setBottom(stareaB . top() - 1); } return r; @@ -2443,7 +2443,7 @@ void Client::updateFullscreenMonitors(NETFullscreenMonitors topology) { int nscreens = screens()->count(); -// kDebug( 1212 ) << "incoming request with top: " << topology.top << " bottom: " << topology.bottom +// qDebug() << "incoming request with top: " << topology.top << " bottom: " << topology.bottom // << " left: " << topology.left << " right: " << topology.right // << ", we have: " << nscreens << " screens."; @@ -2475,9 +2475,9 @@ QRect Client::fullscreenMonitorsArea(NETFullscreenMonitors requestedTopology) co right = screens()->geometry(requestedTopology.right); total = top.united(bottom.united(left.united(right))); -// kDebug( 1212 ) << "top: " << top << " bottom: " << bottom +// qDebug() << "top: " << top << " bottom: " << bottom // << " left: " << left << " right: " << right; -// kDebug( 1212 ) << "returning rect: " << total; +// qDebug() << "returning rect: " << total; return total; } diff --git a/kcmkwin/kwincompositing/ktimerdialog.cpp b/kcmkwin/kwincompositing/ktimerdialog.cpp index e652d3fac1..7f821193ec 100644 --- a/kcmkwin/kwincompositing/ktimerdialog.cpp +++ b/kcmkwin/kwincompositing/ktimerdialog.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include "ktimerdialog.moc" diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp index 9013e8b269..e3fd0432cf 100644 --- a/kcmkwin/kwincompositing/main.cpp +++ b/kcmkwin/kwincompositing/main.cpp @@ -29,7 +29,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include #include diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp index 78e04eda18..012404a506 100644 --- a/kcmkwin/kwinoptions/mouse.cpp +++ b/kcmkwin/kwinoptions/mouse.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcmkwin/kwinrules/detectwidget.cpp b/kcmkwin/kwinrules/detectwidget.cpp index 19cfa331b9..1086fb41c6 100644 --- a/kcmkwin/kwinrules/detectwidget.cpp +++ b/kcmkwin/kwinrules/detectwidget.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcmkwin/kwinrules/ruleslist.cpp b/kcmkwin/kwinrules/ruleslist.cpp index d426e62002..842a22ab51 100644 --- a/kcmkwin/kwinrules/ruleslist.cpp +++ b/kcmkwin/kwinrules/ruleslist.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/kcmkwin/kwinscreenedges/monitor.cpp b/kcmkwin/kwinscreenedges/monitor.cpp index b9c5d625e8..98ea7abdb2 100644 --- a/kcmkwin/kwinscreenedges/monitor.cpp +++ b/kcmkwin/kwinscreenedges/monitor.cpp @@ -21,7 +21,7 @@ along with this program. If not, see . #include "monitor.h" -#include +#include #include #include #include diff --git a/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp b/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp index 15d04aa432..d9e5cd2ae4 100644 --- a/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp +++ b/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/useractions.cpp b/useractions.cpp index d150bd1dfe..90b0673005 100755 --- a/useractions.cpp +++ b/useractions.cpp @@ -450,7 +450,7 @@ void UserActionsMenu::showHideActivityMenu() { #ifdef KWIN_BUILD_ACTIVITIES const QStringList &openActivities_ = Activities::self()->running(); - kDebug() << "activities:" << openActivities_.size(); + qDebug() << "activities:" << openActivities_.size(); if (openActivities_.size() < 2) { delete m_activityMenu; m_activityMenu = 0;