From d8258866f42e4ebd9497198a86e4dffad93532ac Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 16 Mar 2013 12:19:54 +0100 Subject: [PATCH] Fix build in debug mode. It seems some plasma API has changed, so I just commented it out. It can be uncommented by someone who knows what to change it to. --- src/plasma/containment.cpp | 1 + src/plasma/corona.cpp | 4 ++-- src/plasma/private/containment_p.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plasma/containment.cpp b/src/plasma/containment.cpp index 654141694..6f975700d 100644 --- a/src/plasma/containment.cpp +++ b/src/plasma/containment.cpp @@ -37,6 +37,7 @@ #include #include +#include #include #include #include diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp index 4c05c8e89..09da4ac2e 100644 --- a/src/plasma/corona.cpp +++ b/src/plasma/corona.cpp @@ -502,7 +502,7 @@ QList CoronaPrivate::importLayout(const KConfigGroup &con containmentsIds.insert(c->id()); #ifndef NDEBUG - kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Restored Containment" << c->pluginName(); +// kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Restored Containment" << c->pluginName(); #endif } @@ -510,7 +510,7 @@ QList CoronaPrivate::importLayout(const KConfigGroup &con containment->updateConstraints(Plasma::StartupCompletedConstraint); emit q->containmentAdded(containment); #ifndef NDEBUG - kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Containment" << containment->name(); +// kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Containment" << containment->name(); #endif } diff --git a/src/plasma/private/containment_p.cpp b/src/plasma/private/containment_p.cpp index cc4d795e1..858a7aa58 100644 --- a/src/plasma/private/containment_p.cpp +++ b/src/plasma/private/containment_p.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -109,7 +110,7 @@ void ContainmentPrivate::setScreen(int newScreen) if (currently && currently != q) { #ifndef NDEBUG kDebug() << "currently is on screen" << currently->screen() - << "desktop" << currently->desktop() +// << "desktop" << currently->desktop() << "and is" << currently->activity() << (QObject*)currently << "i'm" << (QObject*)q; #endif