alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add ctor back in that got lost during the merge

Browse Source
This commit is contained in:
Sebastian Kügler 2013-07-30 21:31:12 +02:00
commit f034b84daf
82 changed files with 501 additions and 497 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/declarativeimports/core/datamodel.cpp
View File

@ -158,7 +158,7 @@ int SortFilterModel::mapRowToSource(int row) const
int SortFilterModel::mapRowFromSource(int row) const
{
if (!sourceModel()) {
kWarning() << "No source model defined!";
qWarning() << "No source model defined!";
return -1;
}
QModelIndex idx = sourceModel()->index(row, 0);
@ -239,7 +239,7 @@ void DataModel::setDataSource(QObject *object)
{
DataSource *source = qobject_cast<DataSource *>(object);
if (!source) {
kWarning() << "Error: DataSource type expected";
qWarning() << "Error: DataSource type expected";
return;
}
if (m_dataSource == source) {

4
src/declarativeimports/core/framesvgitem.cpp
View File

@ -21,7 +21,7 @@
#include <QPainter>
#include "kdebug.h"
#include "QDebug"
namespace Plasma
@ -31,7 +31,7 @@ FrameSvgItemMargins::FrameSvgItemMargins(Plasma::FrameSvg *frameSvg, QObject *pa
: QObject(parent),
m_frameSvg(frameSvg)
{
//kDebug() << "margins at: " << left() << top() << right() << bottom();
//qDebug() << "margins at: " << left() << top() << right() << bottom();
connect(m_frameSvg, SIGNAL(repaintNeeded()), this, SLOT(update()));
}

10
src/declarativeimports/core/runnermodel.cpp
View File

@ -87,7 +87,7 @@ void RunnerModel::setRunners(const QStringList &allowedRunners)
m_manager->setSingleMode(allowedRunners.count() == 1);
} else {
m_pendingRunnersList = allowedRunners;
kDebug() << "runners set" << m_pendingRunnersList.count();
// qDebug() << "runners set" << m_pendingRunnersList.count();
}
// to trigger single runner fun!
@ -117,7 +117,7 @@ QVariant RunnerModel::data(const QModelIndex &index, int role) const
if (!index.isValid() || index.parent().isValid() ||
index.column() > 0 || index.row() < 0 || index.row() >= m_matches.count()) {
// index requested must be valid, but we have no child items!
//kDebug() << "invalid index requested";
//qDebug() << "invalid index requested";
return QVariant();
}
@ -174,10 +174,10 @@ void RunnerModel::startQuery()
return;
}
//kDebug() << "!!!!!!!!!!!!!" << m_pendingQuery << m_manager;
//qDebug() << "!!!!!!!!!!!!!" << m_pendingQuery << m_manager;
if (createManager() || m_pendingQuery != m_manager->query()) {
//kDebug() << "running query" << m_pendingQuery << m_manager;
//qDebug() << "running query" << m_pendingQuery << m_manager;
m_manager->launchQuery(m_pendingQuery, m_singleRunnerId);
emit queryChanged();
m_running = true;
@ -207,7 +207,7 @@ bool RunnerModel::createManager()
void RunnerModel::matchesChanged(const QList<Plasma::QueryMatch> &matches)
{
//kDebug() << "got matches:" << matches.count();
//qDebug() << "got matches:" << matches.count();
bool fullReset = false;
int oldCount = m_matches.count();
int newCount = matches.count();

2
src/declarativeimports/core/svgitem.cpp
View File

@ -21,7 +21,7 @@
#include <QPainter>
#include "kdebug.h"
#include "QDebug"
#include "plasma/svg.h"
namespace Plasma

4
src/declarativeimports/dirmodel/dirmodel.cpp
View File

@ -169,7 +169,7 @@ void DirModel::delayedPreview()
if (list.size() > 0) {
KIO::PreviewJob* job = KIO::filePreview(list, m_screenshotSize);
job->setIgnoreMaximumSize(true);
kDebug() << "Created job" << job;
// qDebug() << "Created job" << job;
connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)),
this, SLOT(showPreview(KFileItem,QPixmap)));
connect(job, SIGNAL(failed(KFileItem)),
@ -189,7 +189,7 @@ void DirModel::showPreview(const KFileItem &item, const QPixmap &preview)
}
m_imageCache->insertImage(item.url().toString(), preview.toImage());
//kDebug() << "preview size:" << preview.size();
//qDebug() << "preview size:" << preview.size();
emit dataChanged(index, index);
}

2
src/declarativeimports/krunnermodel/runnermodelplugin.cpp
View File

@ -29,7 +29,7 @@
void RunnerModelPlugin::registerTypes(const char *uri)
{
kWarning() << "Using deprecated import org.kde.runnermodel, please port to org.kde.plasma.core";
qWarning() << "Using deprecated import org.kde.runnermodel, please port to org.kde.plasma.core";
Q_ASSERT(uri == QLatin1String("org.kde.runnermodel"));
qmlRegisterType<RunnerModel>(uri, 2, 0, "RunnerModel");
qmlRegisterInterface<Plasma::QueryMatch>("QueryMatch");

8
src/declarativeimports/locale/calendarsystem.cpp
View File

@ -80,9 +80,9 @@ bool CalendarSystem::isValid(const QDate &date) const
return m_calendarSystem->isValid(date);
}
QVariantHash CalendarSystem::getDate(const QDate date) const
QVariantMap CalendarSystem::getDate(const QDate date) const
{
QVariantHash hash;
QVariantMap hash;
int year;
int month;
@ -143,9 +143,9 @@ QDate CalendarSystem::addDays(const QDate &date, int numDays) const
return m_calendarSystem->addDays(date, numDays);
}
QVariantHash CalendarSystem::dateDifference(const QDate &fromDate, const QDate &toDate) const
QVariantMap CalendarSystem::dateDifference(const QDate &fromDate, const QDate &toDate) const
{
QVariantHash hash;
QVariantMap hash;
int yearsDiff;
int monthsDiff;

4
src/declarativeimports/locale/calendarsystem.h
View File

@ -252,7 +252,7 @@ public:
* ["day"] the day of the date
* @param date date to get year, month and day for
*/
Q_INVOKABLE QVariantHash getDate(const QDate date) const;
Q_INVOKABLE QVariantMap getDate(const QDate date) const;
/**
* Returns the year portion of a given date in the current calendar system
@ -355,7 +355,7 @@ public:
* @param fromDate The date to start from
* @param toDate The date to end at
*/
Q_INVOKABLE QVariantHash dateDifference(const QDate &fromDate, const QDate &toDate)const;
Q_INVOKABLE QVariantMap dateDifference(const QDate &fromDate, const QDate &toDate)const;
/**
* Returns the difference between two dates in completed calendar years.

6
src/declarativeimports/plasmacomponents/fullscreenwindow.cpp
View File

@ -137,13 +137,13 @@ void FullScreenWindow::init(const QString &componentName)
}
if (filePath.isEmpty()) {
kWarning() << "Component not found:" << componentName;
qWarning() << "Component not found:" << componentName;
return;
}
QDeclarativeEngine *engine = EngineBookKeeping::self()->engine();
if (!engine) {
kWarning() << "Warning, no QDeclarativeEngines available anymore, should never happen";
qWarning() << "Warning, no QDeclarativeEngines available anymore, should never happen";
Q_ASSERT(0);
}
QDeclarativeComponent *component = new QDeclarativeComponent(engine, filePath, this);
@ -151,7 +151,7 @@ void FullScreenWindow::init(const QString &componentName)
QDeclarativeContext *creationContext = component->creationContext();
m_rootObject = component->create(creationContext);
if (component->status() == QDeclarativeComponent::Error) {
kWarning()<<component->errors();
qWarning()<<component->errors();
}
if (m_rootObject) {

2
src/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
View File

@ -59,7 +59,7 @@ QQmlEngine *EngineBookKeeping::engine() const
{
//for components creation, any engine will do, as long is valid
if (m_engines.isEmpty()) {
kWarning() << "No engines found, this should never happen";
qWarning() << "No engines found, this should never happen";
return 0;
} else {
return m_engines.values().first();

2
src/declarativeimports/plasmaextracomponents/fallbackcomponent.cpp
View File

@ -60,7 +60,7 @@ QString FallbackComponent::filePath(const QString &key)
QString resolved;
foreach (const QString &path, m_candidates) {
kDebug() << "Searching for:" << path + path;
// qDebug() << "Searching for:" << path + path;
if (m_possiblePaths.contains(path + key)) {
resolved = *m_possiblePaths.object(path + key);
if (!resolved.isEmpty()) {

6
src/declarativeimports/plasmaextracomponents/resourceinstance.cpp
View File

@ -51,7 +51,7 @@ void ResourceInstance::syncWid()
if (!m_resourceInstance || m_resourceInstance->winId() != wid) {
delete m_resourceInstance;
kDebug() << "Creating a new instance of the resource" << m_uri << "window id" << wid;
// qDebug() << "Creating a new instance of the resource" << m_uri << "window id" << wid;
m_resourceInstance = new KActivities::ResourceInstance(wid, m_uri, m_mimetype, m_title);
} else {
@ -59,13 +59,13 @@ void ResourceInstance::syncWid()
const QString & oldPath = m_uri.path();
m_uri.setPath(oldPath.left(oldPath.length() - 1));
kDebug() << "Old and new path" << oldPath << m_uri;
// qDebug() << "Old and new path" << oldPath << m_uri;
} else {
m_resourceInstance->setUri(m_uri);
}
kDebug() << "Setting" << m_uri << m_mimetype << "to window" << wid;
// qDebug() << "Setting" << m_uri << m_mimetype << "to window" << wid;
m_resourceInstance->setMimetype(m_mimetype);
m_resourceInstance->setTitle(m_title);

4
src/declarativeimports/qtextracomponents/mouseeventlistener.cpp
View File

@ -179,7 +179,7 @@ bool MouseEventListener::childMouseEventFilter(QQuickItem *item, QEvent *event)
const QPointF myPos = item->mapToItem(this, me->pos());
KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers());
m_pressAndHoldEvent = new KDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers());
//kDebug() << "pressed in sceneEventFilter";
//qDebug() << "pressed in sceneEventFilter";
emit pressed(&dme);
m_pressed = true;
@ -190,7 +190,7 @@ bool MouseEventListener::childMouseEventFilter(QQuickItem *item, QEvent *event)
QMouseEvent *me = static_cast<QMouseEvent *>(event);
const QPointF myPos = item->mapToItem(this, me->pos());
KDeclarativeMouseEvent dme(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers());
//kDebug() << "positionChanged..." << dme.x() << dme.y();
//qDebug() << "positionChanged..." << dme.x() << dme.y();
m_pressAndHoldEvent = new KDeclarativeMouseEvent(myPos.x(), myPos.y(), me->screenPos().x(), me->screenPos().y(), me->button(), me->buttons(), me->modifiers());
emit positionChanged(&dme);
break;

6
src/kpart/plasmakpartcorona.cpp
View File

@ -63,7 +63,7 @@ void PlasmaKPartCorona::evaluateScripts(const QStringList &scripts)
QFile file(script);
if (file.open(QIODevice::ReadOnly | QIODevice::Text) ) {
QString code = file.readAll();
kDebug() << "evaluating startup script:" << script;
// qDebug() << "evaluating startup script:" << script;
scriptEngine.evaluateScript(code);
}
}
@ -71,12 +71,12 @@ void PlasmaKPartCorona::evaluateScripts(const QStringList &scripts)
void PlasmaKPartCorona::printScriptError(const QString &error)
{
kWarning() << "Startup script error:" << error;
qWarning() << "Startup script error:" << error;
}
void PlasmaKPartCorona::printScriptMessage(const QString &error)
{
kDebug() << "Startup script: " << error;
// qDebug() << "Startup script: " << error;
}
#include "plasmakpartcorona.moc"

2
src/kpart/plasmakpartview.cpp
View File

@ -76,7 +76,7 @@ void PlasmaKPartView::updateGeometry()
return;
}
kDebug() << "New containment geometry is" << c->geometry();
// qDebug() << "New containment geometry is" << c->geometry();
if (c->size().toSize() != size()) {
c->setMaximumSize(size());

30
src/kpart/scripting/scriptengine.cpp
View File

@ -122,13 +122,13 @@ QScriptValue ScriptEngine::loadTemplate(QScriptContext *context, QScriptEngine *
{
Q_UNUSED(engine)
if (context->argumentCount() == 0) {
kDebug() << "no arguments";
// qDebug() << "no arguments";
return false;
}
const QString layout = context->argument(0).toString();
if (layout.isEmpty() || layout.contains("'")) {
kDebug() << "layout is empty";
// qDebug() << "layout is empty";
return false;
}
@ -137,7 +137,7 @@ QScriptValue ScriptEngine::loadTemplate(QScriptContext *context, QScriptEngine *
KService::List offers = KServiceTypeTrader::self()->query("Plasma/LayoutTemplate", constraint);
if (offers.isEmpty()) {
kDebug() << "offers fail" << constraint;
// qDebug() << "offers fail" << constraint;
return false;
}
@ -147,26 +147,26 @@ QScriptValue ScriptEngine::loadTemplate(QScriptContext *context, QScriptEngine *
structure->defaultPackageRoot() + '/' + info.pluginName() + '/',
QStandardPaths::LocateDirectory);
if (path.isEmpty()) {
kDebug() << "script path is empty";
// qDebug() << "script path is empty";
return false;
}
Plasma::Package package(path, structure);
const QString scriptFile = package.filePath("mainscript");
if (scriptFile.isEmpty()) {
kDebug() << "scriptfile is empty";
// qDebug() << "scriptfile is empty";
return false;
}
QFile file(scriptFile);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
kWarning() << QString("Unable to load script file: %1").arg(path);
qWarning() << QString("Unable to load script file: %1").arg(path);
return false;
}
QString script = file.readAll();
if (script.isEmpty()) {
kDebug() << "script is empty";
// qDebug() << "script is empty";
return false;
}
@ -199,10 +199,10 @@ void ScriptEngine::setupEngine()
bool ScriptEngine::evaluateScript(const QString &script, const QString &path)
{
//kDebug() << "evaluating" << m_editor->toPlainText();
//qDebug() << "evaluating" << m_editor->toPlainText();
evaluate(script, path);
if (hasUncaughtException()) {
//kDebug() << "catch the exception!";
//qDebug() << "catch the exception!";
QString error = QString("Error: %1 at line %2\n\nBacktrace:\n%3").arg(
uncaughtException().toString(),
QString::number(uncaughtExceptionLineNumber()),
@ -216,7 +216,7 @@ bool ScriptEngine::evaluateScript(const QString &script, const QString &path)
void ScriptEngine::exception(const QScriptValue &value)
{
//kDebug() << "exception caught!" << value.toVariant();
//qDebug() << "exception caught!" << value.toVariant();
emit printError(value.toVariant().toString());
}
@ -227,7 +227,7 @@ QStringList ScriptEngine::pendingUpdateScripts()
QStringList scriptPaths;
if (scripts.isEmpty()) {
//kDebug() << "no update scripts";
//qDebug() << "no update scripts";
return scriptPaths;
}
@ -242,7 +242,7 @@ QStringList ScriptEngine::pendingUpdateScripts()
}
if (script.startsWith(localDir) || script.startsWith(localXdgDir)) {
kDebug() << "skipping user local script: " << script;
// qDebug() << "skipping user local script: " << script;
continue;
}
@ -262,7 +262,7 @@ QStringList ScriptEngine::defaultLayoutScripts()
QStringList scriptPaths;
if (scripts.isEmpty()) {
//kDebug() << "no javascript based layouts";
//qDebug() << "no javascript based layouts";
return scriptPaths;
}
@ -272,7 +272,7 @@ QStringList ScriptEngine::defaultLayoutScripts()
QSet<QString> scriptNames;
foreach (const QString &script, scripts) {
if (script.startsWith(localDir) || script.startsWith(localXdgDir)) {
kDebug() << "skipping user local script: " << script;
// qDebug() << "skipping user local script: " << script;
continue;
}
@ -325,7 +325,7 @@ QScriptValue ScriptEngine::addWidget(QScriptContext *context, QScriptEngine *eng
if (v.isNumber()) {
column = v.toUInt16();
}
kDebug() << "Calculated position as" << row << column;
// qDebug() << "Calculated position as" << row << column;
}
QScriptValue v = context->argument(0);

2
src/plasma/CMakeLists.txt
View File

@ -147,6 +147,8 @@ target_link_libraries(plasma
${KWindowSystem_LIBRARIES}
${PLASMA_EXTRA_LIBS}
KF5::KI18n
KF5::KDE4Attic
${KDE4Attic_LIBRARIES}
${KDE4Support_LIBRARIES} # needed for KStandardDirs and KGlobal
)
#FIXME gpgme++ is in kdepimlibs, needs to be elsewhere

12
src/plasma/abstractrunner.cpp
View File

@ -27,7 +27,7 @@
#include <QMutexLocker>
#include <QTimer>
#include <kdebug.h>
#include <QDebug>
#include <kplugininfo.h>
#include <kservicetypetrader.h>
#include <kstandarddirs.h>
@ -144,7 +144,7 @@ void AbstractRunner::performMatch(Plasma::RunnerContext &localContext)
// we punish runners that return too slowly, even if they don't bring
// back matches
#ifndef NDEBUG
kDebug() << id() << "runner is too slow, putting it on the back burner.";
// qDebug() << id() << "runner is too slow, putting it on the back burner.";
#endif
d->fastRuns = 0;
setSpeed(SlowSpeed);
@ -157,7 +157,7 @@ void AbstractRunner::performMatch(Plasma::RunnerContext &localContext)
// we reward slowed runners who bring back matches fast enough
// 3 times in a row
#ifndef NDEBUG
kDebug() << id() << "runner is faster than we thought, kicking it up a notch";
// qDebug() << id() << "runner is faster than we thought, kicking it up a notch";
#endif
setSpeed(NormalSpeed);
}
@ -390,7 +390,7 @@ void AbstractRunnerPrivate::init(const KService::Ptr service)
prepScripting(path, api);
if (!script) {
#ifndef NDEBUG
kDebug() << "Could not create a(n)" << api << "ScriptEngine for the" << runnerDescription.name() << "Runner.";
// qDebug() << "Could not create a(n)" << api << "ScriptEngine for the" << runnerDescription.name() << "Runner.";
#endif
}
}
@ -422,7 +422,7 @@ void AbstractRunnerPrivate::prepScripting(const QString &path, const QString &ap
if (!package->isValid()) {
#ifndef NDEBUG
kDebug() << "Invalid Runner package at" << path;
// qDebug() << "Invalid Runner package at" << path;
#endif
return;
}
@ -443,7 +443,7 @@ void AbstractRunnerPrivate::setupScriptSupport()
}
#ifndef NDEBUG
kDebug() << "setting up script support, package is in" << package->path()
// qDebug() << "setting up script support, package is in" << package->path()
<< ", main script is" << package->filePath("mainscript");
#endif

14
src/plasma/applet.cpp
View File

@ -36,7 +36,7 @@
#include <kcoreauthorized.h>
#include <kcolorscheme.h>
#include <kdesktopfile.h>
#include <kdebug.h>
#include <QDebug>
#include <kglobalaccel.h>
#include <kplugininfo.h>
#include <klocalizedstring.h>
@ -142,7 +142,7 @@ void Applet::save(KConfigGroup &g) const
group = *d->mainConfigGroup();
}
//kDebug() << "saving" << pluginName() << "to" << group.name();
//qDebug() << "saving" << pluginName() << "to" << group.name();
// we call the dptr member directly for locked since isImmutable()
// also checks kiosk and parent containers
group.writeEntry("immutability", (int)d->immutability);
@ -175,10 +175,10 @@ void Applet::restore(KConfigGroup &group)
setGlobalShortcut(QKeySequence(shortcutText));
/*
#ifndef NDEBUG
kDebug() << "got global shortcut for" << name() << "of" << QKeySequence(shortcutText);
// qDebug() << "got global shortcut for" << name() << "of" << QKeySequence(shortcutText);
#endif
#ifndef NDEBUG
kDebug() << "set to" << d->activationAction->objectName()
// qDebug() << "set to" << d->activationAction->objectName()
#endif
<< d->activationAction->globalShortcut().primary();
*/
@ -305,7 +305,7 @@ void Applet::constraintsEvent(Plasma::Types::Constraints constraints)
// without calling the Applet:: version as well, which it shouldn't need to.
// INSTEAD put such code into flushPendingConstraintsEvents
Q_UNUSED(constraints)
//kDebug() << constraints << "constraints are FormFactor: " << formFactor()
//qDebug() << constraints << "constraints are FormFactor: " << formFactor()
// << ", Location: " << location();
if (d->script) {
d->script->constraintsEvent(constraints);
@ -430,7 +430,7 @@ void Applet::flushPendingConstraintsEvents()
d->constraintsTimer.stop();
}
//kDebug() << "fushing constraints: " << d->pendingConstraints << "!!!!!!!!!!!!!!!!!!!!!!!!!!!";
//qDebug() << "fushing constraints: " << d->pendingConstraints << "!!!!!!!!!!!!!!!!!!!!!!!!!!!";
Plasma::Types::Constraints c = d->pendingConstraints;
d->pendingConstraints = Types::NoConstraint;
@ -508,7 +508,7 @@ void Applet::flushPendingConstraintsEvents()
QList<QAction*> Applet::contextualActions()
{
//kDebug() << "empty context actions";
//qDebug() << "empty context actions";
return d->script ? d->script->contextualActions() : QList<QAction*>();
}

2
src/plasma/autotests/packagestructuretest.cpp
View File

@ -21,7 +21,7 @@
#include <kconfig.h>
#include <kconfiggroup.h>
#include <kdebug.h>
#include <QDebug>
#include <klocalizedstring.h>
#include "applet.h"

24
src/plasma/autotests/plasmoidpackagetest.cpp
View File

@ -26,7 +26,7 @@
#include <kjob.h>
#include <QStandardPaths>
#include <kdebug.h>
#include <QDebug>
#include "applet.h"
#include "pluginloader.h"
@ -38,7 +38,7 @@ void PlasmoidPackageTest::initTestCase()
void PlasmoidPackageTest::init()
{
kDebug() << "PlasmoidPackage::init()";
qDebug() << "PlasmoidPackage::init()";
m_package = QString("Package");
m_packageRoot = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/packageRoot";
m_defaultPackage = Plasma::PluginLoader::self()->loadPackage("Plasma/Applet");
@ -47,14 +47,14 @@ void PlasmoidPackageTest::init()
void PlasmoidPackageTest::cleanup()
{
kDebug() << "cleaning up";
qDebug() << "cleaning up";
// Clean things up.
QDir(m_packageRoot).removeRecursively();
}
void PlasmoidPackageTest::createTestPackage(const QString &packageName)
{
kDebug() << "Create test package" << m_packageRoot;
qDebug() << "Create test package" << m_packageRoot;
QDir pRoot(m_packageRoot);
// Create the root and package dir.
if (!pRoot.exists()) {
@ -63,7 +63,7 @@ void PlasmoidPackageTest::createTestPackage(const QString &packageName)
// Create the package dir
QVERIFY(QDir().mkpath(m_packageRoot + "/" + packageName));
kDebug() << "Created" << (m_packageRoot + "/" + packageName);
qDebug() << "Created" << (m_packageRoot + "/" + packageName);
// Create the metadata.desktop file
QFile file(m_packageRoot + "/" + packageName + "/metadata.desktop");
@ -77,7 +77,7 @@ void PlasmoidPackageTest::createTestPackage(const QString &packageName)
file.flush();
file.close();
kDebug() << "OUT: " << packageName;
qDebug() << "OUT: " << packageName;
// Create the ui dir.
QVERIFY(QDir().mkpath(m_packageRoot + "/" + packageName + "/contents/ui"));
@ -91,7 +91,7 @@ void PlasmoidPackageTest::createTestPackage(const QString &packageName)
file.close();
kDebug() << "THIS IS A PLASMOID SCRIPT THING";
qDebug() << "THIS IS A PLASMOID SCRIPT THING";
// Now we have a minimal plasmoid package which is valid. Let's add some
// files to it for test purposes.
@ -244,8 +244,8 @@ void PlasmoidPackageTest::entryList()
void PlasmoidPackageTest::createAndInstallPackage()
{
kDebug() << " ";
kDebug() << " CreateAndInstall ";
qDebug() << " ";
qDebug() << " CreateAndInstall ";
createTestPackage("plasmoid_to_package");
const QString packagePath = m_packageRoot + '/' + "testpackage.plasmoid";
@ -271,7 +271,7 @@ void PlasmoidPackageTest::createAndInstallPackage()
m_defaultPackageStructure = new Plasma::PackageStructure(this);
Plasma::Package *p = new Plasma::Package(m_defaultPackageStructure);
kDebug() << "Installing " << archivePath;
qDebug() << "Installing " << archivePath;
//const QString packageRoot = "plasma/plasmoids/";
//const QString servicePrefix = "plasma-applet-";
KJob* job = p->install(archivePath, m_packageRoot);
@ -283,7 +283,7 @@ void PlasmoidPackageTest::createAndInstallPackage()
void PlasmoidPackageTest::packageInstalled(KJob* j)
{
kDebug() << "!!!!!!!!!!!!!!!!!!!! package installed" << (j->error() == KJob::NoError);
qDebug() << "!!!!!!!!!!!!!!!!!!!! package installed" << (j->error() == KJob::NoError);
QVERIFY(j->error() == KJob::NoError);
//QVERIFY(p->path());
@ -296,7 +296,7 @@ void PlasmoidPackageTest::packageInstalled(KJob* j)
void PlasmoidPackageTest::packageUninstalled(KJob* j)
{
kDebug() << "!!!!!!!!!!!!!!!!!!!!! package uninstalled";
qDebug() << "!!!!!!!!!!!!!!!!!!!!! package uninstalled";
QVERIFY(j->error() == KJob::NoError);
}

8
src/plasma/configloader.cpp
View File

@ -29,7 +29,7 @@
#include <QXmlSimpleReader>
#include <QUrl>
#include <kdebug.h>
#include <QDebug>
namespace Plasma
{
@ -62,7 +62,7 @@ bool ConfigLoaderHandler::startElement(const QString &namespaceURI, const QStrin
Q_UNUSED(namespaceURI)
Q_UNUSED(qName)
// kDebug() << "ConfigLoaderHandler::startElement(" << localName << qName;
// qDebug() << "ConfigLoaderHandler::startElement(" << localName << qName;
int numAttrs = attrs.count();
QString tag = localName.toLower();
if (tag == "group") {
@ -70,7 +70,7 @@ bool ConfigLoaderHandler::startElement(const QString &namespaceURI, const QStrin
for (int i = 0; i < numAttrs; ++i) {
QString name = attrs.localName(i).toLower();
if (name == "name") {
//kDebug() << "set group to" << attrs.value(i);
//qDebug() << "set group to" << attrs.value(i);
group = attrs.value(i);
}
}
@ -160,7 +160,7 @@ bool ConfigLoaderHandler::endElement(const QString &namespaceURI,
Q_UNUSED(namespaceURI)
Q_UNUSED(qName)
// kDebug() << "ConfigLoaderHandler::endElement(" << localName << qName;
// qDebug() << "ConfigLoaderHandler::endElement(" << localName << qName;
const QString tag = localName.toLower();
if (tag == "entry") {
addItem();

30
src/plasma/containment.cpp
View File

@ -36,7 +36,7 @@
#include <qtemporaryfile.h>
#include <qmimedatabase.h>
#include <kdebug.h>
#include <QDebug>
#include <kcoreauthorized.h>
#include <klocalizedstring.h>
#include <kservicetypetrader.h>
@ -165,11 +165,11 @@ void Containment::restore(KConfigGroup &group)
{
/*
#ifndef NDEBUG
kDebug() << "!!!!!!!!!!!!initConstraints" << group.name() << d->type;
kDebug() << " location:" << group.readEntry("location", (int)d->location);
kDebug() << " geom:" << group.readEntry("geometry", geometry());
kDebug() << " formfactor:" << group.readEntry("formfactor", (int)d->formFactor);
kDebug() << " screen:" << group.readEntry("screen", d->screen);
// qDebug() << "!!!!!!!!!!!!initConstraints" << group.name() << d->type;
// qDebug() << " location:" << group.readEntry("location", (int)d->location);
// qDebug() << " geom:" << group.readEntry("geometry", geometry());
// qDebug() << " formfactor:" << group.readEntry("formfactor", (int)d->formFactor);
// qDebug() << " screen:" << group.readEntry("screen", d->screen);
#endif
*/
if (!isContainment()) {
@ -179,7 +179,7 @@ void Containment::restore(KConfigGroup &group)
setLocation((Plasma::Types::Location)group.readEntry("location", (int)d->location));
setFormFactor((Plasma::Types::FormFactor)group.readEntry("formfactor", (int)d->formFactor));
//kDebug() << "setScreen from restore";
//qDebug() << "setScreen from restore";
d->setScreen(group.readEntry("screen", d->screen));
d->activityId = group.readEntry("activityId", QString());
@ -193,10 +193,10 @@ void Containment::restore(KConfigGroup &group)
cfg = KConfigGroup(&cfg, QString::number(containmentType()));
//kDebug() << cfg.keyList();
//qDebug() << cfg.keyList();
if (cfg.exists()) {
foreach (const QString &key, cfg.keyList()) {
//kDebug() << "loading" << key;
//qDebug() << "loading" << key;
addContainmentActions(key, cfg.readEntry(key, QString()));
}
} else { //shell defaults
@ -210,14 +210,14 @@ void Containment::restore(KConfigGroup &group)
defaultActionsCfg = KConfigGroup(&defaultActionsCfg, "ContainmentActions");
foreach (const QString &key, defaultActionsCfg.keyList()) {
//kDebug() << "loading" << key;
//qDebug() << "loading" << key;
addContainmentActions(key, cfg.readEntry(key, QString()));
}
}
/*
#ifndef NDEBUG
kDebug() << "Containment" << id() <<
// qDebug() << "Containment" << id() <<
#endif
"screen" << screen() <<
"geometry is" << geometry() <<
@ -270,7 +270,7 @@ void Containment::restoreContents(KConfigGroup &group)
// are added from left to right or top to bottom for a panel containment
QList<KConfigGroup> appletConfigs;
foreach (const QString &appletGroup, applets.groupList()) {
//kDebug() << "reading from applet group" << appletGroup;
//qDebug() << "reading from applet group" << appletGroup;
KConfigGroup appletConfig(&applets, appletGroup);
appletConfigs.append(appletConfig);
}
@ -315,7 +315,7 @@ void Containment::setFormFactor(Types::FormFactor formFactor)
return;
}
//kDebug() << "switching FF to " << formFactor;
//qDebug() << "switching FF to " << formFactor;
d->formFactor = formFactor;
updateConstraints(Plasma::Types::FormFactorConstraint);
@ -359,14 +359,14 @@ void Containment::addApplet(Applet *applet)
if (!applet) {
#ifndef NDEBUG
kDebug() << "adding null applet!?!";
// qDebug() << "adding null applet!?!";
#endif
return;
}
if (d->applets.contains(applet)) {
#ifndef NDEBUG
kDebug() << "already have this applet!";
// qDebug() << "already have this applet!";
#endif
}

2
src/plasma/containmentactions.cpp
View File

@ -31,7 +31,7 @@
#include <QMouseEvent>
#include <QWheelEvent>
#include <kdebug.h>
#include <QDebug>
#include <klocalizedstring.h>
#include <kservicetypetrader.h>

18
src/plasma/corona.cpp
View File

@ -31,7 +31,7 @@
#include <cmath>
#include <kdebug.h>
#include <QDebug>
#include <kiconloader.h>
#include <klocalizedstring.h>
#include <kwindowsystem.h>
@ -51,7 +51,7 @@ Corona::Corona(QObject *parent)
d(new CoronaPrivate(this))
{
#ifndef NDEBUG
kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Corona ctor start";
// qDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Corona ctor start";
#endif
d->init();
//setViewport(new QGLWidget(QGLFormat(QGL::StencilBuffer | QGL::AlphaChannel)));
@ -224,7 +224,7 @@ void Corona::setImmutability(const Types::ImmutabilityType immutable)
}
#ifndef NDEBUG
kDebug() << "setting immutability to" << immutable;
// qDebug() << "setting immutability to" << immutable;
#endif
d->immutability = immutable;
d->updateContainmentImmutability();
@ -379,7 +379,7 @@ Containment *CoronaPrivate::addContainment(const QString &name, const QVariantLi
Containment *containment = 0;
Applet *applet = 0;
kDebug() << "Loading" << name << args << id;
// qDebug() << "Loading" << name << args << id;
if (pluginName.isEmpty() || pluginName == "default") {
// default to the desktop containment
@ -398,7 +398,7 @@ Containment *CoronaPrivate::addContainment(const QString &name, const QVariantLi
if (!containment) {
if (!loadingNull) {
#ifndef NDEBUG
kDebug() << "loading of containment" << name << "failed.";
// qDebug() << "loading of containment" << name << "failed.";
#endif
}
@ -488,9 +488,9 @@ QList<Plasma::Containment *> CoronaPrivate::importLayout(const KConfigGroup &con
containmentConfig.copyTo(&realConf);
}
//kDebug() << "got a containment in the config, trying to make a" << containmentConfig.readEntry("plugin", QString()) << "from" << group;
//qDebug() << "got a containment in the config, trying to make a" << containmentConfig.readEntry("plugin", QString()) << "from" << group;
#ifndef NDEBUG
kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Adding Containment" << containmentConfig.readEntry("plugin", QString());
// qDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Adding Containment" << containmentConfig.readEntry("plugin", QString());
#endif
Containment *c = addContainment(containmentConfig.readEntry("plugin", QString()), QVariantList(), cid);
if (!c) {
@ -501,14 +501,14 @@ QList<Plasma::Containment *> CoronaPrivate::importLayout(const KConfigGroup &con
containmentsIds.insert(c->id());
#ifndef NDEBUG
// kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Restored Containment" << c->pluginName();
// qDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Restored Containment" << c->pluginName();
#endif
}
foreach (Containment *containment, newContainments) {
emit q->containmentAdded(containment);
#ifndef NDEBUG
// kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Containment" << containment->name();
// qDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Containment" << containment->name();
#endif
}

20
src/plasma/datacontainer.cpp
View File

@ -20,7 +20,7 @@
#include "private/datacontainer_p.h"
#include "private/storage_p.h"
#include <kdebug.h>
#include <QDebug>
#include "plasma.h"
@ -85,7 +85,7 @@ bool DataContainer::visualizationIsConnected(QObject *visualization) const
void DataContainer::connectVisualization(QObject *visualization, uint pollingInterval,
Plasma::Types::IntervalAlignment alignment)
{
//kDebug() << "connecting visualization" << visualization << "at interval of"
//qDebug() << "connecting visualization" << visualization << "at interval of"
// << pollingInterval << "to" << objectName();
QMap<QObject *, SignalRelay *>::iterator objIt = d->relayObjects.find(visualization);
bool connected = objIt != d->relayObjects.end();
@ -95,15 +95,15 @@ void DataContainer::connectVisualization(QObject *visualization, uint pollingInt
SignalRelay *relay = objIt.value();
if (relay) {
// connected to a relay
//kDebug() << " already connected, but to a relay";
//qDebug() << " already connected, but to a relay";
if (relay->m_interval == pollingInterval) {
//kDebug() << " already connected to a relay of the same interval of"
//qDebug() << " already connected to a relay of the same interval of"
// << pollingInterval << ", nothing to do";
return;
}
if (relay->receiverCount() == 1) {
//kDebug() << " removing relay, as it is now unused";
//qDebug() << " removing relay, as it is now unused";
d->relays.remove(relay->m_interval);
delete relay;
} else {
@ -115,7 +115,7 @@ void DataContainer::connectVisualization(QObject *visualization, uint pollingInt
// the visualization was connected already, but not to a relay
// and it still doesn't want to connect to a relay, so we have
// nothing to do!
//kDebug() << " already connected, nothing to do";
//qDebug() << " already connected, nothing to do";
return;
} else {
disconnect(this, SIGNAL(dataUpdated(QString,Plasma::DataEngine::Data)),
@ -127,12 +127,12 @@ void DataContainer::connectVisualization(QObject *visualization, uint pollingInt
}
if (pollingInterval < 1) {
//kDebug() << " connecting directly";
//qDebug() << " connecting directly";
d->relayObjects[visualization] = 0;
connect(this, SIGNAL(dataUpdated(QString,Plasma::DataEngine::Data)),
visualization, SLOT(dataUpdated(QString,Plasma::DataEngine::Data)));
} else {
//kDebug() << " connecting to a relay";
//qDebug() << " connecting to a relay";
// we only want to do an imediate update if this is not the first object to connect to us
// if it is the first visualization, then the source will already have been populated
// engine's sourceRequested method
@ -289,7 +289,7 @@ void DataContainer::disconnectVisualization(QObject *visualization)
void DataContainer::checkForUpdate()
{
//kDebug() << objectName() << d->dirty;
//qDebug() << objectName() << d->dirty;
if (d->dirty) {
emit dataUpdated(objectName(), d->data);
@ -343,7 +343,7 @@ void DataContainer::timerEvent(QTimerEvent * event)
if (event->timerId() == d->checkUsageTimer.timerId()) {
if (!isUsed()) {
// DO NOT CALL ANYTHING AFTER THIS LINE AS IT MAY GET DELETED!
//kDebug() << objectName() << "is unused";
//qDebug() << objectName() << "is unused";
emit becameUnused(objectName());
}
d->checkUsageTimer.stop();

40
src/plasma/dataengine.cpp
View File

@ -27,7 +27,7 @@
#include <QTimerEvent>
#include <QVariant>
#include <kdebug.h>
#include <QDebug>
#include <kplugininfo.h>
#include <kglobal.h>
#include <kservice.h>
@ -74,7 +74,7 @@ DataEngine::DataEngine(QObject* parent, const QVariantList &args)
DataEngine::~DataEngine()
{
//kDebug() << objectName() << ": bye bye birdy! ";
//qDebug() << objectName() << ": bye bye birdy! ";
delete d;
}
@ -108,7 +108,7 @@ void DataEngine::connectSource(const QString &source, QObject *visualization,
uint pollingInterval,
Plasma::Types::IntervalAlignment intervalAlignment) const
{
//kDebug() << "connectSource" << source;
//qDebug() << "connectSource" << source;
bool newSource;
DataContainer *s = d->requestSource(source, &newSource);
@ -122,7 +122,7 @@ void DataEngine::connectSource(const QString &source, QObject *visualization,
}
d->connectSource(s, visualization, pollingInterval, intervalAlignment,
!newSource || pollingInterval > 0);
//kDebug() << " ==> source connected";
//qDebug() << " ==> source connected";
}
}
@ -162,7 +162,7 @@ bool DataEngine::updateSourceEvent(const QString &source)
if (d->script) {
return d->script->updateSourceEvent(source);
} else {
//kDebug() << source;
//qDebug() << source;
return false; //TODO: should this be true to trigger, even needless, updates on every tick?
}
}
@ -234,7 +234,7 @@ void DataEngine::addSource(DataContainer *source)
{
if (d->sources.contains(source->objectName())) {
#ifndef NDEBUG
kDebug() << "source named \"" << source->objectName() << "\" already exists.";
// qDebug() << "source named \"" << source->objectName() << "\" already exists.";
#endif
return;
}
@ -316,17 +316,17 @@ QHash<QString, DataContainer*> DataEngine::containerDict() const
void DataEngine::timerEvent(QTimerEvent *event)
{
//kDebug();
//qDebug();
if (event->timerId() == d->updateTimerId) {
// if the freq update is less than 0, don't bother
if (d->minPollingInterval < 0) {
//kDebug() << "uh oh.. no polling allowed!";
//qDebug() << "uh oh.. no polling allowed!";
return;
}
// minPollingInterval
if (d->updateTimestamp.elapsed() < d->minPollingInterval) {
//kDebug() << "hey now.. slow down!";
//qDebug() << "hey now.. slow down!";
return;
}
@ -351,7 +351,7 @@ void DataEngine::updateAllSources()
QHashIterator<QString, Plasma::DataContainer*> it(d->sources);
while (it.hasNext()) {
it.next();
//kDebug() << "updating" << it.key();
//qDebug() << "updating" << it.key();
updateSourceEvent(it.key());
}
@ -415,7 +415,7 @@ DataEnginePrivate::DataEnginePrivate(DataEngine *e, const KPluginInfo &info)
if (!script) {
#ifndef NDEBUG
kDebug() << "Could not create a" << api << "ScriptEngine for the"
// qDebug() << "Could not create a" << api << "ScriptEngine for the"
<< dataEngineDescription.name() << "DataEngine.";
#endif
delete package;
@ -438,7 +438,7 @@ void DataEnginePrivate::internalUpdateSource(DataContainer *source)
if (minPollingInterval > 0 &&
source->timeSinceLastUpdate() < (uint)minPollingInterval) {
// skip updating this source; it's been too soon
//kDebug() << "internal update source is delaying" << source->timeSinceLastUpdate() << minPollingInterval;
//qDebug() << "internal update source is delaying" << source->timeSinceLastUpdate() << minPollingInterval;
//but fake an update so that the signalrelay that triggered this gets the data from the
//recent update. this way we don't have to worry about queuing - the relay will send a
//signal immediately and everyone else is undisturbed.
@ -447,11 +447,11 @@ void DataEnginePrivate::internalUpdateSource(DataContainer *source)
}
if (q->updateSourceEvent(source->objectName())) {
//kDebug() << "queuing an update";
//qDebug() << "queuing an update";
scheduleSourcesUpdated();
}/* else {
#ifndef NDEBUG
kDebug() << "no update";
// qDebug() << "no update";
#endif
}*/
}
@ -483,7 +483,7 @@ DataContainer *DataEnginePrivate::source(const QString &sourceName, bool createW
return 0;
}
//kDebug() << "DataEngine " << q->objectName() << ": could not find DataContainer " << sourceName << ", creating";
//qDebug() << "DataEngine " << q->objectName() << ": could not find DataContainer " << sourceName << ", creating";
DataContainer *s = new DataContainer(q);
s->setObjectName(sourceName);
sources.insert(sourceName, s);
@ -499,7 +499,7 @@ void DataEnginePrivate::connectSource(DataContainer *s, QObject *visualization,
Plasma::Types::IntervalAlignment align,
bool immediateCall)
{
//kDebug() << "connect source called" << s->objectName() << "with interval" << pollingInterval;
//qDebug() << "connect source called" << s->objectName() << "with interval" << pollingInterval;
if (pollingInterval > 0) {
// never more frequently than allowed, never more than 20 times per second
@ -513,7 +513,7 @@ void DataEnginePrivate::connectSource(DataContainer *s, QObject *visualization,
if (immediateCall) {
// we don't want to do an immediate call if we are simply
// reconnecting
//kDebug() << "immediate call requested, we have:" << s->visualizationIsConnected(visualization);
//qDebug() << "immediate call requested, we have:" << s->visualizationIsConnected(visualization);
immediateCall = !s->data().isEmpty() &&
!s->visualizationIsConnected(visualization);
}
@ -547,12 +547,12 @@ DataContainer *DataEnginePrivate::requestSource(const QString &sourceName, bool
*newSource = false;
}
//kDebug() << "requesting source " << sourceName;
//qDebug() << "requesting source " << sourceName;
DataContainer *s = source(sourceName, false);
if (!s) {
// we didn't find a data source, so give the engine an opportunity to make one
/*kDebug() << "DataEngine " << q->objectName()
/*// qDebug() << "DataEngine " << q->objectName()
<< ": could not find DataContainer " << sourceName
<< " will create on request" << endl;*/
waitingSourceRequest = sourceName;
@ -584,7 +584,7 @@ void DataEnginePrivate::setupScriptSupport()
/*
#ifndef NDEBUG
kDebug() << "sletting up script support, package is in" << package->path()
// qDebug() << "sletting up script support, package is in" << package->path()
#endif
<< "which is a" << package->structure()->type() << "package"
<< ", main script is" << package->filePath("mainscript");

16
src/plasma/dataengineconsumer.cpp
View File

@ -25,7 +25,7 @@
#include <QSet>
#include <qurlpathinfo.h>
#include <kdebug.h>
#include <QDebug>
#include "private/dataenginemanager_p.h"
#include "servicejob.h"
@ -36,36 +36,36 @@ namespace Plasma
void DataEngineConsumerPrivate::slotJobFinished(Plasma::ServiceJob *job)
{
#ifndef NDEBUG
kDebug() << "engine ready!";
// qDebug() << "engine ready!";
#endif
QString engineName = job->parameters()["EngineName"].toString();
QString location = job->destination();
QPair<QString, QString> pair(location, engineName);
#ifndef NDEBUG
kDebug() << "pair = " << pair;
// qDebug() << "pair = " << pair;
#endif
}
void DataEngineConsumerPrivate::slotServiceReady(Plasma::Service *plasmoidService)
{
#ifndef NDEBUG
kDebug() << "service ready!";
// qDebug() << "service ready!";
#endif
if (!engineNameForService.contains(plasmoidService)) {
#ifndef NDEBUG
kDebug() << "no engine name for service!";
// qDebug() << "no engine name for service!";
#endif
#ifndef NDEBUG
kDebug() << "amount of services in map: " << engineNameForService.count();
// qDebug() << "amount of services in map: " << engineNameForService.count();
#endif
} else {
#ifndef NDEBUG
kDebug() << "value = " << engineNameForService.value(plasmoidService);
// qDebug() << "value = " << engineNameForService.value(plasmoidService);
#endif
}
#ifndef NDEBUG
kDebug() << "requesting dataengine!";
// qDebug() << "requesting dataengine!";
#endif
QVariantMap op = plasmoidService->operationDescription("DataEngine");
op["EngineName"] = engineNameForService.value(plasmoidService);

48
src/plasma/framesvg.cpp
View File

@ -30,7 +30,7 @@
#include <QStringBuilder>
#include <QTimer>
#include <kdebug.h>
#include <QDebug>
#include <theme.h>
#include <private/svg_p.h>
@ -129,10 +129,10 @@ void FrameSvg::setEnabledBorders(const EnabledBorders borders)
const QString newKey = d->cacheId(fd, d->prefix);
fd->enabledBorders = oldBorders;
//kDebug() << "looking for" << newKey;
//qDebug() << "looking for" << newKey;
FrameData *newFd = FrameSvgPrivate::s_sharedFrames.value(newKey);
if (newFd) {
//kDebug() << "FOUND IT!" << newFd->refcount;
//qDebug() << "FOUND IT!" << newFd->refcount;
// we've found a math, so insert that new one and ref it ..
newFd->ref(this);
d->frames.insert(d->prefix, newFd);
@ -140,7 +140,7 @@ void FrameSvg::setEnabledBorders(const EnabledBorders borders)
//.. then deref the old one and if it's no longer used, get rid of it
if (fd->deref(this)) {
//const QString oldKey = d->cacheId(fd, d->prefix);
//kDebug() << "1. Removing it" << oldKey << fd->refcount;
//qDebug() << "1. Removing it" << oldKey << fd->refcount;
FrameSvgPrivate::s_sharedFrames.remove(oldKey);
delete fd;
}
@ -244,7 +244,7 @@ void FrameSvg::setElementPrefix(const QString &prefix)
// we have to cache after inserting the frame since the cacheId requires the
// frame to be in the frames collection already
const QString key = d->cacheId(oldFrameData, d->prefix);
//kDebug() << this << " 1. inserting as" << key;
//qDebug() << this << " 1. inserting as" << key;
FrameSvgPrivate::s_sharedFrames.insert(key, newFd);
}
@ -321,7 +321,7 @@ void FrameSvg::resizeFrame(const QSizeF &size)
if (size.isEmpty()) {
#ifndef NDEBUG
kDebug() << "Invalid size" << size;
// qDebug() << "Invalid size" << size;
#endif
return;
}
@ -337,10 +337,10 @@ void FrameSvg::resizeFrame(const QSizeF &size)
const QString newKey = d->cacheId(fd, d->prefix);
fd->frameSize = currentSize;
//kDebug() << "looking for" << newKey;
//qDebug() << "looking for" << newKey;
FrameData *newFd = FrameSvgPrivate::s_sharedFrames.value(newKey);
if (newFd) {
//kDebug() << "FOUND IT!" << newFd->refcount;
//qDebug() << "FOUND IT!" << newFd->refcount;
// we've found a math, so insert that new one and ref it ..
newFd->ref(this);
d->frames.insert(d->prefix, newFd);
@ -348,7 +348,7 @@ void FrameSvg::resizeFrame(const QSizeF &size)
//.. then deref the old one and if it's no longer used, get rid of it
if (fd->deref(this)) {
//const QString oldKey = d->cacheId(fd, d->prefix);
//kDebug() << "1. Removing it" << oldKey << fd->refcount;
//qDebug() << "1. Removing it" << oldKey << fd->refcount;
FrameSvgPrivate::s_sharedFrames.remove(oldKey);
delete fd;
}
@ -541,7 +541,7 @@ FrameSvgPrivate::~FrameSvgPrivate()
{
#ifdef DEBUG_FRAMESVG_CACHE
#ifndef NDEBUG
kDebug() << "*************" << q << q->imagePath() << "****************";
// qDebug() << "*************" << q << q->imagePath() << "****************";
#endif
#endif
@ -555,7 +555,7 @@ FrameSvgPrivate::~FrameSvgPrivate()
const QString key = cacheId(it.value(), it.key());
#ifdef DEBUG_FRAMESVG_CACHE
#ifndef NDEBUG
kDebug() << "2. Removing it" << key << it.value() << it.value()->refcount() << s_sharedFrames.contains(key);
// qDebug() << "2. Removing it" << key << it.value() << it.value()->refcount() << s_sharedFrames.contains(key);
#endif
#endif
s_sharedFrames.remove(key);
@ -564,12 +564,12 @@ FrameSvgPrivate::~FrameSvgPrivate()
#ifdef DEBUG_FRAMESVG_CACHE
else {
#ifndef NDEBUG
kDebug() << "still shared:" << cacheId(it.value(), it.key()) << it.value() << it.value()->refcount() << it.value()->isUsed();
// qDebug() << "still shared:" << cacheId(it.value(), it.key()) << it.value() << it.value()->refcount() << it.value()->isUsed();
#endif
}
} else {
#ifndef NDEBUG
kDebug() << "lost our value for" << it.key();
// qDebug() << "lost our value for" << it.key();
#endif
#endif
}
@ -583,22 +583,22 @@ FrameSvgPrivate::~FrameSvgPrivate()
const int rc = it2.value()->refcount();
if (rc == 0) {
#ifndef NDEBUG
kDebug() << " LOST!" << it2.key() << rc << it2.value();// << it2.value()->references;
// qDebug() << " LOST!" << it2.key() << rc << it2.value();// << it2.value()->references;
#endif
} else {
#ifndef NDEBUG
kDebug() << " " << it2.key() << rc << it2.value();
// qDebug() << " " << it2.key() << rc << it2.value();
#endif
foreach (FrameSvg *data, it2.value()->references.keys()) {
#ifndef NDEBUG
kDebug( )<< " " << (void*)data << it2.value()->references[data];
qDebug()<< " " << (void*)data << it2.value()->references[data];
#endif
}
shares += rc - 1;
}
}
#ifndef NDEBUG
kDebug() << "#####################################" << s_sharedFrames.count() << ", pixmaps saved:" << shares;
// qDebug() << "#####################################" << s_sharedFrames.count() << ", pixmaps saved:" << shares;
#endif
#endif
@ -749,7 +749,7 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
void FrameSvgPrivate::generateFrameBackground(FrameData *frame)
{
//kDebug() << "generating background";
//qDebug() << "generating background";
const QSizeF size = frameSize(frame);
const int topWidth = q->elementSize(prefix % "top").width();
const int leftHeight = q->elementSize(prefix % "left").height();
@ -759,12 +759,12 @@ void FrameSvgPrivate::generateFrameBackground(FrameData *frame)
if (!size.isValid()) {
#ifndef NDEBUG
kDebug() << "Invalid frame size" << size;
// qDebug() << "Invalid frame size" << size;
#endif
return;
}
if (size.width() >= MAX_FRAME_SIZE || size.height() >= MAX_FRAME_SIZE) {
kWarning() << "Not generating frame background for a size whose width or height is more than" << MAX_FRAME_SIZE << size;
qWarning() << "Not generating frame background for a size whose width or height is more than" << MAX_FRAME_SIZE << size;
return;
}
@ -955,7 +955,7 @@ void FrameSvgPrivate::cacheFrame(const QString &prefixToSave, const QPixmap &bac
const QString id = cacheId(frame, prefixToSave);
//kDebug()<<"Saving to cache frame"<<id;
//qDebug()<<"Saving to cache frame"<<id;
theme->insertIntoCache(id, background, QString::number((qint64)q, 16) % prefixToSave);
@ -967,7 +967,7 @@ void FrameSvgPrivate::cacheFrame(const QString &prefixToSave, const QPixmap &bac
void FrameSvgPrivate::updateSizes() const
{
//kDebug() << "!!!!!!!!!!!!!!!!!!!!!! updating sizes" << prefix;
//qDebug() << "!!!!!!!!!!!!!!!!!!!!!! updating sizes" << prefix;
FrameData *frame = frames[prefix];
Q_ASSERT(frame);
@ -1059,13 +1059,13 @@ QSizeF FrameSvgPrivate::frameSize(FrameData *frame) const
void FrameData::ref(FrameSvg *svg)
{
references[svg] = references[svg] + 1;
//kDebug() << this << svg << references[svg];
//qDebug() << this << svg << references[svg];
}
bool FrameData::deref(FrameSvg *svg)
{
references[svg] = references[svg] - 1;
//kDebug() << this << svg << references[svg];
//qDebug() << this << svg << references[svg];
if (references[svg] < 1) {
references.remove(svg);
}

54
src/plasma/package.cpp
View File

@ -25,7 +25,7 @@
#include <qtemporarydir.h>
#include <karchive.h>
#include <kdebug.h>
#include <QDebug>
#include <kdesktopfile.h>
#include <kservicetypetrader.h>
#include <kstandarddirs.h>
@ -114,7 +114,7 @@ bool Package::isValid() const
}
if (failed) {
kWarning() << "Could not find required" << (it.value().directory ? "directory" : "file") << it.key();
qWarning() << "Could not find required" << (it.value().directory ? "directory" : "file") << it.key();
d->valid = false;
break;
}
@ -246,7 +246,7 @@ QString PackagePrivate::unpack(const QString& filePath) {
mimeType.inherits("application/x-xz") || mimeType.inherits("application/x-lzma")) {
archive = new KTar(filePath);
} else {
kWarning() << "Could not open package file, unsupported archive format:" << filePath << mimeType.name();
qWarning() << "Could not open package file, unsupported archive format:" << filePath << mimeType.name();
}
QString tempRoot;
if (archive && archive->open(QIODevice::ReadOnly)) {
@ -257,7 +257,7 @@ QString PackagePrivate::unpack(const QString& filePath) {
createPackageMetadata(tempdir.path() + '/');
tempRoot = tempdir.path() + '/';
} else {
kWarning() << "Could not open package file:" << path;
qWarning() << "Could not open package file:" << path;
}
delete archive;
@ -267,7 +267,7 @@ QString PackagePrivate::unpack(const QString& filePath) {
QString Package::filePath(const char *fileType, const QString &filename) const
{
if (!d->valid) {
//kDebug() << "package is not valid";
//qDebug() << "package is not valid";
return QString();
}
@ -280,16 +280,16 @@ QString Package::filePath(const char *fileType, const QString &filename) const
QStringList paths;
if (qstrlen(fileType) != 0) {
kDebug()<<d->contents.keys();
qDebug()<<d->contents.keys();
if (!d->contents.contains(fileType)) {
kDebug() << "package does not contain" << fileType << filename;
qDebug() << "package does not contain" << fileType << filename;
return QString();
}
paths = d->contents[fileType].paths;
if (paths.isEmpty()) {
//kDebug() << "no matching path came of it, while looking for" << fileType << filename;
//qDebug() << "no matching path came of it, while looking for" << fileType << filename;
d->discoveries.insert(discoveryKey, QString());
return QString();
}
@ -299,7 +299,7 @@ QString Package::filePath(const char *fileType, const QString &filename) const
}
//Nested loop, but in the medium case resolves to just one iteration
//kDebug() << "prefixes:" << prefixes.count() << prefixes;
//qDebug() << "prefixes:" << prefixes.count() << prefixes;
foreach (const QString &contentsPrefix, d->contentsPrefixPaths) {
const QString prefix(d->path + contentsPrefix);
@ -310,10 +310,10 @@ QString Package::filePath(const char *fileType, const QString &filename) const
file.append("/").append(filename);
}
//kDebug() << "testing" << file << QFile::exists("/bin/ls") << QFile::exists(file);
//qDebug() << "testing" << file << QFile::exists("/bin/ls") << QFile::exists(file);
if (QFile::exists(file)) {
if (d->externalPaths) {
//kDebug() << "found" << file;
//qDebug() << "found" << file;
d->discoveries.insert(discoveryKey, file);
return file;
}
@ -323,9 +323,9 @@ QString Package::filePath(const char *fileType, const QString &filename) const
QDir dir(file);
QString canonicalized = dir.canonicalPath() + QDir::separator();
//kDebug() << "testing that" << canonicalized << "is in" << d->path;
//qDebug() << "testing that" << canonicalized << "is in" << d->path;
if (canonicalized.startsWith(d->path)) {
//kDebug() << "found" << file;
//qDebug() << "found" << file;
d->discoveries.insert(discoveryKey, file);
return file;
}
@ -333,7 +333,7 @@ QString Package::filePath(const char *fileType, const QString &filename) const
}
}
//kDebug() << fileType << filename << "does not exist in" << prefixes << "at root" << d->path;
//qDebug() << fileType << filename << "does not exist in" << prefixes << "at root" << d->path;
return QString();
}
@ -345,18 +345,18 @@ QStringList Package::entryList(const char *key) const
QHash<QByteArray, ContentStructure>::const_iterator it = d->contents.constFind(key);
if (it == d->contents.constEnd()) {
//kDebug() << "couldn't find" << key;
//qDebug() << "couldn't find" << key;
return QStringList();
}
//kDebug() << "going to list" << key;
//qDebug() << "going to list" << key;
QStringList list;
foreach (const QString &prefix, d->contentsPrefixPaths) {
//kDebug() << " looking in" << prefix;
//qDebug() << " looking in" << prefix;
foreach (const QString &path, it.value().paths) {
//kDebug() << " looking in" << path;
//qDebug() << " looking in" << path;
if (it.value().directory) {
//kDebug() << "it's a directory, so trying out" << d->path + prefix + path;
//qDebug() << "it's a directory, so trying out" << d->path + prefix + path;
QDir dir(d->path + prefix + path);
if (d->externalPaths) {
@ -371,7 +371,7 @@ QStringList Package::entryList(const char *key) const
}
} else {
const QString fullPath = d->path + prefix + path;
//kDebug() << "it's a file at" << fullPath << QFile::exists(fullPath);
//qDebug() << "it's a file at" << fullPath << QFile::exists(fullPath);
if (!QFile::exists(fullPath)) {
continue;
}
@ -382,7 +382,7 @@ QStringList Package::entryList(const char *key) const
QDir dir(fullPath);
QString canonicalized = dir.canonicalPath() + QDir::separator();
//kDebug() << "testing that" << canonicalized << "is in" << d->path;
//qDebug() << "testing that" << canonicalized << "is in" << d->path;
if (canonicalized.startsWith(d->path)) {
list += fullPath;
}
@ -528,7 +528,7 @@ void Package::setContentsPrefixPaths(const QStringList &prefixPaths)
QString Package::contentsHash() const
{
if (!d->valid) {
kWarning() << "can not create hash due to Package being invalid";
qWarning() << "can not create hash due to Package being invalid";
return QString();
}
@ -541,10 +541,10 @@ QString Package::contentsHash() const
hash.addData(f.read(1024));
}
} else {
kWarning() << "could not add" << f.fileName() << "to the hash; file could not be opened for reading.";
qWarning() << "could not add" << f.fileName() << "to the hash; file could not be opened for reading.";
}
} else {
kWarning() << "no metadata at" << metadataPath;
qWarning() << "no metadata at" << metadataPath;
}
foreach (QString prefix, d->contentsPrefixPaths) {
@ -700,8 +700,8 @@ KJob* Package::install(const QString &sourcePackage, const QString &packageRoot)
{
const QString src = sourcePackage;
const QString dest = packageRoot.isEmpty() ? defaultPackageRoot() : packageRoot;
//kDebug() << "Source: " << src;
//kDebug() << "PackageRoot: " << dest;
//qDebug() << "Source: " << src;
//qDebug() << "PackageRoot: " << dest;
KJob *j = d->structure.data()->install(this, src, dest);
//connect(j, SIGNAL(finished(bool)), SLOT(installFinished(bool)));
return j;
@ -797,7 +797,7 @@ void PackagePrivate::updateHash(const QString &basePath, const QString &subPath,
hash.addData(f.read(1024));
}
} else {
kWarning() << "could not add" << f.fileName() << "to the hash; file could not be opened for reading. "
qWarning() << "could not add" << f.fileName() << "to the hash; file could not be opened for reading. "
<< "permissions fail?" << info.permissions() << info.isFile();
}
}

2
src/plasma/packagestructure.cpp
View File

@ -18,7 +18,7 @@
*******************************************************************************/
#include "packagestructure.h"
#include <kdebug.h>
#include <QDebug>
#include <private/packagejob_p.h>
#include "private/package_p.h"

40
src/plasma/pluginloader.cpp
View File

@ -21,7 +21,7 @@
#include <QStandardPaths>
#include <kdebug.h>
#include <QDebug>
#include <kservice.h>
#include <kservicetypetrader.h>
#include <kglobal.h>
@ -127,7 +127,7 @@ void PluginLoader::setPluginLoader(PluginLoader* loader)
s_pluginLoader = loader;
} else {
#ifndef NDEBUG
kDebug() << "Cannot set pluginLoader, already set!" << s_pluginLoader;
// qDebug() << "Cannot set pluginLoader, already set!" << s_pluginLoader;
#endif
}
}
@ -172,14 +172,14 @@ Applet *PluginLoader::loadApplet(const QString &name, uint appletId, const QVari
if (offers.isEmpty()) {
#ifndef NDEBUG
kDebug() << "offers is empty for " << name;
// qDebug() << "offers is empty for " << name;
#endif
return 0;
}
#ifndef NDEBUG
if (offers.count() > 1) {
kDebug() << "hey! we got more than one! let's blindly take the first one";
// qDebug() << "hey! we got more than one! let's blindly take the first one";
}
#endif
@ -194,7 +194,7 @@ Applet *PluginLoader::loadApplet(const QString &name, uint appletId, const QVari
if (!offer->property("X-Plasma-API").toString().isEmpty()) {
#ifndef NDEBUG
kDebug() << "we have a script using the"
// qDebug() << "we have a script using the"
<< offer->property("X-Plasma-API").toString() << "API";
#endif
if (isContainment) {
@ -219,7 +219,7 @@ Applet *PluginLoader::loadApplet(const QString &name, uint appletId, const QVari
applet = offer->createInstance<Plasma::Applet>(0, allArgs, &error);
if (!applet) {
kWarning() << "Could not load applet" << name << "! reason given:" << error;
qWarning() << "Could not load applet" << name << "! reason given:" << error;
}
return applet;
@ -240,7 +240,7 @@ DataEngine *PluginLoader::loadDataEngine(const QString &name)
if (offers.isEmpty()) {
#ifndef NDEBUG
kDebug() << "offers are empty for " << name << " with constraint " << constraint;
// qDebug() << "offers are empty for " << name << " with constraint " << constraint;
#endif
} else {
QVariantList allArgs;
@ -260,7 +260,7 @@ DataEngine *PluginLoader::loadDataEngine(const QString &name)
if (!engine) {
#ifndef NDEBUG
kDebug() << "Couldn't load engine \"" << name << "\". Error given: " << error;
// qDebug() << "Couldn't load engine \"" << name << "\". Error given: " << error;
#endif
}
@ -335,7 +335,7 @@ Service *PluginLoader::loadService(const QString &name, const QVariantList &args
if (offers.isEmpty()) {
#ifndef NDEBUG
kDebug() << "offers is empty for " << name;
// qDebug() << "offers is empty for " << name;
#endif
return new NullService(name, parent);
}
@ -349,7 +349,7 @@ Service *PluginLoader::loadService(const QString &name, const QVariantList &args
if (!service) {
#ifndef NDEBUG
kDebug() << "Couldn't load Service \"" << name << "\"! reason given: " << error;
// qDebug() << "Couldn't load Service \"" << name << "\"! reason given: " << error;
#endif
return new NullService(name, parent);
}
@ -377,7 +377,7 @@ ContainmentActions *PluginLoader::loadContainmentActions(Containment *parent, co
if (offers.isEmpty()) {
#ifndef NDEBUG
kDebug() << "offers is empty for " << name;
// qDebug() << "offers is empty for " << name;
#endif
return 0;
}
@ -396,7 +396,7 @@ ContainmentActions *PluginLoader::loadContainmentActions(Containment *parent, co
if (!actions) {
#ifndef NDEBUG
kDebug() << "Couldn't load containmentActions \"" << name << "\"! reason given: " << error;
// qDebug() << "Couldn't load containmentActions \"" << name << "\"! reason given: " << error;
#endif
}
@ -477,7 +477,7 @@ Package PluginLoader::loadPackage(const QString &packageFormat, const QString &s
}
#ifndef NDEBUG
kDebug() << "Couldn't load Package for" << packageFormat << "! reason given: " << error;
// qDebug() << "Couldn't load Package for" << packageFormat << "! reason given: " << error;
#endif
}
@ -510,7 +510,7 @@ KPluginInfo::List PluginLoader::listAppletInfo(const QString &category, const QS
KService::List offers = KServiceTypeTrader::self()->query("Plasma/Applet", constraint);
//kDebug() << "Applet::listAppletInfo constraint was '" << constraint
//qDebug() << "Applet::listAppletInfo constraint was '" << constraint
// << "' which got us " << offers.count() << " matches";
return KPluginInfo::fromServices(offers);
}
@ -519,7 +519,7 @@ KPluginInfo::List PluginLoader::listAppletInfoForMimeType(const QString &mimeTyp
{
QString constraint = PluginLoaderPrivate::parentAppConstraint();
constraint.append(QString(" and '%1' in [X-Plasma-DropMimeTypes]").arg(mimeType));
//kDebug() << "listAppletInfoForMimetype with" << mimeType << constraint;
//qDebug() << "listAppletInfoForMimetype with" << mimeType << constraint;
KService::List offers = KServiceTypeTrader::self()->query("Plasma/Applet", constraint);
return KPluginInfo::fromServices(offers);
}
@ -539,7 +539,7 @@ KPluginInfo::List PluginLoader::listAppletInfoForUrl(const QUrl &url)
rx.setPatternSyntax(QRegExp::Wildcard);
if (rx.exactMatch(url.toString())) {
#ifndef NDEBUG
kDebug() << info.name() << "matches" << glob << url;
// qDebug() << info.name() << "matches" << glob << url;
#endif
filtered << info;
}
@ -571,10 +571,10 @@ QStringList PluginLoader::listAppletCategories(const QString &parentApp, bool vi
continue;
}
//kDebug() << " and we have " << appletCategory;
//qDebug() << " and we have " << appletCategory;
if (!appletCategory.isEmpty() && !known.contains(appletCategory.toLower())) {
#ifndef NDEBUG
kDebug() << "Unknown category: " << applet->name() << "says it is in the"
// qDebug() << "Unknown category: " << applet->name() << "says it is in the"
<< appletCategory << "category which is unknown to us";
#endif
appletCategory.clear();
@ -663,14 +663,14 @@ KPluginInfo::List PluginLoader::listContainmentsOfType(const QString &type,
}
KService::List offers = KServiceTypeTrader::self()->query("Plasma/Containment", constraint);
kDebug() << "constraint was" << constraint << "which got us" << offers.count() << "matches";
// qDebug() << "constraint was" << constraint << "which got us" << offers.count() << "matches";
return KPluginInfo::fromServices(offers);
}
KPluginInfo::List PluginLoader::listContainmentsForMimeType(const QString &mimeType)
{
const QString constraint = QString("'%1' in [X-Plasma-DropMimeTypes]").arg(mimeType);
//kDebug() << mimeType << constraint;
//qDebug() << mimeType << constraint;
const KService::List offers = KServiceTypeTrader::self()->query("Plasma/Containment", constraint);
return KPluginInfo::fromServices(offers);
}

14
src/plasma/private/applet_p.cpp
View File

@ -28,7 +28,7 @@
#include <QFile>
#include <qstandardpaths.h>
#include <kdebug.h>
#include <QDebug>
#include <kiconloader.h>
#include <klocale.h>
#include <klocalizedstring.h>
@ -81,7 +81,7 @@ AppletPrivate::AppletPrivate(KService::Ptr service, const KPluginInfo *info, int
AppletPrivate::~AppletPrivate()
{
if (activationAction && globalShortcutEnabled) {
//kDebug() << "resetting global action for" << q->title() << activationAction->objectName();
//qDebug() << "resetting global action for" << q->title() << activationAction->objectName();
KGlobalAccel::self()->removeAllShortcuts(activationAction);
}
@ -114,7 +114,7 @@ void AppletPrivate::init(const QString &packagePath)
if (!appletDescription.isValid()) {
#ifndef NDEBUG
kDebug() << "Check your constructor! "
// qDebug() << "Check your constructor! "
<< "You probably want to be passing in a Service::Ptr "
<< "or a QVariantList with a valid storageid as arg[0].";
#endif
@ -190,7 +190,7 @@ void AppletPrivate::globalShortcutChanged()
KConfigGroup shortcutConfig(mainConfigGroup(), "Shortcuts");
shortcutConfig.writeEntry("global", activationAction->shortcut().toString());
scheduleModificationNotification();
//kDebug() << "after" << shortcut.primary() << d->activationAction->globalShortcut().primary();
//qDebug() << "after" << shortcut.primary() << d->activationAction->globalShortcut().primary();
}
KActionCollection* AppletPrivate::defaultActions(QObject *parent)
@ -294,7 +294,7 @@ void AppletPrivate::setupPackage()
}
#ifndef NDEBUG
kDebug() << "setting up script support, package is in" << package->path()
// qDebug() << "setting up script support, package is in" << package->path()
<< ", main script is" << package->filePath("mainscript");
#endif
@ -355,7 +355,7 @@ KConfigGroup *AppletPrivate::mainConfigGroup()
if (isContainment) {
Corona *corona = static_cast<Containment*>(q)->corona();
KConfigGroup containmentConfig;
//kDebug() << "got a corona, baby?" << (QObject*)corona << (QObject*)q;
//qDebug() << "got a corona, baby?" << (QObject*)corona << (QObject*)q;
if (corona) {
containmentConfig = KConfigGroup(corona->config(), "Containments");
@ -379,7 +379,7 @@ KConfigGroup *AppletPrivate::mainConfigGroup()
appletConfig = c->config();
appletConfig = KConfigGroup(&appletConfig, "Applets");
} else {
kWarning() << "requesting config for" << q->title() << "without a containment!";
qWarning() << "requesting config for" << q->title() << "without a containment!";
appletConfig = KConfigGroup(KSharedConfig::openConfig(), "Applets");
}

18
src/plasma/private/containment_p.cpp
View File

@ -24,7 +24,7 @@
#include <kactioncollection.h>
#include <kdebug.h>
#include <QDebug>
#include <kiconloader.h>
#include <klocalizedstring.h>
#include <kwindowsystem.h>
@ -97,7 +97,7 @@ void ContainmentPrivate::setScreen(int newScreen)
newScreen = -1;
}
//kDebug() << activity() << "setting screen to " << newScreen << "and type is" << type;
//qDebug() << activity() << "setting screen to " << newScreen << "and type is" << type;
Containment *swapScreensWith(0);
const bool isDesktopContainment = type == Plasma::Types::DesktopContainment ||
@ -108,7 +108,7 @@ void ContainmentPrivate::setScreen(int newScreen)
Containment *currently = corona->containmentForScreen(newScreen);
if (currently && currently != q) {
#ifndef NDEBUG
kDebug() << "currently is on screen" << currently->screen()
// qDebug() << "currently is on screen" << currently->screen()
// << "desktop" << currently->desktop()
<< "and is" << currently->activity()
<< (QObject*)currently << "i'm" << (QObject*)q;
@ -127,7 +127,7 @@ void ContainmentPrivate::setScreen(int newScreen)
if (oldScreen != newScreen) {
/*
#ifndef NDEBUG
kDebug() << "going to signal change for" << q
// qDebug() << "going to signal change for" << q
#endif
<< ", old screen & desktop:" << oldScreen
<< ", new:" << screen << desktop;
@ -139,7 +139,7 @@ void ContainmentPrivate::setScreen(int newScreen)
}
if (swapScreensWith) {
//kDebug() << "setScreen due to swap, part 2";
//qDebug() << "setScreen due to swap, part 2";
swapScreensWith->setScreen(oldScreen);
}
@ -162,7 +162,7 @@ void ContainmentPrivate::configChanged()
void ContainmentPrivate::checkStatus(Plasma::Types::ItemStatus appletStatus)
{
//kDebug() << "================== "<< appletStatus << q->status();
//qDebug() << "================== "<< appletStatus << q->status();
if (appletStatus == q->status()) {
emit q->statusChanged(appletStatus);
return;
@ -192,7 +192,7 @@ void ContainmentPrivate::containmentConstraintsEvent(Plasma::Types::Constraints
return;
}
//kDebug() << "got containmentConstraintsEvent" << constraints;
//qDebug() << "got containmentConstraintsEvent" << constraints;
if (constraints & Plasma::Types::ImmutableConstraint) {
//update actions
const bool unlocked = q->immutability() == Types::Mutable;
@ -241,7 +241,7 @@ Applet *ContainmentPrivate::createApplet(const QString &name, const QVariantList
if (q->immutability() != Types::Mutable) {
#ifndef NDEBUG
kDebug() << "addApplet for" << name << "requested, but we're currently immutable!";
// qDebug() << "addApplet for" << name << "requested, but we're currently immutable!";
#endif
return 0;
}
@ -250,7 +250,7 @@ Applet *ContainmentPrivate::createApplet(const QString &name, const QVariantList
if (!applet) {
#ifndef NDEBUG
kDebug() << "Applet" << name << "could not be loaded.";
// qDebug() << "Applet" << name << "could not be loaded.";
#endif
applet = new Applet(0, QString(), id);
applet->setLaunchErrorMessage(i18n("Could not find requested component: %1", name));

8
src/plasma/private/datacontainer_p.cpp
View File

@ -65,7 +65,7 @@ SignalRelay::SignalRelay(DataContainer *parent, DataContainerPrivate *data, uint
m_resetTimer(true),
m_queued(true)
{
//kDebug() << "signal relay with time of" << m_timerId << "being set up";
//qDebug() << "signal relay with time of" << m_timerId << "being set up";
m_timerId = startTimer(immediateUpdate ? 0 : m_interval);
if (m_align != Plasma::Types::NoAlignment) {
checkAlignment();
@ -110,7 +110,7 @@ void SignalRelay::checkAlignment()
void SignalRelay::checkQueueing()
{
//kDebug() << m_queued;
//qDebug() << m_queued;
if (m_queued) {
emit dataUpdated(dc->objectName(), d->data);
m_queued = false;
@ -153,13 +153,13 @@ void SignalRelay::timerEvent(QTimerEvent *event)
emit dc->updateRequested(dc);
if (d->hasUpdates()) {
//kDebug() << "emitting data updated directly" << d->data;
//qDebug() << "emitting data updated directly" << d->data;
emit dataUpdated(dc->objectName(), d->data);
m_queued = false;
} else {
// the source wasn't actually updated; so let's put ourselves in the queue
// so we get a dataUpdated() call when the data does arrive
//kDebug() << "queued";
//qDebug() << "queued";
m_queued = true;
}
}

4
src/plasma/private/dataenginemanager.cpp
View File

@ -22,7 +22,7 @@
#include <QFile>
#include <QTextStream>
#include <kdebug.h>
#include <QDebug>
#include <klocale.h>
#include <kservicetypetrader.h>
@ -163,7 +163,7 @@ void DataEngineManager::timerEvent(QTimerEvent *)
QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1Char('/') + "plasma_dataenginemanager_log";
QFile f(path);
if (!f.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) {
kDebug() << "faild to open" << path;
// qDebug() << "faild to open" << path;
return;
}

2
src/plasma/private/framesvg_p.h
View File

@ -24,7 +24,7 @@
#include <QHash>
#include <QStringBuilder>
#include <kdebug.h>
#include <QDebug>
#include <Plasma/Theme>

2
src/plasma/private/packagejob.cpp
View File

@ -21,7 +21,7 @@
#include "packagejobthread_p.h"
#include "config-plasma.h"
#include <kdebug.h>
#include <QDebug>
namespace Plasma
{

24
src/plasma/private/packagejobthread.cpp
View File

@ -41,7 +41,7 @@
#include <QtNetwork/QHostInfo>
#include <qtemporarydir.h>
#include <kdebug.h>
#include <QDebug>
namespace Plasma
{
@ -144,7 +144,7 @@ bool PackageJobThread::installPackage(const QString& src, const QString &dest)
QDir().mkpath(dest);
if (!root.exists()) {
d->errorMessage = i18n("Could not create package root directory: %1", dest);
//kWarning() << "Could not create package root directory: " << dest;
//qWarning() << "Could not create package root directory: " << dest;
return false;
}
}
@ -177,13 +177,13 @@ bool PackageJobThread::installPackage(const QString& src, const QString &dest)
mimetype.inherits("application/x-xz") || mimetype.inherits("application/x-lzma")) {
archive = new KTar(src);
} else {
//kWarning() << "Could not open package file, unsupported archive format:" << src << mimetype.name();
//qWarning() << "Could not open package file, unsupported archive format:" << src << mimetype.name();
d->errorMessage = i18n("Could not open package file, unsupported archive format: %1 %2", src, mimetype.name());
return false;
}
if (!archive->open(QIODevice::ReadOnly)) {
//kWarning() << "Could not open package file:" << src;
//qWarning() << "Could not open package file:" << src;
delete archive;
d->errorMessage = i18n("Could not open package file: %1", src);
return false;
@ -219,7 +219,7 @@ bool PackageJobThread::installPackage(const QString& src, const QString &dest)
QString pluginName = meta.pluginName();
qDebug() << "pluginname: " << meta.pluginName();
if (pluginName.isEmpty()) {
//kWarning() << "Package plugin name not specified";
//qWarning() << "Package plugin name not specified";
d->errorMessage = i18n("Package plugin name not specified: %1", src);
return false;
}
@ -228,7 +228,7 @@ bool PackageJobThread::installPackage(const QString& src, const QString &dest)
// bad characters into the paths used for removal.
QRegExp validatePluginName("^[\\w-\\.]+$"); // Only allow letters, numbers, underscore and period.
if (!validatePluginName.exactMatch(pluginName)) {
//kDebug() << "Package plugin name " << pluginName << "contains invalid characters";
//qDebug() << "Package plugin name " << pluginName << "contains invalid characters";
d->errorMessage = i18n("Package plugin name %1 contains invalid characters", pluginName);
return false;
}
@ -249,7 +249,7 @@ bool PackageJobThread::installPackage(const QString& src, const QString &dest)
const bool ok = copyFolder(path, targetName);
removeFolder(path);
if (!ok) {
//kWarning() << "Could not move package to destination:" << targetName;
//qWarning() << "Could not move package to destination:" << targetName;
d->errorMessage = i18n("Could not move package to destination: %1", targetName);
return false;
}
@ -258,7 +258,7 @@ bool PackageJobThread::installPackage(const QString& src, const QString &dest)
// than move them
const bool ok = copyFolder(path, targetName);
if (!ok) {
//kWarning() << "Could not copy package to destination:" << targetName;
//qWarning() << "Could not copy package to destination:" << targetName;
d->errorMessage = i18n("Could not copy package to destination: %1", targetName);
return false;
}
@ -314,7 +314,7 @@ bool PackageJobThread::installPackage(const QString& src, const QString &dest)
sycoca.asyncCall("recreate");
d->installPath = targetName;
//kWarning() << "Not updating kbuildsycoca4, since that will go away. Do it yourself for now if needed.";
//qWarning() << "Not updating kbuildsycoca4, since that will go away. Do it yourself for now if needed.";
return true;
}
@ -322,9 +322,9 @@ bool PackageJobThread::installPackage(const QString& src, const QString &dest)
bool PackageJobThread::uninstall(const QString &packagePath)
{
bool ok = uninstallPackage(packagePath);
//kDebug() << "emit installPathChanged " << d->installPath;
//qDebug() << "emit installPathChanged " << d->installPath;
emit installPathChanged(QString());
//kDebug() << "Thread: installFinished" << ok;
//qDebug() << "Thread: installFinished" << ok;
emit finished(ok, d->errorMessage);
return ok;
}
@ -353,7 +353,7 @@ bool PackageJobThread::uninstallPackage(const QString& packagePath)
bool ok = QFile::remove(service);
if (!ok) {
kWarning() << "Unable to remove " << service;
qWarning() << "Unable to remove " << service;
}
ok = removeFolder(packagePath);

6
src/plasma/private/runnerjobs.cpp
View File

@ -21,7 +21,7 @@
#include <QTimer>
#include <kdebug.h>
#include <QDebug>
//#include <Weaver/DebuggingAids.h>
#include <threadweaver/ThreadWeaver.h>
@ -52,7 +52,7 @@ bool DelayedRunnerPolicy::canRun(Job *job)
FindMatchesJob *aJob = static_cast<FindMatchesJob*>(job);
if (QTimer *t = aJob->delayTimer()) {
// If the timer is active, the required delay has not been reached
//kDebug() << "delayed timer" << aJob->runner()->name() << !t->isActive();
//qDebug() << "delayed timer" << aJob->runner()->name() << !t->isActive();
return !t->isActive();
}
@ -153,7 +153,7 @@ void FindMatchesJob::setDelayTimer(QTimer *timer)
void FindMatchesJob::run()
{
// kDebug() << "Running match for " << m_runner->objectName()
// qDebug() << "Running match for " << m_runner->objectName()
// << " in Thread " << thread()->id() << endl;
if (m_context.isValid()) {
m_runner->performMatch(m_context);

2
src/plasma/private/storage.cpp
View File

@ -31,7 +31,7 @@
#include <QThreadStorage>
//KDE
#include <kdebug.h>
#include <QDebug>
//Plasma

10
src/plasma/private/storagethread.cpp
View File

@ -27,7 +27,7 @@
#include <QSqlDriver>
#include <QSqlRecord>
#include <kdebug.h>
#include <QDebug>
#include <qstandardpaths.h>
@ -84,12 +84,12 @@ void StorageThread::initializeDb(StorageJob *caller)
}
if (!m_db.open()) {
kWarning() << "Unable to open the plasma storage cache database: " << m_db.lastError();
qWarning() << "Unable to open the plasma storage cache database: " << m_db.lastError();
} else if (!m_db.tables().contains(caller->clientName())) {
QSqlQuery query(m_db);
query.prepare(QString("create table ") + caller->clientName() + " (valueGroup varchar(256), id varchar(256), txt TEXT, int INTEGER, float REAL, binary BLOB, creationTime datetime, accessTime datetime, primary key (valueGroup, id))");
if (!query.exec()) {
kWarning() << "Unable to create table for" << caller->clientName();
qWarning() << "Unable to create table for" << caller->clientName();
m_db.close();
}
}
@ -150,7 +150,7 @@ void StorageThread::save(QWeakPointer<StorageJob> wcaller, const QVariantMap &pa
it.toFront();
while (it.hasNext()) {
it.next();
//kDebug() << "going to insert" << valueGroup << it.key();
//qDebug() << "going to insert" << valueGroup << it.key();
query.bindValue(":id", it.key());
QString field;
@ -185,7 +185,7 @@ void StorageThread::save(QWeakPointer<StorageJob> wcaller, const QVariantMap &pa
}
if (!query.exec()) {
//kDebug() << "query failed:" << query.lastQuery() << query.lastError().text();
//qDebug() << "query failed:" << query.lastQuery() << query.lastError().text();
m_db.commit();
emit newResult(caller, false);
return;

10
src/plasma/private/theme_p.cpp
View File

@ -105,7 +105,7 @@ KConfigGroup &ThemePrivate::config()
if (!app.isEmpty()) {
#ifndef NDEBUG
kDebug() << "using theme for app" << app;
// qDebug() << "using theme for app" << app;
#endif
groupName.append("-").append(app);
}
@ -206,7 +206,7 @@ void ThemePrivate::compositingChanged(bool active)
#if HAVE_X11
if (compositingActive != active) {
compositingActive = active;
//kDebug() << QTime::currentTime();
//qDebug() << QTime::currentTime();
scheduleThemeChangeNotification(PixmapCache | SvgElementsCache);
}
#endif
@ -282,7 +282,7 @@ void ThemePrivate::scheduleThemeChangeNotification(CacheTypes caches)
void ThemePrivate::notifyOfChanged()
{
//kDebug() << cachesToDiscard;
//qDebug() << cachesToDiscard;
discardCache(cachesToDiscard);
cachesToDiscard = NoCache;
emit themeChanged();
@ -456,7 +456,7 @@ void ThemePrivate::processWallpaperSettings(KConfigBase *metadata)
void ThemePrivate::setThemeName(const QString &tempThemeName, bool writeSettings)
{
//kDebug() << tempThemeName;
//qDebug() << tempThemeName;
QString theme = tempThemeName;
if (theme.isEmpty() || theme == themeName) {
// let's try and get the default theme at least
@ -494,7 +494,7 @@ void ThemePrivate::setThemeName(const QString &tempThemeName, bool writeSettings
const QString colorsFile = realTheme ? QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1Literal("desktoptheme/") % theme % QLatin1Literal("/colors"))
: QString();
//kDebug() << "we're going for..." << colorsFile << "*******************";
//qDebug() << "we're going for..." << colorsFile << "*******************";
// load the wallpaper settings, if any
if (realTheme) {

2
src/plasma/private/theme_p.h
View File

@ -24,7 +24,7 @@
#include "theme.h"
#include <QHash>
#include <kdebug.h>
#include <QDebug>
#include <KColorScheme>
#include <KImageCache>
#include <KWindowSystem>

6
src/plasma/querymatch.cpp
View File

@ -27,7 +27,7 @@
#include <QVariant>
#include <QWeakPointer>
#include <kdebug.h>
#include <QDebug>
#include "abstractrunner.h"
@ -93,7 +93,7 @@ class QueryMatchPrivate : public QSharedData
QueryMatch::QueryMatch(AbstractRunner *runner)
: d(new QueryMatchPrivate(runner))
{
// kDebug() << "new match created";
// qDebug() << "new match created";
}
QueryMatch::QueryMatch(const QueryMatch &other)
@ -300,7 +300,7 @@ bool QueryMatch::operator!=(const QueryMatch &other) const
void QueryMatch::run(const RunnerContext &context) const
{
//kDebug() << "we run the term" << context->query() << "whose type is" << context->mimetype();
//qDebug() << "we run the term" << context->query() << "whose type is" << context->mimetype();
if (d->runner) {
d->runner.data()->run(context, *this);
}

26
src/plasma/remote/authorizationmanager.cpp
View File

@ -46,7 +46,7 @@
#include <kauthaction.h>
#include <kauthexecutejob.h>
#include <kconfiggroup.h>
#include <kdebug.h>
#include <QDebug>
#include <kwallet.h>
@ -82,7 +82,7 @@ void AuthorizationManager::setAuthorizationPolicy(AuthorizationPolicy policy)
{
if (d->locked) {
#ifndef NDEBUG
kDebug() << "Can't change AuthorizationPolicy: interface locked.";
// qDebug() << "Can't change AuthorizationPolicy: interface locked.";
#endif
return;
}
@ -119,7 +119,7 @@ void AuthorizationManager::setAuthorizationInterface(AuthorizationInterface *int
{
if (d->authorizationInterface) {
#ifndef NDEBUG
kDebug() << "Can't change AuthorizationInterface: interface locked.";
// qDebug() << "Can't change AuthorizationInterface: interface locked.";
#endif
return;
}
@ -171,7 +171,7 @@ void AuthorizationManagerPrivate::prepareForServicePublication()
void AuthorizationManagerPrivate::saveRules()
{
#ifndef NDEBUG
kDebug() << "SAVE RULES";
// qDebug() << "SAVE RULES";
#endif
QTemporaryFile tempFile;
@ -183,7 +183,7 @@ void AuthorizationManagerPrivate::saveRules()
foreach (AuthorizationRule *rule, rules) {
if (rule->persistence() == AuthorizationRule::Persistent) {
#ifndef NDEBUG
kDebug() << "adding rule " << i;
// qDebug() << "adding rule " << i;
#endif
rulesGroup.group(QString::number(i)).writeEntry("CredentialsID", rule->credentials().id());
rulesGroup.group(QString::number(i)).writeEntry("serviceName", rule->serviceName());
@ -197,7 +197,7 @@ void AuthorizationManagerPrivate::saveRules()
tempFile.close();
#ifndef NDEBUG
kDebug() << "tempfile = " << tempFile.fileName();
// qDebug() << "tempfile = " << tempFile.fileName();
#endif
KAuth::Action action("org.kde.kcontrol.kcmremotewidgets.save");
@ -207,7 +207,7 @@ void AuthorizationManagerPrivate::saveRules()
if (!job->exec()) {
#ifndef NDEBUG
kDebug() << "KAuth failed.... YOU SUCK!";
// qDebug() << "KAuth failed.... YOU SUCK!";
#endif
}
}
@ -218,7 +218,7 @@ void AuthorizationManagerPrivate::slotWalletOpened()
if (!wallet->readEntry("Credentials", identity)) {
#ifndef NDEBUG
kDebug() << "Existing identity found";
// qDebug() << "Existing identity found";
#endif
QDataStream stream(&identity, QIODevice::ReadOnly);
stream >> myCredentials;
@ -226,7 +226,7 @@ void AuthorizationManagerPrivate::slotWalletOpened()
if (!myCredentials.isValid()) {
#ifndef NDEBUG
kDebug() << "Creating a new identity";
// qDebug() << "Creating a new identity";
#endif
myCredentials = Credentials::createCredentials(QHostInfo::localHostName());
QDataStream stream(&identity, QIODevice::WriteOnly);
@ -248,7 +248,7 @@ void AuthorizationManagerPrivate::slotLoadRules()
//Credentials storedCredentials = identities[identityID];
if (serviceName.isEmpty()) {
#ifndef NDEBUG
kDebug() << "Invalid rule";
// qDebug() << "Invalid rule";
#endif
} else {
AuthorizationRule *rule = new AuthorizationRule(serviceName, identityID);
@ -281,11 +281,11 @@ AuthorizationRule *AuthorizationManagerPrivate::matchingRule(const QString &serv
if (!matchingRule) {
#ifndef NDEBUG
kDebug() << "no matching rule";
// qDebug() << "no matching rule";
#endif
} else {
#ifndef NDEBUG
kDebug() << "matching rule found: " << matchingRule->description();
// qDebug() << "matching rule found: " << matchingRule->description();
#endif
}
return matchingRule;
@ -306,7 +306,7 @@ void AuthorizationManagerPrivate::addCredentials(const Credentials &identity)
return;
} else if (identity.isValid()) {
#ifndef NDEBUG
kDebug() << "Adding a new identity for " << identity.id();
// qDebug() << "Adding a new identity for " << identity.id();
#endif
identities[identity.id()] = identity;
}

26
src/plasma/remote/credentials.cpp
View File

@ -26,7 +26,7 @@
#include <QtCrypto>
#endif
#include <kdebug.h>
#include <QDebug>
#include <kstandarddirs.h>
#include "authorizationmanager.h"
@ -48,7 +48,7 @@ public:
{
#if ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
qWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return;
}
@ -106,7 +106,7 @@ Credentials Credentials::createCredentials(const QString &name)
{
#if ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
qWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return Credentials();
}
@ -140,7 +140,7 @@ bool Credentials::isValid() const
{
#if ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
qWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return false;
}
@ -152,7 +152,7 @@ bool Credentials::isValid() const
}
#else
#ifndef NDEBUG
kDebug() << "libplasma is compiled without support for remote widgets. Key invalid.";
// qDebug() << "libplasma is compiled without support for remote widgets. Key invalid.";
#endif
return false;
#endif
@ -172,14 +172,14 @@ bool Credentials::isValidSignature(const QByteArray &signature, const QByteArray
{
#if ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
qWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return false;
}
if (d->publicKey.canVerify()) {
if (!isValid()) {
#ifndef NDEBUG
kDebug() << "Key is null?";
// qDebug() << "Key is null?";
#endif
}
QCA::PublicKey publicKey = QCA::PublicKey::fromPEM(d->publicKey.toPEM());
@ -188,7 +188,7 @@ bool Credentials::isValidSignature(const QByteArray &signature, const QByteArray
return ( publicKey.validSignature( signature ) );
} else {
#ifndef NDEBUG
kDebug() << "Can't verify?";
// qDebug() << "Can't verify?";
#endif
return false;
}
@ -201,7 +201,7 @@ bool Credentials::canSign() const
{
#if ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
qWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return false;
}
@ -216,7 +216,7 @@ QByteArray Credentials::signMessage(const QByteArray &message)
#if ENABLE_REMOTE_WIDGETS
if(!QCA::isSupported(REQUIRED_FEATURES)) {
#ifndef NDEBUG
kDebug() << "RSA not supported";
// qDebug() << "RSA not supported";
#endif
return QByteArray();
} else if (canSign()) {
@ -248,7 +248,7 @@ QDataStream &operator<<(QDataStream &out, const Credentials &myObj)
{
#if ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
qWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return out;
}
@ -272,7 +272,7 @@ QDataStream &operator>>(QDataStream &in, Credentials &myObj)
{
#if ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
qWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return in;
}
@ -294,7 +294,7 @@ QDataStream &operator>>(QDataStream &in, Credentials &myObj)
if (conversionResult != QCA::ConvertGood) {
#ifndef NDEBUG
kDebug() << "Unsuccessfull conversion of key?";
// qDebug() << "Unsuccessfull conversion of key?";
#endif
}
#endif

40
src/plasma/runnercontext.cpp
View File

@ -30,7 +30,7 @@
#include <kcompletion.h>
#include <kconfiggroup.h>
#include <kdebug.h>
#include <QDebug>
#include <qmimedatabase.h>
#include <kshell.h>
#include <qstandardpaths.h>
@ -60,35 +60,35 @@ Returns true on success and false on error, in case of error, correctCasePath is
*/
bool correctLastComponentCase(const QString &path, QString &correctCasePath, const bool mustBeDir)
{
//kDebug() << "Correcting " << path;
//qDebug() << "Correcting " << path;
// If the file already exists then no need to search for it.
if (QFile::exists(path)) {
correctCasePath = path;
//kDebug() << "Correct path is" << correctCasePath;
//qDebug() << "Correct path is" << correctCasePath;
return true;
}
const QFileInfo pathInfo(path);
const QDir fileDir = pathInfo.dir();
//kDebug() << "Directory is" << fileDir;
//qDebug() << "Directory is" << fileDir;
const QString filename = pathInfo.fileName();
//kDebug() << "Filename is" << filename;
//qDebug() << "Filename is" << filename;
//kDebug() << "searching for a" << (mustBeDir ? "directory" : "directory/file");
//qDebug() << "searching for a" << (mustBeDir ? "directory" : "directory/file");
const QStringList matchingFilenames = fileDir.entryList(QStringList(filename),
mustBeDir ? QDir::Dirs : QDir::NoFilter);
if (matchingFilenames.empty()) {
//kDebug() << "No matches found!!\n";
//qDebug() << "No matches found!!\n";
return false;
} else {
/*if (matchingFilenames.size() > 1) {
#ifndef NDEBUG
kDebug() << "Found multiple matches!!\n";
// qDebug() << "Found multiple matches!!\n";
#endif
}*/
@ -98,7 +98,7 @@ bool correctLastComponentCase(const QString &path, QString &correctCasePath, con
correctCasePath = fileDir.path() + QDir::separator() + matchingFilenames[0];
}
//kDebug() << "Correct path is" << correctCasePath;
//qDebug() << "Correct path is" << correctCasePath;
return true;
}
}
@ -126,7 +126,7 @@ bool correctPathCase(const QString& path, QString &corrected)
const bool mustBeDir = components.back().isEmpty();
//kDebug() << "Components are" << components;
//qDebug() << "Components are" << components;
if (mustBeDir) {
components.pop_back();
@ -142,7 +142,7 @@ bool correctPathCase(const QString& path, QString &corrected)
const QString tmp = components[0] + QDir::separator() + components[1];
if (!correctLastComponentCase(tmp, correctPath, components.size() > 2 || mustBeDir)) {
//kDebug() << "search was not successful";
//qDebug() << "search was not successful";
return false;
}
@ -172,7 +172,7 @@ class RunnerContextPrivate : public QSharedData
q(p.q),
singleRunnerQueryMode(false)
{
//kDebug() << "¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿boo yeah" << type;
//qDebug() << "¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿boo yeah" << type;
}
~RunnerContextPrivate()
@ -200,7 +200,7 @@ class RunnerContextPrivate : public QSharedData
} else {
QUrl url = QUrl::fromUserInput(term);
// check for a normal URL first
//kDebug() << url << KProtocolInfo::protocolClass(url.scheme()) << url.hasHost() <<
//qDebug() << url << KProtocolInfo::protocolClass(url.scheme()) << url.hasHost() <<
// url.host() << url.isLocalFile() << path << path.indexOf('/');
const bool hasProtocol = !url.scheme().isEmpty();
const bool isLocalProtocol = KProtocolInfo::protocolClass(url.scheme()) == ":local";
@ -215,13 +215,13 @@ class RunnerContextPrivate : public QSharedData
// but if a path doesn't have any slashes
// it's too ambiguous to be sure we're in a filesystem context
path = QDir::cleanPath(url.toLocalFile());
//kDebug( )<< "slash check" << path;
//qDebug()<< "slash check" << path;
if (hasProtocol || ((path.indexOf('/') != -1 || path.indexOf('\\') != -1))) {
QString correctCasePath;
if (correctPathCase(path, correctCasePath)) {
path = correctCasePath;
QFileInfo info(path);
//kDebug( )<< "correct cas epath is" << correctCasePath << info.isSymLink() <<
//qDebug()<< "correct cas epath is" << correctCasePath << info.isSymLink() <<
// info.isDir() << info.isFile();
if (info.isSymLink()) {
@ -244,7 +244,7 @@ class RunnerContextPrivate : public QSharedData
}
}
//kDebug() << "term2type" << term << type;
//qDebug() << "term2type" << term << type;
}
void invalidate()
@ -329,7 +329,7 @@ void RunnerContext::reset()
d->mimeType.clear();
d->type = UnknownType;
d->singleRunnerQueryMode = false;
//kDebug() << "match count" << d->matches.count();
//qDebug() << "match count" << d->matches.count();
}
void RunnerContext::setQuery(const QString &term)
@ -386,13 +386,13 @@ bool RunnerContext::addMatches(const QList<QueryMatch> &matches)
d->matches.append(match);
#ifndef NDEBUG
if (d->matchesById.contains(match.id())) {
kDebug() << "Duplicate match id " << match.id() << "from" << match.runner()->name();
// qDebug() << "Duplicate match id " << match.id() << "from" << match.runner()->name();
}
#endif
d->matchesById.insert(match.id(), &d->matches.at(d->matches.size() - 1));
}
UNLOCK(d);
//kDebug()<< "add matches";
//qDebug()<< "add matches";
// A copied searchContext may share the d pointer,
// we always want to sent the signal of the object that created
// the d pointer
@ -419,7 +419,7 @@ bool RunnerContext::addMatch(const QueryMatch &match)
d->matches.append(m);
d->matchesById.insert(m.id(), &d->matches.at(d->matches.size() - 1));
UNLOCK(d);
//kDebug()<< "added match" << match->text();
//qDebug()<< "added match" << match->text();
emit d->q->matchesChanged();
return true;

32
src/plasma/runnermanager.cpp
View File

@ -28,7 +28,7 @@
#include <QCoreApplication>
#include <qstandardpaths.h>
#include <kdebug.h>
#include <QDebug>
#include <kplugininfo.h>
#include <kservicetypetrader.h>
@ -111,7 +111,7 @@ public:
//This entry allows to define a hard upper limit independent of the number of processors.
const int maxThreads = config.readEntry("maxThreads", 16);
const int numThreads = qMin(maxThreads, 2 + ((numProcs - 1) * 2));
//kDebug() << "setting up" << numThreads << "threads for" << numProcs << "processors";
//qDebug() << "setting up" << numThreads << "threads for" << numProcs << "processors";
if (numThreads > Weaver::instance()->maximumNumberOfThreads()) {
Weaver::instance()->setMaximumNumberOfThreads(numThreads);
}
@ -192,9 +192,9 @@ public:
QMutableListIterator<KPluginInfo> it(offers);
while (it.hasNext()) {
KPluginInfo &description = it.next();
//kDebug() << "Loading runner: " << service->name() << service->storageId();
//qDebug() << "Loading runner: " << service->name() << service->storageId();
QString tryExec = description.property("TryExec").toString();
//kDebug() << "TryExec is" << tryExec;
//qDebug() << "TryExec is" << tryExec;
if (!tryExec.isEmpty() && QStandardPaths::findExecutable(tryExec).isEmpty()) {
// we don't actually have this application!
continue;
@ -212,7 +212,7 @@ public:
advertiseSingleRunnerIds.insert(runnerName, description.name());
}
//kDebug() << loadAll << description.isPluginEnabled() << noWhiteList << whiteList.contains(runnerName);
//qDebug() << loadAll << description.isPluginEnabled() << noWhiteList << whiteList.contains(runnerName);
if (selected) {
if (!loaded) {
AbstractRunner *runner = loadInstalledRunner(description.service());
@ -225,7 +225,7 @@ public:
//Remove runner
deadRunners.insert(runners.take(runnerName));
#ifndef NDEBUG
kDebug() << "Removing runner: " << runnerName;
// qDebug() << "Removing runner: " << runnerName;
#endif
}
}
@ -268,7 +268,7 @@ public:
}
#ifndef NDEBUG
kDebug() << "All runners loaded, total:" << runners.count();
// qDebug() << "All runners loaded, total:" << runners.count();
#endif
}
@ -293,19 +293,19 @@ public:
runner = service->createInstance<AbstractRunner>(q, args, &error);
if (!runner) {
#ifndef NDEBUG
kDebug() << "Failed to load runner:" << service->name() << ". error reported:" << error;
// qDebug() << "Failed to load runner:" << service->name() << ". error reported:" << error;
#endif
}
}
} else {
//kDebug() << "got a script runner known as" << api;
//qDebug() << "got a script runner known as" << api;
runner = new AbstractRunner(service, q);
}
}
if (runner) {
#ifndef NDEBUG
kDebug() << "================= loading runner:" << service->name() << "=================";
// qDebug() << "================= loading runner:" << service->name() << "=================";
#endif
QObject::connect(runner, SIGNAL(matchingSuspended(bool)), q, SLOT(runnerMatchingSuspended(bool)));
runner->init();
@ -326,7 +326,7 @@ public:
}
if (deferredRun.isEnabled() && runJob->runner() == deferredRun.runner()) {
//kDebug() << "job actually done, running now **************";
//qDebug() << "job actually done, running now **************";
QueryMatch tmpRun = deferredRun;
deferredRun = QueryMatch(0);
tmpRun.run(context);
@ -348,7 +348,7 @@ public:
void checkTearDown()
{
//kDebug() << prepped << teardownRequested << searchJobs.count() << oldSearchJobs.count();
//qDebug() << prepped << teardownRequested << searchJobs.count() << oldSearchJobs.count();
if (!prepped || !teardownRequested) {
return;
@ -623,7 +623,7 @@ void RunnerManager::run(const QueryMatch &match)
for (auto it = d->searchJobs.constBegin(); it != d->searchJobs.constEnd(); ++it) {
if ((*it)->runner() == runner && !(*it)->isFinished()) {
#ifndef NDEBUG
kDebug() << "deferred run";
// qDebug() << "deferred run";
#endif
d->deferredRun = match;
return;
@ -691,7 +691,7 @@ void RunnerManager::setupMatchSession()
emit runner->prepare();
#ifdef MEASURE_PREPTIME
#ifndef NDEBUG
kDebug() << t.elapsed() << runner->name();
// qDebug() << t.elapsed() << runner->name();
#endif
#endif
}
@ -746,7 +746,7 @@ void RunnerManager::launchQuery(const QString &untrimmedTerm, const QString &run
}
reset();
// kDebug() << "runners searching for" << term << "on" << runnerName;
// qDebug() << "runners searching for" << term << "on" << runnerName;
d->context.setQuery(term);
QHash<QString, AbstractRunner*> runable;
@ -791,7 +791,7 @@ void RunnerManager::reset()
d->searchJobs.clear();
if (d->deferredRun.isEnabled()) {
//kDebug() << "job actually done, running now **************";
//qDebug() << "job actually done, running now **************";
QueryMatch tmpRun = d->deferredRun;
d->deferredRun = QueryMatch(0);
tmpRun.run(d->context);

12
src/plasma/scripting/scriptengine.cpp
View File

@ -19,7 +19,7 @@
#include "scripting/scriptengine.h"
#include <kdebug.h>
#include <QDebug>
#include <kservice.h>
#include <kservicetypetrader.h>
@ -94,7 +94,7 @@ QStringList knownLanguages(Types::ComponentTypes types)
}
KService::List offers = KServiceTypeTrader::self()->query("Plasma/ScriptEngine", constraint);
//kDebug() << "Applet::knownApplets constraint was '" << constraint
//qDebug() << "Applet::knownApplets constraint was '" << constraint
// << "' which got us " << offers.count() << " matches";
QStringList languages;
@ -117,7 +117,7 @@ KService::List engineOffers(const QString &language, Types::ComponentType type)
QRegExp re("[^a-zA-Z0-9\\-_]");
if (re.indexIn(language) != -1) {
#ifndef NDEBUG
kDebug() << "invalid language attempted:" << language;
// qDebug() << "invalid language attempted:" << language;
#endif
return KService::List();
}
@ -141,11 +141,11 @@ KService::List engineOffers(const QString &language, Types::ComponentType type)
QString constraint = QString("[X-Plasma-API] == '%1' and "
"'%2' in [X-Plasma-ComponentTypes]").arg(language, component);
KService::List offers = KServiceTypeTrader::self()->query("Plasma/ScriptEngine", constraint);
/* kDebug() << "********************* loadingApplet with Plasma/ScriptEngine" << constraint
/* // qDebug() << "********************* loadingApplet with Plasma/ScriptEngine" << constraint
<< "resulting in" << offers.count() << "results";*/
if (offers.isEmpty()) {
#ifndef NDEBUG
kDebug() << "No offers for \"" << language << "\"";
// qDebug() << "No offers for \"" << language << "\"";
#endif
}
@ -181,7 +181,7 @@ ScriptEngine *loadEngine(const QString &language, Types::ComponentType type, QOb
}
#ifndef NDEBUG
kDebug() << "Couldn't load script engine for language " << language
// qDebug() << "Couldn't load script engine for language " << language
<< "! error reported: " << error;
#endif
}

18
src/plasma/service.cpp
View File

@ -26,7 +26,7 @@
#include <QTimer>
#include <QQuickItem>
#include <kdebug.h>
#include <QDebug>
#include <kservice.h>
#include <kservicetypetrader.h>
#include <ksharedconfig.h>
@ -193,7 +193,7 @@ QStringList Service::operationNames() const
{
if (d->operationsMap.keys().isEmpty()) {
#ifndef NDEBUG
kDebug() << "No valid operations scheme has been registered";
// qDebug() << "No valid operations scheme has been registered";
#endif
return QStringList();
}
@ -205,12 +205,12 @@ QVariantMap Service::operationDescription(const QString &operationName)
{
if (d->operationsMap.keys().isEmpty()) {
#ifndef NDEBUG
kDebug() << "No valid operations scheme has been registered";
// qDebug() << "No valid operations scheme has been registered";
#endif
return QVariantMap();
}
//kDebug() << "operation" << operationName
//qDebug() << "operation" << operationName
// << "requested, has keys" << d->operationsMap.keys();
return d->operationsMap.value(operationName);
}
@ -223,12 +223,12 @@ ServiceJob *Service::startOperationCall(const QVariantMap &description, QObject
if (d->operationsMap.keys().isEmpty()) {
#ifndef NDEBUG
kDebug() << "No valid operations scheme has been registered";
// qDebug() << "No valid operations scheme has been registered";
#endif
} else if (!op.isEmpty() && d->operationsMap.contains(op)) {
if (d->disabledOperations.contains(op)) {
#ifndef NDEBUG
kDebug() << "Operation" << op << "is disabled";
// qDebug() << "Operation" << op << "is disabled";
#endif
} else {
QVariantMap map = description;
@ -236,7 +236,7 @@ ServiceJob *Service::startOperationCall(const QVariantMap &description, QObject
}
} else {
#ifndef NDEBUG
kDebug() << op << "is not a valid group; valid groups are:" << d->operationsMap.keys();
// qDebug() << op << "is not a valid group; valid groups are:" << d->operationsMap.keys();
#endif
}
@ -316,7 +316,7 @@ void Service::registerOperationsScheme()
if (d->name.isEmpty()) {
#ifndef NDEBUG
kDebug() << "No name found";
// qDebug() << "No name found";
#endif
return;
}
@ -325,7 +325,7 @@ void Service::registerOperationsScheme()
if (path.isEmpty()) {
#ifndef NDEBUG
kDebug() << "Cannot find operations description:" << d->name << ".operations";
// qDebug() << "Cannot find operations description:" << d->name << ".operations";
#endif
return;
}

2
src/plasma/servicejob.cpp
View File

@ -19,7 +19,7 @@
#include "servicejob.h"
#include <kdebug.h>
#include <QDebug>
#include <plasma/private/servicejob_p.h>

60
src/plasma/staging/signing.cpp
View File

@ -38,7 +38,7 @@
#include <QtCore/QStringList>
#include <kdirwatch.h>
#include <kdebug.h>
#include <QDebug>
#include <kstandarddirs.h>
#include <kprocess.h>
#include <kuser.h>
@ -55,7 +55,7 @@ SigningPrivate::SigningPrivate(Signing *auth, const QString &keystorePath = 0)
GpgME::initializeLibrary();
GpgME::Error error = GpgME::checkEngine(GpgME::OpenPGP);
if (error) {
kDebug() << "OpenPGP engine not found: authentication will not work.";
// qDebug() << "OpenPGP engine not found: authentication will not work.";
return;
}
@ -72,7 +72,7 @@ SigningPrivate::SigningPrivate(Signing *auth, const QString &keystorePath = 0)
} else {
error = m_gpgContext->setEngineHomeDirectory(m_keystorePath.toAscii().data());
if (error) {
kDebug() << "Failed setting custom gpg keystore directory: using default.";
// qDebug() << "Failed setting custom gpg keystore directory: using default.";
}
}
@ -99,14 +99,14 @@ void SigningPrivate::importKdeKeysToKeystore()
{
QList< QByteArray > tmp;
if (!m_gpgContext) {
kDebug() << "GPGME context not valid: please re-initialize the library.";
// qDebug() << "GPGME context not valid: please re-initialize the library.";
keys.insert(UltimatelyTrusted, tmp);
return;
}
QString path(KStandardDirs::locate("appdata", "plasmakeys/"));
QDir dir(path);
if (!dir.exists() || path.isEmpty() || path.isNull()) {
kDebug() << "Directory with KDE keys not found: aborting";
// qDebug() << "Directory with KDE keys not found: aborting";
keys[UltimatelyTrusted] = tmp;
return;
}
@ -123,8 +123,8 @@ void SigningPrivate::importKdeKeysToKeystore()
GpgME::Data data(fp);
GpgME::ImportResult iRes = m_gpgContext->importKeys(data);
if (iRes.error()) {
kDebug() << "Error while importing the key located at: " << keyFile;
kDebug() << " The error is:" << iRes.error().asString() << "; Skipping.";
// qDebug() << "Error while importing the key located at: " << keyFile;
// qDebug() << " The error is:" << iRes.error().asString() << "; Skipping.";
continue;
}
@ -142,7 +142,7 @@ void SigningPrivate::importKdeKeysToKeystore()
void SigningPrivate::splitKeysByTrustLevel()
{
if (!m_gpgContext) {
kDebug() << "GPGME context not valid: please re-initialize the library.";
// qDebug() << "GPGME context not valid: please re-initialize the library.";
return;
}
@ -223,7 +223,7 @@ void SigningPrivate::splitKeysByTrustLevel()
lRes = m_gpgContext->endKeyListing();
if (lRes.error()) {
kDebug() << "Error while ending the keyListing operation: " << lRes.error().asString();
// qDebug() << "Error while ending the keyListing operation: " << lRes.error().asString();
}
//Loop 4 - looking for keys signed by kde or by the user, tmp contains the valid public keys remaining
@ -270,7 +270,7 @@ void SigningPrivate::splitKeysByTrustLevel()
list.append(ba);
}
kDebug() << "UltimatelyTrusted = " << list;
// qDebug() << "UltimatelyTrusted = " << list;
list.clear();
temp = keys[FullyTrused];
@ -278,7 +278,7 @@ void SigningPrivate::splitKeysByTrustLevel()
list.append(ba);
}
kDebug() << "FullyTrused = " << list;
// qDebug() << "FullyTrused = " << list;
list.clear();
temp = keys[SelfTrusted];
@ -286,7 +286,7 @@ void SigningPrivate::splitKeysByTrustLevel()
list.append(ba);
}
kDebug() << "SelfTrusted = " << list;
// qDebug() << "SelfTrusted = " << list;
list.clear();
temp = keys[UserTrusted];
@ -294,7 +294,7 @@ void SigningPrivate::splitKeysByTrustLevel()
list.append(ba);
}
kDebug() << "UserTrusted = " << list;
// qDebug() << "UserTrusted = " << list;
list.clear();
temp = keys[UnknownTrusted];
@ -302,7 +302,7 @@ void SigningPrivate::splitKeysByTrustLevel()
list.append(ba);
}
kDebug() << "UnknownTrusted = " << list;
// qDebug() << "UnknownTrusted = " << list;
list.clear();
temp = keys[CompletelyUntrusted];
@ -310,8 +310,8 @@ void SigningPrivate::splitKeysByTrustLevel()
list.append(ba);
}
kDebug() << "CompletelyUntrusted = " << list;
kDebug() << "ALL = " << keys;
// qDebug() << "CompletelyUntrusted = " << list;
// qDebug() << "ALL = " << keys;
}
QStringList SigningPrivate::keysID(const bool returnPrivate) const
@ -319,7 +319,7 @@ QStringList SigningPrivate::keysID(const bool returnPrivate) const
QStringList result;
if (!m_gpgContext) {
kDebug() << "GPGME context not valid: please re-initialize the library.";
// qDebug() << "GPGME context not valid: please re-initialize the library.";
return result;
}
@ -333,7 +333,7 @@ QStringList SigningPrivate::keysID(const bool returnPrivate) const
}
GpgME::KeyListResult lRes = m_gpgContext->endKeyListing();
if (lRes.error()) {
kDebug() << "Error while ending the keyListing operation: " << lRes.error().asString();
// qDebug() << "Error while ending the keyListing operation: " << lRes.error().asString();
}
return result;
@ -352,7 +352,7 @@ QString SigningPrivate::signerOf(const QString &messagePath, const QString &sign
GpgME::VerificationResult vRes = m_gpgContext->verifyDetachedSignature(sig, file);
if (!vRes.error()) {
kDebug() << "message " << messagePath << " and signature " << signaturePath << "matched! The fingerprint of the signer is: " << vRes.signature(0).fingerprint();
// qDebug() << "message " << messagePath << " and signature " << signaturePath << "matched! The fingerprint of the signer is: " << vRes.signature(0).fingerprint();
return QString(vRes.signature(0).fingerprint());
}
@ -364,7 +364,7 @@ QString SigningPrivate::descriptiveString(const QString &keyID) const
QString result;
if (!m_gpgContext) {
kDebug() << "GPGME context not valid: please re-initialize the library.";
// qDebug() << "GPGME context not valid: please re-initialize the library.";
return result;
}
@ -382,7 +382,7 @@ QString SigningPrivate::descriptiveString(const QString &keyID) const
}
GpgME::KeyListResult lRes = m_gpgContext->endKeyListing();
if (lRes.error()) {
kDebug() << "Error while ending the keyListing operation: " << lRes.error().asString();
// qDebug() << "Error while ending the keyListing operation: " << lRes.error().asString();
}
return result;
@ -503,7 +503,7 @@ void SigningPrivate::slotKDEKeyRemoved(const QString path)
error = m_gpgContext->startKeyDeletion(k, true); // GG
if (error) {
kDebug() << "Can't delete key with fingerprint: " << result;
// qDebug() << "Can't delete key with fingerprint: " << result;
m_gpgContext->endKeyListing();
return;
}
@ -513,7 +513,7 @@ void SigningPrivate::slotKDEKeyRemoved(const QString path)
}
GpgME::KeyListResult lRes = m_gpgContext->endKeyListing();
if (lRes.error()) {
kDebug() << "Error while ending the keyListing operation: " << lRes.error().asString();
// qDebug() << "Error while ending the keyListing operation: " << lRes.error().asString();
}
splitKeysByTrustLevel();
@ -547,10 +547,10 @@ QStringList SigningPrivate::signersOf(const QString id) const
}
GpgME::KeyListResult lRes = m_gpgContext->endKeyListing();
if (lRes.error()) {
kDebug() << "Error while ending the keyListing operation: " << lRes.error().asString();
// qDebug() << "Error while ending the keyListing operation: " << lRes.error().asString();
}
kDebug() << "Hey, the key " << id << " has been signed with " << result;
// qDebug() << "Hey, the key " << id << " has been signed with " << result;
return result;
}
@ -613,8 +613,8 @@ QStringList Signing::publicKeys() const
QString Signing::signerOf(const QUrl &plasmoidPath, const QUrl &plasmoidSignaturePath) const
{
kDebug() << "Checking existence of " << plasmoidPath.pathOrUrl();
kDebug() << "Checking existence of " << plasmoidSignaturePath.pathOrUrl();
// qDebug() << "Checking existence of " << plasmoidPath.pathOrUrl();
// qDebug() << "Checking existence of " << plasmoidSignaturePath.pathOrUrl();
// Original file and signature to verify against
QFile fileHanlder(plasmoidPath.path());
QFile signatureHandler(plasmoidSignaturePath.isEmpty() ?
@ -626,15 +626,15 @@ QString Signing::signerOf(const QUrl &plasmoidPath, const QUrl &plasmoidSignatur
signatureHandler.open(QIODevice::ReadOnly);
if (!fileHanlder.exists()) {
kDebug() << "Plasmoid package doesn't exists: signature verification aborted.";
// qDebug() << "Plasmoid package doesn't exists: signature verification aborted.";
return QString();
}
if (!signatureHandler.exists()) {
kDebug() << "Plasmoid signature doesn't exists: signature verification aborted.";
// qDebug() << "Plasmoid signature doesn't exists: signature verification aborted.";
return QString();
}
kDebug() << "Cheking if " << plasmoidPath.pathOrUrl() << " and " << plasmoidSignaturePath.pathOrUrl() << " matches";
// qDebug() << "Cheking if " << plasmoidPath.pathOrUrl() << " and " << plasmoidSignaturePath.pathOrUrl() << " matches";
return d->signerOf(plasmoidPath.pathOrUrl(), plasmoidSignaturePath.pathOrUrl());
}

2
src/plasma/staging/signingtest.cpp
View File

@ -21,7 +21,7 @@
#include <QTime>
#include <kdebug.h>
#include <QDebug>
#include "applet.h"
#include "signing.h"

38
src/plasma/svg.cpp
View File

@ -32,7 +32,7 @@
#include <kcolorscheme.h>
#include <kconfiggroup.h>
#include <kdebug.h>
#include <QDebug>
#include <kfilterdev.h>
#include <kiconeffect.h>
#include <kglobalsettings.h>
@ -207,7 +207,7 @@ bool SvgPrivate::setImagePath(const QString &imagePath)
path = imagePath;
} else {
#ifndef NDEBUG
kDebug() << "file '" << path << "' does not exist!";
// qDebug() << "file '" << path << "' does not exist!";
#endif
}
@ -223,9 +223,9 @@ bool SvgPrivate::setImagePath(const QString &imagePath)
} else {
createRenderer();
naturalSize = renderer->defaultSize();
//kDebug() << "natural size for" << path << "from renderer is" << naturalSize;
//qDebug() << "natural size for" << path << "from renderer is" << naturalSize;
cacheAndColorsTheme()->insertIntoRectsCache(path, "_Natural", QRectF(QPointF(0,0), naturalSize));
//kDebug() << "natural size for" << path << "from cache is" << naturalSize;
//qDebug() << "natural size for" << path << "from cache is" << naturalSize;
}
}
@ -334,17 +334,17 @@ QPixmap SvgPrivate::findInCache(const QString &elementId, const QSizeF &s)
id.append(actualElementId);
}
//kDebug() << "id is " << id;
//qDebug() << "id is " << id;
QPixmap p;
if (cacheRendering && cacheAndColorsTheme()->findInCache(id, p, lastModified)) {
//kDebug() << "found cached version of " << id << p.size();
//qDebug() << "found cached version of " << id << p.size();
return p;
}
//kDebug() << "didn't find cached version of " << id << ", so re-rendering";
//qDebug() << "didn't find cached version of " << id << ", so re-rendering";
//kDebug() << "size for " << actualElementId << " is " << s;
//qDebug() << "size for " << actualElementId << " is " << s;
// we have to re-render this puppy
createRenderer();
@ -386,7 +386,7 @@ void SvgPrivate::createRenderer()
return;
}
//kDebug() << kBacktrace();
//qDebug() << kBacktrace();
if (themed && path.isEmpty() && !themeFailed) {
Applet *applet = qobject_cast<Applet*>(q->parent());
//FIXME: this maybe could be more efficient if we knew if the package was empty, e.g. for
@ -405,14 +405,14 @@ void SvgPrivate::createRenderer()
path = actualTheme()->imagePath(themePath);
themeFailed = path.isEmpty();
if (themeFailed) {
kWarning() << "No image path found for" << themePath;
qWarning() << "No image path found for" << themePath;
}
}
}
//kDebug() << "********************************";
//kDebug() << "FAIL! **************************";
//kDebug() << path << "**";
//qDebug() << "********************************";
//qDebug() << "FAIL! **************************";
//qDebug() << path << "**";
QString styleSheet = cacheAndColorsTheme()->d->svgStyleSheet();
styleCrc = qChecksum(styleSheet.toUtf8(), styleSheet.size());
@ -420,7 +420,7 @@ void SvgPrivate::createRenderer()
QHash<QString, SharedSvgRenderer::Ptr>::const_iterator it = s_renderers.constFind(styleCrc + path);
if (it != s_renderers.constEnd()) {
//kDebug() << "gots us an existing one!";
//qDebug() << "gots us an existing one!";
renderer = it.value();
} else {
if (path.isEmpty()) {
@ -599,7 +599,7 @@ QRectF SvgPrivate::makeUniform(const QRectF &orig, const QRectF &dst)
res.setHeight(res.height() + offset);
}
//kDebug()<<"Aligning Rects, origin:"<<orig<<"destination:"<<dst<<"result:"<<res;
//qDebug()<<"Aligning Rects, origin:"<<orig<<"destination:"<<dst<<"result:"<<res;
return res;
}
@ -619,7 +619,7 @@ void SvgPrivate::themeChanged()
eraseRenderer();
setImagePath(currentPath);
//kDebug() << themePath << ">>>>>>>>>>>>>>>>>> theme changed";
//qDebug() << themePath << ">>>>>>>>>>>>>>>>>> theme changed";
emit q->repaintNeeded();
}
@ -630,7 +630,7 @@ void SvgPrivate::colorsChanged()
}
eraseRenderer();
//kDebug() << "repaint needed from colorsChanged";
//qDebug() << "repaint needed from colorsChanged";
emit q->repaintNeeded();
}
@ -754,7 +754,7 @@ FIXME: implement when Qt can support us!
QSizeF naturalSize = d->renderer->defaultSize();
qreal dx = d->size.width() / naturalSize.width();
qreal dy = d->size.height() / naturalSize.height();
//kDebug() << point << "is really"
//qDebug() << point << "is really"
// << QPoint(point.x() *dx, naturalSize.height() - point.y() * dy);
return QString(); // d->renderer->elementAtPoint(QPoint(point.x() *dx, naturalSize.height() - point.y() * dy));
@ -784,7 +784,7 @@ bool Svg::containsMultipleImages() const
void Svg::setImagePath(const QString &svgFilePath)
{
if (d->setImagePath(svgFilePath)) {
//kDebug() << "repaintNeeded";
//qDebug() << "repaintNeeded";
emit repaintNeeded();
}
}

14
src/plasma/tests/testcontainmentactionsplugin/test.cpp
View File

@ -49,14 +49,14 @@ void ContextTest::contextEvent(QEvent *event)
void ContextTest::contextEvent(QGraphicsSceneMouseEvent *event)
{
kDebug() << "test!!!!!!!!!!!!!!!!!!!!!!!" << event->pos();
kDebug() << event->buttons() << event->modifiers();
// qDebug() << "test!!!!!!!!!!!!!!!!!!!!!!!" << event->pos();
// qDebug() << event->buttons() << event->modifiers();
Plasma::Containment *c = containment();
if (c) {
kDebug() << c->name();
// qDebug() << c->name();
} else {
kDebug() << "fail";
// qDebug() << "fail";
return;
}
@ -69,9 +69,9 @@ void ContextTest::contextEvent(QGraphicsSceneMouseEvent *event)
void ContextTest::wheelEvent(QGraphicsSceneWheelEvent *event)
{
kDebug() << "test!!!!!!!!!!!!!11111111!!";
kDebug() << event->orientation() << event->delta();
kDebug() << event->buttons() << event->modifiers();
// qDebug() << "test!!!!!!!!!!!!!11111111!!";
// qDebug() << event->orientation() << event->delta();
// qDebug() << event->buttons() << event->modifiers();
}
void ContextTest::init(const KConfigGroup &config)

12
src/plasma/theme.cpp
View File

@ -34,7 +34,7 @@
#include <kcolorscheme.h>
#include <kcomponentdata.h>
#include <kconfiggroup.h>
#include <kdebug.h>
#include <QDebug>
#include <kdirwatch.h>
#include <kglobal.h>
#include <kglobalsettings.h>
@ -160,7 +160,7 @@ QString Theme::imagePath(const QString &name) const
// look for a compressed svg file in the theme
if (name.contains("../") || name.isEmpty()) {
// we don't support relative paths
//kDebug() << "Theme says: bad image path " << name;
//qDebug() << "Theme says: bad image path " << name;
return QString();
}
@ -191,7 +191,7 @@ QString Theme::imagePath(const QString &name) const
/*
if (path.isEmpty()) {
#ifndef NDEBUG
kDebug() << "Theme says: bad image path " << name;
// qDebug() << "Theme says: bad image path " << name;
#endif
}
*/
@ -236,19 +236,19 @@ QString Theme::wallpaperPath(const QSize &size) const
if (fullPath.isEmpty()) {
// we failed to find it in the theme, so look in the standard directories
//kDebug() << "looking for" << image;
//qDebug() << "looking for" << image;
fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("wallpapers/") + image);
}
if (fullPath.isEmpty()) {
// we still failed to find it in the theme, so look for the default in
// the standard directories
//kDebug() << "looking for" << defaultImage;
//qDebug() << "looking for" << defaultImage;
fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("wallpapers/") + defaultImage);
if (fullPath.isEmpty()) {
#ifndef NDEBUG
kDebug() << "exhausted every effort to find a wallpaper.";
// qDebug() << "exhausted every effort to find a wallpaper.";
#endif
}
}

6
src/plasma/version.cpp
View File

@ -18,7 +18,7 @@
*/
#include <plasma/version.h>
#include <kdebug.h>
#include <QDebug>
namespace Plasma
{
@ -52,7 +52,7 @@ bool isPluginVersionCompatible(unsigned int version)
{
if (version == quint32(-1)) {
// unversioned, just let it through
kWarning() << "unversioned plugin detected, may result in instability";
qWarning() << "unversioned plugin detected, may result in instability";
return true;
}
@ -62,7 +62,7 @@ bool isPluginVersionCompatible(unsigned int version)
if (version < minVersion || version > maxVersion) {
#ifndef NDEBUG
kDebug() << "plugin is compiled against incompatible Plasma version " << version
// qDebug() << "plugin is compiled against incompatible Plasma version " << version
<< "This build is compatible with" << PLASMA_VERSION_MAJOR << ".0.0 (" << minVersion
<< ") to" << PLASMA_VERSION_STRING << "(" << maxVersion << ")";
#endif

2
src/plasmapkg/main.cpp
View File

@ -51,6 +51,8 @@ int main(int argc, char **argv)
parser.addOption(QCommandLineOption(QStringList() << "r" << "remove", i18nc("Do not translate <name>", "Remove the package named <name>"), "name"));
parser.addOption(QCommandLineOption(QStringList() << "p" << "packageroot", i18n("Absolute path to the package root. If not supplied, then the standard data directories for this KDE session will be searched instead."), "path"));
parser.process(app);
return app.exec();
}

4
src/plasmapkg/plasmapkg.cpp
View File

@ -20,7 +20,7 @@
#include "plasmapkg.h"
#include <kdebug.h>
#include <QDebug>
#include <kservice.h>
#include <kservicetypetrader.h>
#include <kshell.h>
@ -261,7 +261,7 @@ void PlasmaPkg::runMain()
exit(1);
return;
}
kWarning() << "custom PackageStructure plugins not ported";
qWarning() << "custom PackageStructure plugins not ported";
KService::Ptr offer = offers.first();
QString error;

4
src/scriptengines/javascript/common/extension_io.cpp
View File

@ -74,7 +74,7 @@ QScriptValue ScriptEnv::getUrl(QScriptContext *context, QScriptEngine *engine)
ScriptEnv *env = ScriptEnv::findScriptEnv(engine);
if (!env) {
//kDebug() << "findScriptEnv failed";
//qDebug() << "findScriptEnv failed";
return engine->undefinedValue();
}
@ -111,7 +111,7 @@ QScriptValue ScriptEnv::download(QScriptContext *context, QScriptEngine *engine)
ScriptEnv *env = ScriptEnv::findScriptEnv(engine);
if (!env) {
//kDebug() << "findScriptEnv failed";
//qDebug() << "findScriptEnv failed";
return engine->undefinedValue();
}

4
src/scriptengines/javascript/common/extension_launchapp.cpp
View File

@ -186,12 +186,12 @@ QScriptValue ScriptEnv::defaultApplication(QScriptContext *context, QScriptEngin
} else {
// try the files in share/apps/kcm_componentchooser/
const QStringList services = KGlobal::dirs()->findAllResources("data","kcm_componentchooser/*.desktop", KStandardDirs::NoDuplicates);
//kDebug() << "ok, trying in" << services.count();
//qDebug() << "ok, trying in" << services.count();
foreach (const QString &service, services) {
KConfig config(service, KConfig::SimpleConfig);
KConfigGroup cg = config.group(QByteArray());
const QString type = cg.readEntry("valueName", QString());
//kDebug() << " checking" << service << type << application;
//qDebug() << " checking" << service << type << application;
if (type.compare(application, Qt::CaseInsensitive) == 0) {
KConfig store(cg.readPathEntry("storeInFile", "null"));
KConfigGroup storeCg(&store, cg.readEntry("valueSection", QString()));

24
src/scriptengines/javascript/common/scriptenv.cpp
View File

@ -106,9 +106,9 @@ void ScriptEnv::registerEnums(QScriptValue &scriptValue, const QMetaObject &meta
QScriptEngine *engine = scriptValue.engine();
for (int i = 0; i < meta.enumeratorCount(); ++i) {
QMetaEnum e = meta.enumerator(i);
//kDebug() << e.name();
//qDebug() << e.name();
for (int i=0; i < e.keyCount(); ++i) {
//kDebug() << e.key(i) << e.value(i);
//qDebug() << e.key(i) << e.value(i);
scriptValue.setProperty(e.key(i), QScriptValue(engine, e.value(i)));
}
}
@ -118,12 +118,12 @@ bool ScriptEnv::include(const QString &path)
{
QFile file(path);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
kWarning() << i18n("Unable to load script file: %1", path);
qWarning() << i18n("Unable to load script file: %1", path);
return false;
}
QString script = file.readAll();
//kDebug() << "Script says" << script;
//qDebug() << "Script says" << script;
// change the context to the parent context so that the include is actually
// executed in the same context as the caller; seems to be what javascript
@ -154,7 +154,7 @@ bool ScriptEnv::checkForErrors(bool fatal)
bool ScriptEnv::importBuiltinExtension(const QString &extension, QScriptValue &obj)
{
kDebug() << extension;
// qDebug() << extension;
if ("filedialog" == extension) {
#ifdef USEGUI
FileDialogProxy::registerWithRuntime(m_engine);
@ -193,7 +193,7 @@ bool ScriptEnv::importExtensions(const KPluginInfo &info, QScriptValue &obj, Aut
{
QStringList requiredExtensions = info.property("X-Plasma-RequiredExtensions", QVariant::StringList).toStringList();
if (!requiredExtensions.isEmpty()) {
kDebug() << "required extensions are" << requiredExtensions;
// qDebug() << "required extensions are" << requiredExtensions;
}
foreach (const QString &ext, requiredExtensions) {
@ -221,7 +221,7 @@ bool ScriptEnv::importExtensions(const KPluginInfo &info, QScriptValue &obj, Aut
QStringList optionalExtensions = info.property("X-Plasma-OptionalExtensions", QVariant::StringList).toStringList();
if (!optionalExtensions.isEmpty()) {
kDebug() << "optional extensions are" << optionalExtensions;
// qDebug() << "optional extensions are" << optionalExtensions;
}
foreach (const QString &ext, optionalExtensions) {
@ -260,7 +260,7 @@ QScriptValue ScriptEnv::debug(QScriptContext *context, QScriptEngine *engine)
return throwNonFatalError(i18n("debug takes one argument"), context, engine);
}
kDebug() << context->argument(0).toString();
// qDebug() << context->argument(0).toString();
return engine->undefinedValue();
}
@ -353,7 +353,7 @@ QScriptValue ScriptEnv::loadAddon(QScriptContext *context, QScriptEngine *engine
QScriptValue::ReadOnly |
QScriptValue::Undeletable |
QScriptValue::SkipInEnumeration);
//kDebug() << "context is" << innerContext;
//qDebug() << "context is" << innerContext;
engine->evaluate(code, file.fileName());
engine->popContext();
@ -391,11 +391,11 @@ QScriptValue ScriptEnv::registerAddon(QScriptContext *context, QScriptEngine *en
QString ScriptEnv::filePathFromScriptContext(const char *type, const QString &file) const
{
//kDebug() << type << file;
//qDebug() << type << file;
QScriptContext *c = m_engine->currentContext();
while (c) {
QScriptValue v = c->activationObject().property("__plasma_package");
//kDebug() << "variant in parent context?" << v.isVariant();
//qDebug() << "variant in parent context?" << v.isVariant();
if (v.isVariant()) {
const QString path = v.toVariant().value<Plasma::Package>().filePath(type, file);
if (!path.isEmpty()) {
@ -406,7 +406,7 @@ QString ScriptEnv::filePathFromScriptContext(const char *type, const QString &fi
c = c->parentContext();
}
//kDebug() << "fail";
//qDebug() << "fail";
return QString();
}

6
src/scriptengines/javascript/dataengine/javascriptdataengine.cpp
View File

@ -123,7 +123,7 @@ QScriptValue JavaScriptDataEngine::jsSetData(QScriptContext *context, QScriptEng
if (context->argumentCount() == 1) {
iFace->setData(source, DataEngine::Data());
} else if (context->argument(1).isArray() || context->argument(1).isObject()) {
kDebug( )<< "array or object";
// qDebug()<< "array or object";
QScriptValueIterator it(context->argument(1));
DataEngine::Data data;
@ -262,9 +262,9 @@ void JavaScriptDataEngine::reportError(ScriptEnv *env, bool fatal) const
{
Q_UNUSED(fatal)
kDebug() << "Error: " << env->engine()->uncaughtException().toString()
// qDebug() << "Error: " << env->engine()->uncaughtException().toString()
<< " at line " << env->engine()->uncaughtExceptionLineNumber() << endl;
kDebug() << env->engine()->uncaughtExceptionBacktrace();
// qDebug() << env->engine()->uncaughtExceptionBacktrace();
}
QStringList JavaScriptDataEngine::sources() const

4
src/scriptengines/javascript/dataengine/javascriptservice.cpp
View File

@ -66,7 +66,7 @@ JavaScriptService::JavaScriptService(const QString &serviceName, JavaScriptDataE
JavaScriptService::~JavaScriptService()
{
// kDebug();
// qDebug();
}
Plasma::ServiceJob *JavaScriptService::createJob(const QString &operation, QMap<QString, QVariant> &parameters)
@ -96,7 +96,7 @@ void JavaScriptService::registerOperationsScheme()
const QString path = m_dataEngine.data()->filePath("services", name() + ".operations");
if (path.isEmpty()) {
kDebug() << "Cannot find operations description:" << name() << ".operations";
// qDebug() << "Cannot find operations description:" << name() << ".operations";
m_dataEngine.clear();
return;
}

12
src/scriptengines/javascript/runner/javascriptrunner.cpp
View File

@ -68,12 +68,12 @@ bool JavaScriptRunner::init()
QFile file(mainScript());
if (!file.open(QIODevice::ReadOnly | QIODevice::Text) ) {
kWarning() << "Unable to load script file";
qWarning() << "Unable to load script file";
return false;
}
QString script = file.readAll();
kDebug() << "Script says" << script;
// qDebug() << "Script says" << script;
m_engine->evaluate(script);
if (m_engine->hasUncaughtException()) {
@ -88,7 +88,7 @@ void JavaScriptRunner::match(Plasma::RunnerContext &search)
{
QScriptValue fun = m_self.property("match");
if (!fun.isFunction()) {
kDebug() << "Script: match is not a function, " << fun.toString();
// qDebug() << "Script: match is not a function, " << fun.toString();
return;
}
@ -110,7 +110,7 @@ void JavaScriptRunner::exec(const Plasma::RunnerContext *search, const Plasma::Q
{
QScriptValue fun = m_self.property("exec");
if (!fun.isFunction()) {
kDebug() << "Script: exec is not a function, " << fun.toString();
// qDebug() << "Script: exec is not a function, " << fun.toString();
return;
}
@ -144,9 +144,9 @@ void JavaScriptRunner::setupObjects()
void JavaScriptRunner::reportError(ScriptEnv *env, bool fatal)
{
Q_UNUSED(fatal)
kDebug() << "Error: " << env->engine()->uncaughtException().toString()
// qDebug() << "Error: " << env->engine()->uncaughtException().toString()
<< " at line " << env->engine()->uncaughtExceptionLineNumber() << endl;
kDebug() << env->engine()->uncaughtExceptionBacktrace();
// qDebug() << env->engine()->uncaughtExceptionBacktrace();
}
QString JavaScriptRunner::filePath(const char *type, const QString &file) const

4
src/scriptengines/javascript/simplebindings/color.cpp
View File

@ -118,8 +118,8 @@ static QScriptValue setThemeColor(QScriptContext *ctx, QScriptEngine *)
if (ctx->argumentCount() > 0) {
const qint32 arg = ctx->argument(0).toInt32();
if (arg >= 0 && arg <= Plasma::Theme::VisitedLinkColor) {
kDebug() << "setting to: " << static_cast<Plasma::Theme::ColorRole>(arg);
kDebug() << "color is: " << Plasma::Theme::defaultTheme()->color(static_cast<Plasma::Theme::ColorRole>(arg));
// qDebug() << "setting to: " << static_cast<Plasma::Theme::ColorRole>(arg);
// qDebug() << "color is: " << Plasma::Theme::defaultTheme()->color(static_cast<Plasma::Theme::ColorRole>(arg));
self->setRgba(Plasma::Theme::defaultTheme()->color(static_cast<Plasma::Theme::ColorRole>(arg)).rgba());
}
}

6
src/scriptengines/javascript/simplebindings/dataengine.h
View File

@ -39,7 +39,7 @@ Q_DECLARE_METATYPE(DataEngine::Data)
template <class M>
QScriptValue qScriptValueFromMap(QScriptEngine *eng, const M &map)
{
//kDebug() << "qScriptValueFromMap called";
//qDebug() << "qScriptValueFromMap called";
QScriptValue obj = eng->newObject();
typename M::const_iterator begin = map.constBegin();
typename M::const_iterator end = map.constEnd();
@ -54,7 +54,7 @@ QScriptValue qScriptValueFromMap(QScriptEngine *eng, const M &map)
template <class M>
QScriptValue qScriptValueFromVariantMap(QScriptEngine *eng, const M &map)
{
//kDebug() << "qScriptValueFromMap called";
//qDebug() << "qScriptValueFromMap called";
QScriptValue obj = eng->newObject();
typename M::const_iterator begin = map.constBegin();
typename M::const_iterator end = map.constEnd();
@ -75,7 +75,7 @@ QScriptValue qScriptValueFromVariantMap(QScriptEngine *eng, const M &map)
template <class M>
void qScriptValueToMap(const QScriptValue &value, M &map)
{
//kDebug() << "qScriptValueToMap called";
//qDebug() << "qScriptValueToMap called";
QScriptValueIterator it(value);
while (it.hasNext()) {
it.next();

8
src/scriptengines/javascript/simplebindings/dataenginereceiver.cpp
View File

@ -46,7 +46,7 @@ DataEngineReceiver::DataEngineReceiver(const Plasma::DataEngine *engine, const Q
DataEngineReceiver::~DataEngineReceiver()
{
s_receivers.remove(this);
//kDebug() << s_receivers.count();
//qDebug() << s_receivers.count();
}
bool DataEngineReceiver::isValid() const
@ -189,13 +189,13 @@ QScriptValue DataEngineReceiver::disconnectSource(QScriptContext *context, QScri
DataEngine *dataEngine = qobject_cast<DataEngine *>(context->thisObject().toQObject());
if (!dataEngine) {
//kDebug() << "no engine!";
//qDebug() << "no engine!";
return engine->undefinedValue();
}
const QString source = context->argument(0).toString();
if (source.isEmpty()) {
//kDebug() << "no source!";
//qDebug() << "no source!";
return engine->undefinedValue();
}
@ -214,7 +214,7 @@ QScriptValue DataEngineReceiver::disconnectSource(QScriptContext *context, QScri
}
if (!obj) {
//kDebug() << "no object!";
//qDebug() << "no object!";
return engine->undefinedValue();
}

8
src/scriptengines/javascript/simplebindings/i18n.cpp
View File

@ -30,7 +30,7 @@ QScriptValue jsi18n(QScriptContext *context, QScriptEngine *engine)
Q_UNUSED(engine)
if (context->argumentCount() < 1) {
kDebug() << i18n("i18n() takes at least one argument");
// qDebug() << i18n("i18n() takes at least one argument");
return engine->undefinedValue();
}
@ -49,7 +49,7 @@ QScriptValue jsi18nc(QScriptContext *context, QScriptEngine *engine)
Q_UNUSED(engine)
if (context->argumentCount() < 2) {
kDebug() << i18n("i18nc() takes at least two arguments");
// qDebug() << i18n("i18nc() takes at least two arguments");
return engine->undefinedValue();
}
@ -69,7 +69,7 @@ QScriptValue jsi18np(QScriptContext *context, QScriptEngine *engine)
Q_UNUSED(engine)
if (context->argumentCount() < 2) {
kDebug() << i18n("i18np() takes at least two arguments");
// qDebug() << i18n("i18np() takes at least two arguments");
return engine->undefinedValue();
}
@ -94,7 +94,7 @@ QScriptValue jsi18ncp(QScriptContext *context, QScriptEngine *engine)
Q_UNUSED(engine)
if (context->argumentCount() < 3) {
kDebug() << i18n("i18ncp() takes at least three arguments");
// qDebug() << i18n("i18ncp() takes at least three arguments");
return engine->undefinedValue();
}

4
src/scriptengines/javascript/simplebindings/qscriptnonguibookkeeping.cpp
View File

@ -72,7 +72,7 @@ QScriptValue qScriptValueFromKConfigGroup(QScriptEngine *engine, const KConfigGr
//setting the key/value pairs
for (it = begin; it != end; ++it) {
//kDebug() << "setting" << it.key() << "to" << it.value();
//qDebug() << "setting" << it.key() << "to" << it.value();
QString prop = it.key();
prop.replace(' ', '_');
obj.setProperty(prop, it.value());
@ -89,7 +89,7 @@ void kConfigGroupFromScriptValue(const QScriptValue& obj, KConfigGroup &config)
while (it.hasNext()) {
it.next();
//kDebug() << it.name() << "is" << it.value().toString();
//qDebug() << it.name() << "is" << it.value().toString();
if (it.name() != "__name") {
config.writeEntry(it.name(), it.value().toString());
}

2
src/scriptengines/javascript/simplebindings/uiloader.cpp
View File

@ -114,7 +114,7 @@ UiLoader::UiLoader()
UiLoader::~UiLoader()
{
kDebug();
// qDebug();
}
QStringList UiLoader::availableWidgets() const

6
src/scriptengines/qml/plasmoid/appletinterface.cpp
View File

@ -162,7 +162,7 @@ void AppletInterface::init()
}
qDebug() << "Loaded org.kde.toolbox";
} else {
kWarning() << "Could not load org.kde.toolbox package.";
qWarning() << "Could not load org.kde.toolbox package.";
}
}
@ -324,7 +324,7 @@ void AppletInterface::writeConfig(const QString &entry, const QVariant &value)
m_appletScriptEngine->configNeedsSaving();
}
} else
kWarning() << "Couldn't find a configuration entry";
qWarning() << "Couldn't find a configuration entry";
}
QVariant AppletInterface::readConfig(const QString &entry) const
@ -469,7 +469,7 @@ int AppletInterface::apiVersion() const
void AppletInterface::debug(const QString &msg)
{
kDebug() << msg;
qDebug() << msg;
}
void AppletInterface::setAssociatedApplication(const QString &string)

6
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -284,13 +284,13 @@ void ContainmentInterface::addAppletActions(QMenu &desktopMenu, Plasma::Applet *
if (containment()->immutability() == Plasma::Types::Mutable) {
QAction *closeApplet = applet->actions()->action("remove");
//kDebug() << "checking for removal" << closeApplet;
//qDebug() << "checking for removal" << closeApplet;
if (closeApplet) {
if (!desktopMenu.isEmpty()) {
desktopMenu.addSeparator();
}
//kDebug() << "adding close action" << closeApplet->isEnabled() << closeApplet->isVisible();
//qDebug() << "adding close action" << closeApplet->isEnabled() << closeApplet->isVisible();
desktopMenu.addAction(closeApplet);
}
}
@ -300,7 +300,7 @@ void ContainmentInterface::addContainmentActions(QMenu &desktopMenu, QEvent *eve
{
if (containment()->corona()->immutability() != Plasma::Types::Mutable &&
!KAuthorized::authorizeKAction("plasma/containment_actions")) {
//kDebug() << "immutability";
//qDebug() << "immutability";
return;
}

2
src/scriptengines/qml/plasmoid/declarativeappletscript.cpp
View File

@ -117,7 +117,7 @@ QObject *DeclarativeAppletScript::loadui(const QString &filename)
{
QFile f(filename);
if (!f.open(QIODevice::ReadOnly)) {
kWarning() << i18n("Unable to open '%1'",filename);
qWarning() << i18n("Unable to open '%1'",filename);
return 0;
}

2
src/shell/scripting/appinterface.cpp
View File

@ -84,7 +84,7 @@ QList<int> AppInterface::panelIds() const
QList<int> panels;
foreach (Plasma::Containment *c, m_env->corona()->containments()) {
//kDebug() << "checking" << (QObject*)c << isPanel(c);
//qDebug() << "checking" << (QObject*)c << isPanel(c);
if (ScriptEngine::isPanel(c)) {
panels.append(c->id());
}

8
src/shell/scripting/configgroup.cpp
View File

@ -61,7 +61,7 @@ ConfigGroup::ConfigGroup(QObject *parent)
ConfigGroup::~ConfigGroup()
{
if (d->synchTimer->isActive()) {
//kDebug() << "SYNC......";
//qDebug() << "SYNC......";
d->synchTimer->stop();
d->configGroup->sync();
}
@ -139,7 +139,7 @@ bool ConfigGroup::readConfigFile()
return true;
} else {
if (d->file.isEmpty()) {
kWarning() << "Could not find KConfig Parent: specify a file or parent to another ConfigGroup";
qWarning() << "Could not find KConfig Parent: specify a file or parent to another ConfigGroup";
return false;
}
d->config = KSharedConfig::openConfig(d->file);
@ -167,7 +167,7 @@ QVariant ConfigGroup::readEntry(const QString& key)
return QVariant();
}
const QVariant value = d->configGroup->readEntry(key, QVariant(""));
//kDebug() << " reading setting: " << key << value;
//qDebug() << " reading setting: " << key << value;
return value;
}
@ -179,7 +179,7 @@ void ConfigGroup::deleteEntry(const QString& key)
void ConfigGroup::sync()
{
if (d->configGroup) {
//kDebug() << "synching config...";
//qDebug() << "synching config...";
d->configGroup->sync();
}
}

8
src/shell/scripting/i18n.cpp
View File

@ -30,7 +30,7 @@ QScriptValue jsi18n(QScriptContext *context, QScriptEngine *engine)
Q_UNUSED(engine)
if (context->argumentCount() < 1) {
kDebug() << i18n("i18n() takes at least one argument");
// qDebug() << i18n("i18n() takes at least one argument");
return engine->undefinedValue();
}
@ -49,7 +49,7 @@ QScriptValue jsi18nc(QScriptContext *context, QScriptEngine *engine)
Q_UNUSED(engine)
if (context->argumentCount() < 2) {
kDebug() << i18n("i18nc() takes at least two arguments");
// qDebug() << i18n("i18nc() takes at least two arguments");
return engine->undefinedValue();
}
@ -69,7 +69,7 @@ QScriptValue jsi18np(QScriptContext *context, QScriptEngine *engine)
Q_UNUSED(engine)
if (context->argumentCount() < 2) {
kDebug() << i18n("i18np() takes at least two arguments");
// qDebug() << i18n("i18np() takes at least two arguments");
return engine->undefinedValue();
}
@ -94,7 +94,7 @@ QScriptValue jsi18ncp(QScriptContext *context, QScriptEngine *engine)
Q_UNUSED(engine)
if (context->argumentCount() < 3) {
kDebug() << i18n("i18ncp() takes at least three arguments");
// qDebug() << i18n("i18ncp() takes at least three arguments");
return engine->undefinedValue();
}

28
src/shell/scripting/scriptengine.cpp
View File

@ -255,13 +255,13 @@ QScriptValue ScriptEngine::loadTemplate(QScriptContext *context, QScriptEngine *
{
Q_UNUSED(engine)
if (context->argumentCount() == 0) {
kDebug() << "no arguments";
// qDebug() << "no arguments";
return false;
}
const QString layout = context->argument(0).toString();
if (layout.isEmpty() || layout.contains("'")) {
kDebug() << "layout is empty";
// qDebug() << "layout is empty";
return false;
}
@ -270,7 +270,7 @@ QScriptValue ScriptEngine::loadTemplate(QScriptContext *context, QScriptEngine *
KService::List offers = KServiceTypeTrader::self()->query("Plasma/LayoutTemplate", constraint);
if (offers.isEmpty()) {
kDebug() << "offers fail" << constraint;
// qDebug() << "offers fail" << constraint;
return false;
}
@ -279,26 +279,26 @@ QScriptValue ScriptEngine::loadTemplate(QScriptContext *context, QScriptEngine *
KPluginInfo info(offers.first());
const QString path = KStandardDirs::locate("data", package.defaultPackageRoot() + '/' + info.pluginName() + '/');
if (path.isEmpty()) {
kDebug() << "script path is empty";
// qDebug() << "script path is empty";
return false;
}
package.setPath(path);
const QString scriptFile = package.filePath("mainscript");
if (scriptFile.isEmpty()) {
kDebug() << "scriptfile is empty";
// qDebug() << "scriptfile is empty";
return false;
}
QFile file(scriptFile);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
kWarning() << i18n("Unable to load script file: %1", path);
qWarning() << i18n("Unable to load script file: %1", path);
return false;
}
QString script = file.readAll();
if (script.isEmpty()) {
kDebug() << "script is empty";
// qDebug() << "script is empty";
return false;
}
@ -435,12 +435,12 @@ QScriptValue ScriptEngine::defaultApplication(QScriptContext *context, QScriptEn
} else {
// try the files in share/apps/kcm_componentchooser/
const QStringList services = KGlobal::dirs()->findAllResources("data","kcm_componentchooser/*.desktop", KStandardDirs::NoDuplicates);
//kDebug() << "ok, trying in" << services.count();
//qDebug() << "ok, trying in" << services.count();
foreach (const QString &service, services) {
KConfig config(service, KConfig::SimpleConfig);
KConfigGroup cg = config.group(QByteArray());
const QString type = cg.readEntry("valueName", QString());
//kDebug() << " checking" << service << type << application;
//qDebug() << " checking" << service << type << application;
if (type.compare(application, Qt::CaseInsensitive) == 0) {
KConfig store(cg.readPathEntry("storeInFile", "null"));
KConfigGroup storeCg(&store, cg.readEntry("valueSection", QString()));
@ -658,10 +658,10 @@ Plasma::Corona *ScriptEngine::corona() const
bool ScriptEngine::evaluateScript(const QString &script, const QString &path)
{
//kDebug() << "evaluating" << m_editor->toPlainText();
//qDebug() << "evaluating" << m_editor->toPlainText();
evaluate(script, path);
if (hasUncaughtException()) {
//kDebug() << "catch the exception!";
//qDebug() << "catch the exception!";
QString error = i18n("Error: %1 at line %2\n\nBacktrace:\n%3",
uncaughtException().toString(),
QString::number(uncaughtExceptionLineNumber()),
@ -675,7 +675,7 @@ bool ScriptEngine::evaluateScript(const QString &script, const QString &path)
void ScriptEngine::exception(const QScriptValue &value)
{
//kDebug() << "exception caught!" << value.toVariant();
//qDebug() << "exception caught!" << value.toVariant();
emit printError(value.toVariant().toString());
}
@ -686,7 +686,7 @@ QStringList ScriptEngine::pendingUpdateScripts(Plasma::Corona *corona)
QStringList scriptPaths;
if (scripts.isEmpty()) {
//kDebug() << "no update scripts";
//qDebug() << "no update scripts";
return scriptPaths;
}
@ -701,7 +701,7 @@ QStringList ScriptEngine::pendingUpdateScripts(Plasma::Corona *corona)
}
if (script.startsWith(localDir) || script.startsWith(localXdgDir)) {
kDebug() << "skipping user local script: " << script;
// qDebug() << "skipping user local script: " << script;
continue;
}

2
src/shell/widgetexplorer/kcategorizeditemsviewmodels.cpp
View File

@ -176,7 +176,7 @@ bool DefaultItemFilterProxyModel::filterAcceptsRow(int sourceRow,
QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
AbstractItem *item = (AbstractItem *) model->itemFromIndex(index);
//kDebug() << "ITEM " << (item ? "IS NOT " : "IS") << " NULL\n";
//qDebug() << "ITEM " << (item ? "IS NOT " : "IS") << " NULL\n";
return item &&
(m_filter.first.isEmpty() || item->passesFiltering(m_filter)) &&

12
src/shell/widgetexplorer/plasmaappletitemmodel.cpp
View File

@ -224,22 +224,22 @@ void PlasmaAppletItemModel::populateModel(const QStringList &whatChanged)
}
clear();
//kDebug() << "populating model, our application is" << m_application;
//qDebug() << "populating model, our application is" << m_application;
//kDebug() << "number of applets is"
//qDebug() << "number of applets is"
// << Plasma::Applet::listAppletInfo(QString(), m_application).count();
KService::List services = KServiceTypeTrader::self()->query("Plasma/Applet", QString());
foreach (const KSharedPtr<KService> service, services) {
KPluginInfo info(service);
//kDebug() << info.pluginName() << "NoDisplay" << info.property("NoDisplay").toBool();
//qDebug() << info.pluginName() << "NoDisplay" << info.property("NoDisplay").toBool();
if (info.property("NoDisplay").toBool() || info.category() == i18n("Containments")) {
// we don't want to show the hidden category
continue;
}
qDebug() << info.pluginName() << " is the name of the plugin at" << info.entryPath();
//kDebug() << info.name() << info.property("X-Plasma-Thumbnail");
//qDebug() << info.name() << info.property("X-Plasma-Thumbnail");
PlasmaAppletItem::FilterFlags flags(PlasmaAppletItem::NoFilter);
if (m_favorites.contains(info.pluginName())) {
@ -300,7 +300,7 @@ QSet<QString> PlasmaAppletItemModel::categories() const
QMimeData *PlasmaAppletItemModel::mimeData(const QModelIndexList &indexes) const
{
//kDebug() << "GETTING MIME DATA\n";
//qDebug() << "GETTING MIME DATA\n";
if (indexes.count() <= 0) {
return 0;
}
@ -325,7 +325,7 @@ QMimeData *PlasmaAppletItemModel::mimeData(const QModelIndexList &indexes) const
lastRow = index.row();
PlasmaAppletItem *selectedItem = (PlasmaAppletItem *) itemFromIndex(index);
appletNames += '\n' + selectedItem->pluginName().toUtf8();
//kDebug() << selectedItem->pluginName() << index.column() << index.row();
//qDebug() << selectedItem->pluginName() << index.column() << index.row();
}
data->setData(format, appletNames);

8
src/shell/widgetexplorer/widgetexplorer.cpp
View File

@ -258,7 +258,7 @@ QList <QObject *> WidgetExplorer::widgetsMenuActions()
KService::List offers = KServiceTypeTrader::self()->query("Plasma/PackageStructure");
foreach (const KService::Ptr &service, offers) {
//kDebug() << service->property("X-Plasma-ProvidesWidgetBrowser");
//qDebug() << service->property("X-Plasma-ProvidesWidgetBrowser");
if (service->property("X-Plasma-ProvidesWidgetBrowser").toBool()) {
WidgetAction *action = new WidgetAction(QIcon::fromTheme("applications-internet"),
i18nc("%1 is a type of widgets, as defined by "
@ -328,7 +328,7 @@ void WidgetExplorerPrivate::initRunningApplets()
}
}
//kDebug() << runningApplets;
//qDebug() << runningApplets;
itemModel.setRunningApplets(runningApplets);
}
@ -522,7 +522,7 @@ void WidgetExplorer::downloadWidgets(const QString &type)
KService::List offers = KServiceTypeTrader::self()->query("Plasma/PackageStructure",
constraint);
if (offers.isEmpty()) {
//kDebug() << "could not find requested PackageStructure plugin" << type;
//qDebug() << "could not find requested PackageStructure plugin" << type;
} else {
KService::Ptr service = offers.first();
QString error;
@ -533,7 +533,7 @@ void WidgetExplorer::downloadWidgets(const QString &type)
// connect(installer, SIGNAL(newWidgetBrowserFinished()),
// installer, SLOT(deleteLater()));
} else {
//kDebug() << "found, but could not load requested PackageStructure plugin" << type
//qDebug() << "found, but could not load requested PackageStructure plugin" << type
// << "; reported error was" << error;
}
}