[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-runtime/frameworks] /: kdebug--
From: Montel Laurent <montel () kde ! org>
Date: 2014-08-03 19:06:31
Message-ID: E1XE171-0007Dt-Pn () scm ! kde ! org
[Download RAW message or body]
Git commit 5693c18b4057f365c351055a2d1f7b71a71376bd by Montel Laurent.
Committed on 03/08/2014 at 19:06.
Pushed by mlaurent into branch 'frameworks'.
kdebug--
M +1 -1 accountwizard/dynamicpage.cpp
M +1 -1 accountwizard/personaldatapage.cpp
M +1 -1 accountwizard/providerpage.cpp
M +1 -1 accountwizard/resource.cpp
M +1 -1 accountwizard/transport.cpp
M +1 -1 accountwizard/typepage.cpp
M +5 -5 agents/migration/autotests/dummymigrator.cpp
M +2 -2 agents/migration/autotests/schedulertest.cpp
M +1 -1 kcm/resourcesmanagementwidget.cpp
M +2 -2 kcm/serverconfigmodule.cpp
M +2 -2 resourcetester/global.cpp
M +1 -1 resourcetester/itemtest.cpp
M +1 -1 resourcetester/main.cpp
M +15 -15 resourcetester/qemu.cpp
M +6 -6 resourcetester/resource.cpp
M +3 -3 resourcetester/script.cpp
M +3 -3 resourcetester/test.cpp
M +2 -2 resourcetester/xmloperations.cpp
http://commits.kde.org/kdepim-runtime/5693c18b4057f365c351055a2d1f7b71a71376bd
diff --git a/accountwizard/dynamicpage.cpp b/accountwizard/dynamicpage.cpp
index 5757c0b..12948f5 100644
--- a/accountwizard/dynamicpage.cpp
+++ b/accountwizard/dynamicpage.cpp
@@ -19,7 +19,7 @@
#include "dynamicpage.h"
-#include <KDebug>
+#include <QDebug>
#include <QUiLoader>
#include <QFile>
diff --git a/accountwizard/personaldatapage.cpp b/accountwizard/personaldatapage.cpp
index 1dcbd1e..bd317f5 100644
--- a/accountwizard/personaldatapage.cpp
+++ b/accountwizard/personaldatapage.cpp
@@ -33,7 +33,7 @@
#include <mailtransport/transport.h>
-#include <KDebug>
+#include <QDebug>
QString accountName(Ispdb *ispdb, QString username)
diff --git a/accountwizard/providerpage.cpp b/accountwizard/providerpage.cpp
index 1116873..ce5393b 100644
--- a/accountwizard/providerpage.cpp
+++ b/accountwizard/providerpage.cpp
@@ -21,7 +21,7 @@
#include "providerpage.h"
#include "global.h"
-#include <KDebug>
+#include <QDebug>
#include <QSortFilterProxyModel>
#include <kns3/downloadmanager.h>
#include <KLocalizedString>
diff --git a/accountwizard/resource.cpp b/accountwizard/resource.cpp
index 8c717bc..67b929a 100644
--- a/accountwizard/resource.cpp
+++ b/accountwizard/resource.cpp
@@ -23,7 +23,7 @@
#include <agentmanager.h>
#include <agentinstancecreatejob.h>
-#include <KDebug>
+#include <QDebug>
#include <KLocalizedString>
#include <QMetaMethod>
diff --git a/accountwizard/transport.cpp b/accountwizard/transport.cpp
index 940e983..6ed8726 100644
--- a/accountwizard/transport.cpp
+++ b/accountwizard/transport.cpp
@@ -21,7 +21,7 @@
#include <mailtransport/transportmanager.h>
-#include <KDebug>
+#include <QDebug>
#include <KLocalizedString>
#define TABLE_SIZE x
diff --git a/accountwizard/typepage.cpp b/accountwizard/typepage.cpp
index 7b9ac3c..3996f22 100644
--- a/accountwizard/typepage.cpp
+++ b/accountwizard/typepage.cpp
@@ -19,7 +19,7 @@
#include "typepage.h"
-#include <KDebug>
+#include <QDebug>
#include <KDesktopFile>
#include <KStandardDirs>
#include <KGlobal>
diff --git a/agents/migration/autotests/dummymigrator.cpp \
b/agents/migration/autotests/dummymigrator.cpp index a188155..261e24a 100644
--- a/agents/migration/autotests/dummymigrator.cpp
+++ b/agents/migration/autotests/dummymigrator.cpp
@@ -21,7 +21,7 @@
#include "dummymigrator.h"
#include <QTimer>
-#include <KDebug>
+#include <QDebug>
DummyMigrator::DummyMigrator(const QString &identifier)
: MigratorBase(QLatin1String("dummymigrator") + identifier, QString(), QString())
@@ -34,13 +34,13 @@ QString DummyMigrator::displayName() const
void DummyMigrator::startWork()
{
- kDebug();
+ qDebug();
QTimer::singleShot(10000, this, SLOT(onTimerElapsed()));
}
void DummyMigrator::onTimerElapsed()
{
- kDebug();
+ qDebug();
setMigrationState(Complete);
}
@@ -56,13 +56,13 @@ bool DummyMigrator::canStart()
void DummyMigrator::pause()
{
- kDebug();
+ qDebug();
MigratorBase::pause();
}
void DummyMigrator::abort()
{
- kDebug();
+ qDebug();
MigratorBase::abort();
}
diff --git a/agents/migration/autotests/schedulertest.cpp \
b/agents/migration/autotests/schedulertest.cpp index c3fb997..054d5cc 100644
--- a/agents/migration/autotests/schedulertest.cpp
+++ b/agents/migration/autotests/schedulertest.cpp
@@ -21,7 +21,7 @@
#include <QTest>
#include <QSignalSpy>
-#include <KDebug>
+#include <QDebug>
#include <KJobTrackerInterface>
#include "../migrationscheduler.h"
@@ -216,7 +216,7 @@ private slots:
scheduler.addMigrator(m2);
QCOMPARE(m1->migrationState(), MigratorBase::InProgress);
- kDebug() << m2->migrationState();
+ qDebug() << m2->migrationState();
QCOMPARE(m2->migrationState(), MigratorBase::None);
m1->complete();
QCOMPARE(m2->migrationState(), MigratorBase::InProgress);
diff --git a/kcm/resourcesmanagementwidget.cpp b/kcm/resourcesmanagementwidget.cpp
index d2fe0f0..31f9246 100644
--- a/kcm/resourcesmanagementwidget.cpp
+++ b/kcm/resourcesmanagementwidget.cpp
@@ -32,7 +32,7 @@
#include <kwindowsystem.h>
-#include <KDebug>
+#include <QDebug>
#include <KMessageBox>
#include <KLineEdit>
#include <KLocalizedString>
diff --git a/kcm/serverconfigmodule.cpp b/kcm/serverconfigmodule.cpp
index b6cb0e3..6379fb8 100644
--- a/kcm/serverconfigmodule.cpp
+++ b/kcm/serverconfigmodule.cpp
@@ -19,7 +19,7 @@
#include "serverconfigmodule.h"
-#include <kdebug.h>
+#include <QDebug>
#include <klocale.h>
#include <kpluginfactory.h>
#include <kpluginloader.h>
@@ -154,7 +154,7 @@ void ServerConfigModule::load()
void ServerConfigModule::save()
{
- kDebug();
+ qDebug();
const QString serverConfigFile = XdgBaseDirs::akonadiServerConfigFile( \
XdgBaseDirs::ReadWrite ); QSettings settings( serverConfigFile, QSettings::IniFormat \
); settings.beginGroup( QLatin1String("QMYSQL") );
diff --git a/resourcetester/global.cpp b/resourcetester/global.cpp
index bc82356..f2b44be 100644
--- a/resourcetester/global.cpp
+++ b/resourcetester/global.cpp
@@ -20,7 +20,7 @@
#include <kglobal.h>
#include <QDir>
#include <kstandarddirs.h>
-#include <KDebug>
+#include <QDebug>
class GlobalPrivate
{
@@ -54,7 +54,7 @@ QString Global::vmPath()
void Global::setVMPath(const QString& path)
{
- kDebug() << path;
+ qDebug() << path;
sInstance->vmPath = path;
if ( !path.endsWith( QDir::separator() ) )
sInstance->vmPath += QDir::separator();
diff --git a/resourcetester/itemtest.cpp b/resourcetester/itemtest.cpp
index 6e2877a..3aef3a4 100644
--- a/resourcetester/itemtest.cpp
+++ b/resourcetester/itemtest.cpp
@@ -25,7 +25,7 @@
#include <AkonadiCore/collectionpathresolver.h>
#include <AkonadiCore/itemcreatejob.h>
-#include <KDebug>
+#include <QDebug>
#include <QFile>
using namespace Akonadi;
diff --git a/resourcetester/main.cpp b/resourcetester/main.cpp
index 717bfe7..c93a08c 100644
--- a/resourcetester/main.cpp
+++ b/resourcetester/main.cpp
@@ -30,7 +30,7 @@
#include <KAboutData>
-#include <KDebug>
+#include <QDebug>
#include <QCoreApplication>
#include <QtCore/QTimer>
diff --git a/resourcetester/qemu.cpp b/resourcetester/qemu.cpp
index d622b00..b7c620d 100644
--- a/resourcetester/qemu.cpp
+++ b/resourcetester/qemu.cpp
@@ -23,7 +23,7 @@
#include "test.h"
#include <KConfig>
-#include <KDebug>
+#include <QDebug>
#include <KConfigGroup>
#include <KShell>
#include <KIO/NetAccess>
@@ -62,7 +62,7 @@ void QEmu::start()
{
Q_ASSERT( mVMConfig );
if ( mVMProcess ) {
- kWarning() << "VM already running.";
+ qWarning() << "VM already running.";
return;
}
@@ -87,7 +87,7 @@ void QEmu::start()
args << "-loadvm" << snapshotName;
}
- kDebug() << "Starting QEMU with arguments" << args << "...";
+ qDebug() << "Starting QEMU with arguments" << args << "...";
mVMProcess = new KProcess( this );
connect( mVMProcess, SIGNAL(finished(int,QProcess::ExitStatus)), \
SLOT(vmFinished(int,QProcess::ExitStatus)) ); @@ -95,7 +95,7 @@ void QEmu::start()
mVMProcess->start();
mVMProcess->waitForStarted();
mStarted = true;
- kDebug() << "QEMU started.";
+ qDebug() << "QEMU started.";
if ( emuConf.readEntry( "WaitForPorts", true ) ) {
const QList<int> waitPorts = emuConf.readEntry( "WaitForPorts", QList<int>() );
@@ -109,7 +109,7 @@ void QEmu::stop()
mStarted = false;
if ( !mVMProcess )
return;
- kDebug() << "Stopping QEMU...";
+ qDebug() << "Stopping QEMU...";
// send stop command via QEMU monitor
QTcpSocket socket;
@@ -120,17 +120,17 @@ void QEmu::stop()
socket.waitForBytesWritten();
mVMProcess->waitForFinished(10000);
} else {
- kDebug() << "Unable to connect to QEMU monitor:" << socket.errorString();
+ qDebug() << "Unable to connect to QEMU monitor:" << socket.errorString();
}
if ( mVMProcess->state() == QProcess::Running ) {
- kDebug() << "qemu is still running. terminating";
+ qDebug() << "qemu is still running. terminating";
mVMProcess->terminate();
}
delete mVMProcess;
mVMProcess = 0;
- kDebug() << "QEMU stopped.";
+ qDebug() << "QEMU stopped.";
}
QString QEmu::vmImage() const
@@ -146,36 +146,36 @@ QString QEmu::vmImage() const
// check if the image has been downloaded already
const QString localArchiveFileName = Global::vmPath() + imageArchiveFileName;
if ( !QFile::exists( localArchiveFileName ) ) {
- kDebug() << "Downloading VM image from" << imageUrl << "to" << \
localArchiveFileName << "..."; + qDebug() << "Downloading VM image from" << \
imageUrl << "to" << localArchiveFileName << "...";
const bool result = KIO::NetAccess::file_copy( imageUrl, \
QUrl(localArchiveFileName), 0 ); if ( !result )
- kFatal() << "Downloading" << imageUrl << "failed!";
- kDebug() << "Downloading VM image complete.";
+ qCritical() << "Downloading" << imageUrl << "failed!";
+ qDebug() << "Downloading VM image complete.";
}
// check if the image archive has been extracted yet
const QString extractedDirName = Global::vmPath() + imageArchiveFileName + \
".directory"; if ( !QDir::root().exists( extractedDirName ) ) {
- kDebug() << "Extracting VM image...";
+ qDebug() << "Extracting VM image...";
QDir::root().mkpath( extractedDirName );
KProcess proc;
proc.setWorkingDirectory( extractedDirName );
proc.setProgram( "tar", QStringList() << "xvf" << localArchiveFileName );
proc.execute();
- kDebug() << "Extracting VM image complete.";
+ qDebug() << "Extracting VM image complete.";
}
// check if the actual image file is there and return it
const QString imageFile = extractedDirName + QDir::separator() + conf.readEntry( \
"File", QString() ); if ( !QFile::exists( imageFile ) )
- kFatal() << "Image file" << imageFile << "does not exist.";
+ qCritical() << "Image file" << imageFile << "does not exist.";
return imageFile;
}
void QEmu::waitForPort(int port)
{
- kDebug() << "Waiting for port" << (port + mPortOffset) << "...";
+ qDebug() << "Waiting for port" << (port + mPortOffset) << "...";
forever {
QTcpSocket socket;
socket.connectToHost( "localhost", port + mPortOffset );
diff --git a/resourcetester/resource.cpp b/resourcetester/resource.cpp
index e7d19d0..d3cdcf4 100644
--- a/resourcetester/resource.cpp
+++ b/resourcetester/resource.cpp
@@ -25,7 +25,7 @@
#include <AkonadiCore/agentmanager.h>
#include <AkonadiCore/agentinstancecreatejob.h>
-#include <KDebug>
+#include <QDebug>
#include <qtest_kde.h>
#include <QDBusConnection>
@@ -80,7 +80,7 @@ bool Resource::createResource()
AgentInstanceCreateJob *job = new AgentInstanceCreateJob( type, this );
if ( !job->exec() ) {
- kWarning() << job->errorText();
+ qWarning() << job->errorText();
return false;
}
mInstance = job->instance();
@@ -91,18 +91,18 @@ bool Resource::createResource()
// configure resource
for ( QHash<QString, QVariant>::const_iterator it = mSettings.constBegin(); it != \
mSettings.constEnd(); ++it ) {
- kDebug() << "Setting up " << it.key() << " for agent " << identifier();
+ qDebug() << "Setting up " << it.key() << " for agent " << identifier();
const QString methodName = QString::fromLatin1("set%1").arg( it.key() );
const QVariant arg = it.value();
QDBusReply<void> reply = iface.call( methodName, arg );
if ( !reply.isValid() )
- kError() << "Setting " << it.key() << " failed for agent " << identifier() << \
":" << reply.error().message(); + qCritical() << "Setting " << it.key() << " \
failed for agent " << identifier() << ":" << reply.error().message(); }
mInstance.reconfigure();
ResourceSynchronizationJob *syncJob = new ResourceSynchronizationJob( mInstance, \
this ); if ( !syncJob->exec() )
- kError() << "Synching resource failed: " << syncJob->errorString();
+ qCritical() << "Synching resource failed: " << syncJob->errorString();
return true;
}
@@ -131,7 +131,7 @@ void Resource::write()
Test::instance()->fail( result.error().message() );
ResourceSynchronizationJob *syncJob = new ResourceSynchronizationJob( mInstance, \
this ); if ( !syncJob->exec() )
- kError() << "Synching resource failed: " << syncJob->errorString();
+ qCritical() << "Synching resource failed: " << syncJob->errorString();
}
void Resource::recreate()
diff --git a/resourcetester/script.cpp b/resourcetester/script.cpp
index 809962a..561515f 100644
--- a/resourcetester/script.cpp
+++ b/resourcetester/script.cpp
@@ -17,7 +17,7 @@
#include "script.h"
#include "global.h"
-#include <KDebug>
+#include <QDebug>
#include <qcoreapplication.h>
Script::Script()
@@ -41,7 +41,7 @@ void Script::include(const QString& path)
{
QFile f( Global::basePath() + path );
if ( !f.open( QFile::ReadOnly ) )
- kError() << "Unable to open file" << Global::basePath() + path;
+ qCritical() << "Unable to open file" << Global::basePath() + path;
else
action->evaluate( f.readAll() );
}
@@ -59,7 +59,7 @@ void Script::start()
void Script::finished(Kross::Action* action)
{
if ( action->hadError() ) {
- kError() << action->errorMessage() << action->errorTrace();
+ qCritical() << action->errorMessage() << action->errorTrace();
QCoreApplication::instance()->exit( 1 );
} else {
QCoreApplication::instance()->quit();
diff --git a/resourcetester/test.cpp b/resourcetester/test.cpp
index 3b935cc..32826b4 100644
--- a/resourcetester/test.cpp
+++ b/resourcetester/test.cpp
@@ -21,7 +21,7 @@
#include "resource.h"
#include "global.h"
-#include <KDebug>
+#include <QDebug>
#include <KMessageBox>
#include <stdlib.h>
@@ -40,7 +40,7 @@ void Test::verify(bool value)
void Test::verify( QObject* object, const QString &slot )
{
- kDebug() << object << slot;
+ qDebug() << object << slot;
bool result = false;
if ( !QMetaObject::invokeMethod( object, slot.toLatin1(), Q_RETURN_ARG( bool, \
result ) ) ) fail( "Unable to call method " + slot );
@@ -55,7 +55,7 @@ void Test::verify( QObject* object, const QString &slot )
void Test::fail(const QString& error)
{
- kError() << error;
+ qCritical() << error;
abort();
}
diff --git a/resourcetester/xmloperations.cpp b/resourcetester/xmloperations.cpp
index 80f4be2..f7e8d18 100644
--- a/resourcetester/xmloperations.cpp
+++ b/resourcetester/xmloperations.cpp
@@ -27,7 +27,7 @@
#include <AkonadiCore/itemfetchscope.h>
#include <AkonadiXml/xmlwritejob.h>
-#include <KDebug>
+#include <QDebug>
#include <QDir>
#include <QFileInfo>
@@ -178,7 +178,7 @@ bool XmlOperations::compare()
XmlWriteJob *xmlJob = new XmlWriteJob( mRoots, mFileName + ".actual", this );
if ( !xmlJob->exec() )
- kError() << xmlJob->errorText();
+ qCritical() << xmlJob->errorText();
return false;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic