Commit bdb63e8c authored by Sandro Knauß's avatar Sandro Knauß

Move logging category to mimetreeparser

parent 75a72bed
...@@ -125,8 +125,6 @@ set(libmimetreeparser_SRCS ...@@ -125,8 +125,6 @@ set(libmimetreeparser_SRCS
${libmimetreeparser_extra_SRCS} ${libmimetreeparser_extra_SRCS}
) )
ecm_qt_declare_logging_category(libmimetreeparser_SRCS HEADER messageviewer_debug.h IDENTIFIER MESSAGEVIEWER_LOG CATEGORY_NAME log_messageviewer)
ecm_qt_declare_logging_category(libmimetreeparser_SRCS HEADER mimetreeparser_debug.h IDENTIFIER MIMETREEPARSER_LOG CATEGORY_NAME log_mimetreeparser) ecm_qt_declare_logging_category(libmimetreeparser_SRCS HEADER mimetreeparser_debug.h IDENTIFIER MIMETREEPARSER_LOG CATEGORY_NAME log_mimetreeparser)
add_library(KF5MimeTreeParser add_library(KF5MimeTreeParser
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "filehtmlwriter.h" #include "filehtmlwriter.h"
#include "messageviewer_debug.h" #include "mimetreeparser_debug.h"
namespace MessageViewer namespace MessageViewer
{ {
...@@ -46,7 +46,7 @@ FileHtmlWriter::FileHtmlWriter(const QString &filename) ...@@ -46,7 +46,7 @@ FileHtmlWriter::FileHtmlWriter(const QString &filename)
FileHtmlWriter::~FileHtmlWriter() FileHtmlWriter::~FileHtmlWriter()
{ {
if (mFile.isOpen()) { if (mFile.isOpen()) {
qCWarning(MESSAGEVIEWER_LOG) << "FileHtmlWriter: file still open!"; qCWarning(MIMETREEPARSER_LOG) << "FileHtmlWriter: file still open!";
mStream.setDevice(0); mStream.setDevice(0);
mFile.close(); mFile.close();
} }
...@@ -95,12 +95,12 @@ void FileHtmlWriter::flush() ...@@ -95,12 +95,12 @@ void FileHtmlWriter::flush()
void FileHtmlWriter::openOrWarn() void FileHtmlWriter::openOrWarn()
{ {
if (mFile.isOpen()) { if (mFile.isOpen()) {
qCWarning(MESSAGEVIEWER_LOG) << "FileHtmlWriter: file still open!"; qCWarning(MIMETREEPARSER_LOG) << "FileHtmlWriter: file still open!";
mStream.setDevice(0); mStream.setDevice(0);
mFile.close(); mFile.close();
} }
if (!mFile.open(QIODevice::WriteOnly)) { if (!mFile.open(QIODevice::WriteOnly)) {
qCWarning(MESSAGEVIEWER_LOG) << "FileHtmlWriter: Cannot open file" << mFile.fileName(); qCWarning(MIMETREEPARSER_LOG) << "FileHtmlWriter: Cannot open file" << mFile.fileName();
} else { } else {
mStream.setDevice(&mFile); mStream.setDevice(&mFile);
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "queuehtmlwriter.h" #include "queuehtmlwriter.h"
#include "messageviewer_debug.h" #include "mimetreeparser_debug.h"
#include<QByteArray> #include<QByteArray>
#include<QString> #include<QString>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
*/ */
#include "kleojobexecutor.h" #include "kleojobexecutor.h"
#include "messageviewer_debug.h" #include "mimetreeparser_debug.h"
#include <Libkleo/DecryptVerifyJob> #include <Libkleo/DecryptVerifyJob>
#include <Libkleo/ImportJob> #include <Libkleo/ImportJob>
#include <Libkleo/VerifyDetachedJob> #include <Libkleo/VerifyDetachedJob>
...@@ -43,7 +43,7 @@ GpgME::VerificationResult KleoJobExecutor::exec( ...@@ -43,7 +43,7 @@ GpgME::VerificationResult KleoJobExecutor::exec(
const QByteArray &signature, const QByteArray &signature,
const QByteArray &signedData) const QByteArray &signedData)
{ {
qCDebug(MESSAGEVIEWER_LOG) << "Starting detached verification job"; qCDebug(MIMETREEPARSER_LOG) << "Starting detached verification job";
connect(job, SIGNAL(result(GpgME::VerificationResult)), SLOT(verificationResult(GpgME::VerificationResult))); connect(job, SIGNAL(result(GpgME::VerificationResult)), SLOT(verificationResult(GpgME::VerificationResult)));
GpgME::Error err = job->start(signature, signedData); GpgME::Error err = job->start(signature, signedData);
if (err) { if (err) {
...@@ -58,7 +58,7 @@ GpgME::VerificationResult KleoJobExecutor::exec( ...@@ -58,7 +58,7 @@ GpgME::VerificationResult KleoJobExecutor::exec(
const QByteArray &signedData, const QByteArray &signedData,
QByteArray &plainText) QByteArray &plainText)
{ {
qCDebug(MESSAGEVIEWER_LOG) << "Starting opaque verification job"; qCDebug(MIMETREEPARSER_LOG) << "Starting opaque verification job";
connect(job, SIGNAL(result(GpgME::VerificationResult,QByteArray)), SLOT(verificationResult(GpgME::VerificationResult,QByteArray))); connect(job, SIGNAL(result(GpgME::VerificationResult,QByteArray)), SLOT(verificationResult(GpgME::VerificationResult,QByteArray)));
GpgME::Error err = job->start(signedData); GpgME::Error err = job->start(signedData);
if (err) { if (err) {
...@@ -75,7 +75,7 @@ std::pair< GpgME::DecryptionResult, GpgME::VerificationResult > KleoJobExecutor: ...@@ -75,7 +75,7 @@ std::pair< GpgME::DecryptionResult, GpgME::VerificationResult > KleoJobExecutor:
const QByteArray &cipherText, const QByteArray &cipherText,
QByteArray &plainText) QByteArray &plainText)
{ {
qCDebug(MESSAGEVIEWER_LOG) << "Starting decryption job"; qCDebug(MIMETREEPARSER_LOG) << "Starting decryption job";
connect(job, &DecryptVerifyJob::result, this, &KleoJobExecutor::decryptResult); connect(job, &DecryptVerifyJob::result, this, &KleoJobExecutor::decryptResult);
GpgME::Error err = job->start(cipherText); GpgME::Error err = job->start(cipherText);
if (err) { if (err) {
...@@ -105,7 +105,7 @@ Error KleoJobExecutor::auditLogError() const ...@@ -105,7 +105,7 @@ Error KleoJobExecutor::auditLogError() const
void KleoJobExecutor::verificationResult(const GpgME::VerificationResult &result) void KleoJobExecutor::verificationResult(const GpgME::VerificationResult &result)
{ {
qCDebug(MESSAGEVIEWER_LOG) << "Detached verification job finished"; qCDebug(MIMETREEPARSER_LOG) << "Detached verification job finished";
Kleo::Job *job = dynamic_cast<Kleo::Job *>(sender()); Kleo::Job *job = dynamic_cast<Kleo::Job *>(sender());
assert(job); assert(job);
mVerificationResult = result; mVerificationResult = result;
...@@ -116,7 +116,7 @@ void KleoJobExecutor::verificationResult(const GpgME::VerificationResult &result ...@@ -116,7 +116,7 @@ void KleoJobExecutor::verificationResult(const GpgME::VerificationResult &result
void KleoJobExecutor::verificationResult(const GpgME::VerificationResult &result, const QByteArray &plainText) void KleoJobExecutor::verificationResult(const GpgME::VerificationResult &result, const QByteArray &plainText)
{ {
qCDebug(MESSAGEVIEWER_LOG) << "Opaque verification job finished"; qCDebug(MIMETREEPARSER_LOG) << "Opaque verification job finished";
Kleo::Job *job = dynamic_cast<Kleo::Job *>(sender()); Kleo::Job *job = dynamic_cast<Kleo::Job *>(sender());
assert(job); assert(job);
mVerificationResult = result; mVerificationResult = result;
...@@ -131,7 +131,7 @@ void KleoJobExecutor::decryptResult( ...@@ -131,7 +131,7 @@ void KleoJobExecutor::decryptResult(
const GpgME::VerificationResult &verificationresult, const GpgME::VerificationResult &verificationresult,
const QByteArray &plainText) const QByteArray &plainText)
{ {
qCDebug(MESSAGEVIEWER_LOG) << "Decryption job finished"; qCDebug(MIMETREEPARSER_LOG) << "Decryption job finished";
Kleo::Job *job = dynamic_cast<Kleo::Job *>(sender()); Kleo::Job *job = dynamic_cast<Kleo::Job *>(sender());
assert(job); assert(job);
mVerificationResult = verificationresult; mVerificationResult = verificationresult;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "utils/mimetype.h" #include "utils/mimetype.h"
#include "utils/iconnamecache.h" #include "utils/iconnamecache.h"
#include "messageviewer_debug.h" #include "mimetreeparser_debug.h"
#include <QMimeDatabase> #include <QMimeDatabase>
...@@ -65,7 +65,7 @@ QString MessageViewer::Util::fileNameForMimetype(const QString &mimeType, int ic ...@@ -65,7 +65,7 @@ QString MessageViewer::Util::fileNameForMimetype(const QString &mimeType, int ic
} else { } else {
fileName = QStringLiteral("unknown"); fileName = QStringLiteral("unknown");
if (!tMimeType.isEmpty()) { if (!tMimeType.isEmpty()) {
qCWarning(MESSAGEVIEWER_LOG) << "unknown mimetype" << tMimeType; qCWarning(MIMETREEPARSER_LOG) << "unknown mimetype" << tMimeType;
} }
} }
//WorkAround for #199083 //WorkAround for #199083
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <KMime/Content> #include <KMime/Content>
#include "messageviewer_debug.h" #include "mimetreeparser_debug.h"
namespace MessageViewer namespace MessageViewer
{ {
...@@ -266,7 +266,7 @@ const AttachmentStrategy *AttachmentStrategy::create(Type type) ...@@ -266,7 +266,7 @@ const AttachmentStrategy *AttachmentStrategy::create(Type type)
case Hidden: return hidden(); case Hidden: return hidden();
case HeaderOnly: return headerOnly(); case HeaderOnly: return headerOnly();
} }
qCCritical(MESSAGEVIEWER_LOG) << "Unknown attachment startegy ( type ==" qCCritical(MIMETREEPARSER_LOG) << "Unknown attachment startegy ( type =="
<< (int)type << ") requested!"; << (int)type << ") requested!";
return 0; // make compiler happy return 0; // make compiler happy
} }
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
your version. your version.
*/ */
#include "messageviewer_debug.h" #include "mimetreeparser_debug.h"
#include "bodypartformatterbasefactory.h" #include "bodypartformatterbasefactory.h"
#include "viewer/bodypartformatterbasefactory_p.h" #include "viewer/bodypartformatterbasefactory_p.h"
...@@ -53,7 +53,7 @@ class AnyTypeBodyPartFormatter ...@@ -53,7 +53,7 @@ class AnyTypeBodyPartFormatter
public: public:
Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE
{ {
qCDebug(MESSAGEVIEWER_LOG) << "Acting as a Interface::BodyPartFormatter!"; qCDebug(MIMETREEPARSER_LOG) << "Acting as a Interface::BodyPartFormatter!";
return AsIcon; return AsIcon;
} }
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "bodypartformatterbasefactory.h" #include "bodypartformatterbasefactory.h"
#include "bodypartformatterbasefactory_p.h" #include "bodypartformatterbasefactory_p.h"
#include "messageviewer_debug.h" #include "mimetreeparser_debug.h"
// Qt // Qt
#include <QString> #include <QString>
...@@ -73,7 +73,7 @@ void BodyPartFormatterBaseFactoryPrivate::insert(const char *type, const char *s ...@@ -73,7 +73,7 @@ void BodyPartFormatterBaseFactoryPrivate::insert(const char *type, const char *s
TypeRegistry::iterator type_it = all->find(type); TypeRegistry::iterator type_it = all->find(type);
if (type_it == all->end()) { if (type_it == all->end()) {
qCDebug(MESSAGEVIEWER_LOG) << "BodyPartFormatterBaseFactory: instantiating new Subtype Registry for \"" qCDebug(MIMETREEPARSER_LOG) << "BodyPartFormatterBaseFactory: instantiating new Subtype Registry for \""
<< type << "\""; << type << "\"";
type_it = all->insert(std::make_pair(type, SubtypeRegistry())).first; type_it = all->insert(std::make_pair(type, SubtypeRegistry())).first;
assert(type_it != all->end()); assert(type_it != all->end());
...@@ -166,7 +166,7 @@ SubtypeRegistry::const_iterator BodyPartFormatterBaseFactory::createForIterator( ...@@ -166,7 +166,7 @@ SubtypeRegistry::const_iterator BodyPartFormatterBaseFactory::createForIterator(
} }
if (!(*subtype_it).second) { if (!(*subtype_it).second) {
qCWarning(MESSAGEVIEWER_LOG) << "BodyPartFormatterBaseFactory: a null bodypart formatter sneaked in for \"" qCWarning(MIMETREEPARSER_LOG) << "BodyPartFormatterBaseFactory: a null bodypart formatter sneaked in for \""
<< type << "/" << subtype << "\"!"; << type << "/" << subtype << "\"!";
} }
...@@ -194,5 +194,5 @@ const Interface::BodyPartFormatter *BodyPartFormatterBaseFactory::createFor(cons ...@@ -194,5 +194,5 @@ const Interface::BodyPartFormatter *BodyPartFormatterBaseFactory::createFor(cons
void BodyPartFormatterBaseFactory::loadPlugins() void BodyPartFormatterBaseFactory::loadPlugins()
{ {
qCDebug(MESSAGEVIEWER_LOG) << "plugin loading is not enabled in libotp"; qCDebug(MIMETREEPARSER_LOG) << "plugin loading is not enabled in libotp";
} }
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
*/ */
#include "verifydetachedbodypartmemento.h" #include "verifydetachedbodypartmemento.h"
#include "messageviewer_debug.h" #include "mimetreeparser_debug.h"
#include <Libkleo/VerifyDetachedJob> #include <Libkleo/VerifyDetachedJob>
#include <Libkleo/KeyListJob> #include <Libkleo/KeyListJob>
...@@ -58,14 +58,14 @@ bool VerifyDetachedBodyPartMemento::start() ...@@ -58,14 +58,14 @@ bool VerifyDetachedBodyPartMemento::start()
{ {
assert(m_job); assert(m_job);
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyDetachedBodyPartMemento started"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento started";
#endif #endif
connect(m_job, SIGNAL(result(GpgME::VerificationResult)), connect(m_job, SIGNAL(result(GpgME::VerificationResult)),
this, SLOT(slotResult(GpgME::VerificationResult))); this, SLOT(slotResult(GpgME::VerificationResult)));
if (const Error err = m_job->start(m_signature, m_plainText)) { if (const Error err = m_job->start(m_signature, m_plainText)) {
m_vr = VerificationResult(err); m_vr = VerificationResult(err);
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyDetachedBodyPartMemento stopped with error"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento stopped with error";
#endif #endif
return false; return false;
} }
...@@ -78,13 +78,13 @@ void VerifyDetachedBodyPartMemento::exec() ...@@ -78,13 +78,13 @@ void VerifyDetachedBodyPartMemento::exec()
assert(m_job); assert(m_job);
setRunning(true); setRunning(true);
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyDetachedBodyPartMemento execed"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento execed";
#endif #endif
saveResult(m_job->exec(m_signature, m_plainText)); saveResult(m_job->exec(m_signature, m_plainText));
m_job->deleteLater(); // exec'ed jobs don't delete themselves m_job->deleteLater(); // exec'ed jobs don't delete themselves
m_job = 0; m_job = 0;
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyDetachedBodyPartMemento after execed"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento after execed";
#endif #endif
if (canStartKeyListJob()) { if (canStartKeyListJob()) {
std::vector<GpgME::Key> keys; std::vector<GpgME::Key> keys;
...@@ -119,7 +119,7 @@ void VerifyDetachedBodyPartMemento::saveResult(const VerificationResult &vr) ...@@ -119,7 +119,7 @@ void VerifyDetachedBodyPartMemento::saveResult(const VerificationResult &vr)
{ {
assert(m_job); assert(m_job);
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::saveResult called"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::saveResult called";
#endif #endif
m_vr = vr; m_vr = vr;
setAuditLog(m_job->auditLogError(), m_job->auditLogAsHtml()); setAuditLog(m_job->auditLogError(), m_job->auditLogAsHtml());
...@@ -128,13 +128,13 @@ void VerifyDetachedBodyPartMemento::saveResult(const VerificationResult &vr) ...@@ -128,13 +128,13 @@ void VerifyDetachedBodyPartMemento::saveResult(const VerificationResult &vr)
void VerifyDetachedBodyPartMemento::slotResult(const VerificationResult &vr) void VerifyDetachedBodyPartMemento::slotResult(const VerificationResult &vr)
{ {
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::slotResult called"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::slotResult called";
#endif #endif
saveResult(vr); saveResult(vr);
m_job = 0; m_job = 0;
if (canStartKeyListJob() && startKeyListJob()) { if (canStartKeyListJob() && startKeyListJob()) {
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyDetachedBodyPartMemento: canStartKeyListJob && startKeyListJob"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento: canStartKeyListJob && startKeyListJob";
#endif #endif
return; return;
} }
...@@ -161,7 +161,7 @@ bool VerifyDetachedBodyPartMemento::startKeyListJob() ...@@ -161,7 +161,7 @@ bool VerifyDetachedBodyPartMemento::startKeyListJob()
void VerifyDetachedBodyPartMemento::slotNextKey(const GpgME::Key &key) void VerifyDetachedBodyPartMemento::slotNextKey(const GpgME::Key &key)
{ {
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::slotNextKey called"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::slotNextKey called";
#endif #endif
m_key = key; m_key = key;
} }
...@@ -169,7 +169,7 @@ void VerifyDetachedBodyPartMemento::slotNextKey(const GpgME::Key &key) ...@@ -169,7 +169,7 @@ void VerifyDetachedBodyPartMemento::slotNextKey(const GpgME::Key &key)
void VerifyDetachedBodyPartMemento::slotKeyListJobDone() void VerifyDetachedBodyPartMemento::slotKeyListJobDone()
{ {
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::slotKeyListJobDone called"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::slotKeyListJobDone called";
#endif #endif
m_keylistjob = 0; m_keylistjob = 0;
setRunning(false); setRunning(false);
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
*/ */
#include "verifyopaquebodypartmemento.h" #include "verifyopaquebodypartmemento.h"
#include "messageviewer_debug.h" #include "mimetreeparser_debug.h"
#include <Libkleo/VerifyOpaqueJob> #include <Libkleo/VerifyOpaqueJob>
#include <Libkleo/KeyListJob> #include <Libkleo/KeyListJob>
...@@ -56,12 +56,12 @@ bool VerifyOpaqueBodyPartMemento::start() ...@@ -56,12 +56,12 @@ bool VerifyOpaqueBodyPartMemento::start()
{ {
assert(m_job); assert(m_job);
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento started"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento started";
#endif #endif
if (const Error err = m_job->start(m_signature)) { if (const Error err = m_job->start(m_signature)) {
m_vr = VerificationResult(err); m_vr = VerificationResult(err);
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento stopped with error"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento stopped with error";
#endif #endif
return false; return false;
} }
...@@ -77,11 +77,11 @@ void VerifyOpaqueBodyPartMemento::exec() ...@@ -77,11 +77,11 @@ void VerifyOpaqueBodyPartMemento::exec()
setRunning(true); setRunning(true);
QByteArray plainText; QByteArray plainText;
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento execed"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento execed";
#endif #endif
saveResult(m_job->exec(m_signature, plainText), plainText); saveResult(m_job->exec(m_signature, plainText), plainText);
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento after execed"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento after execed";
#endif #endif
m_job->deleteLater(); // exec'ed jobs don't delete themselves m_job->deleteLater(); // exec'ed jobs don't delete themselves
m_job = 0; m_job = 0;
...@@ -119,7 +119,7 @@ void VerifyOpaqueBodyPartMemento::saveResult(const VerificationResult &vr, ...@@ -119,7 +119,7 @@ void VerifyOpaqueBodyPartMemento::saveResult(const VerificationResult &vr,
{ {
assert(m_job); assert(m_job);
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::saveResult called"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::saveResult called";
#endif #endif
m_vr = vr; m_vr = vr;
m_plainText = plainText; m_plainText = plainText;
...@@ -130,13 +130,13 @@ void VerifyOpaqueBodyPartMemento::slotResult(const VerificationResult &vr, ...@@ -130,13 +130,13 @@ void VerifyOpaqueBodyPartMemento::slotResult(const VerificationResult &vr,
const QByteArray &plainText) const QByteArray &plainText)
{ {
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::slotResult called"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::slotResult called";
#endif #endif
saveResult(vr, plainText); saveResult(vr, plainText);
m_job = 0; m_job = 0;
if (canStartKeyListJob() && startKeyListJob()) { if (canStartKeyListJob() && startKeyListJob()) {
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento: canStartKeyListJob && startKeyListJob"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento: canStartKeyListJob && startKeyListJob";
#endif #endif
return; return;
} }
...@@ -163,7 +163,7 @@ bool VerifyOpaqueBodyPartMemento::startKeyListJob() ...@@ -163,7 +163,7 @@ bool VerifyOpaqueBodyPartMemento::startKeyListJob()
void VerifyOpaqueBodyPartMemento::slotNextKey(const GpgME::Key &key) void VerifyOpaqueBodyPartMemento::slotNextKey(const GpgME::Key &key)
{ {
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::slotNextKey called"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::slotNextKey called";
#endif #endif
m_key = key; m_key = key;
} }
...@@ -171,7 +171,7 @@ void VerifyOpaqueBodyPartMemento::slotNextKey(const GpgME::Key &key) ...@@ -171,7 +171,7 @@ void VerifyOpaqueBodyPartMemento::slotNextKey(const GpgME::Key &key)
void VerifyOpaqueBodyPartMemento::slotKeyListJobDone() void VerifyOpaqueBodyPartMemento::slotKeyListJobDone()
{ {
#ifdef DEBUG_SIGNATURE #ifdef DEBUG_SIGNATURE
qCDebug(MESSAGEVIEWER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::slotKeyListJobDone called"; qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::slotKeyListJobDone called";
#endif #endif
m_keylistjob = 0; m_keylistjob = 0;
setRunning(false); setRunning(false);
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "messagepart.h" #include "messagepart.h"
#include "messageviewer_debug.h" #include "mimetreeparser_debug.h"
#include "objecttreeparser.h" #include "objecttreeparser.h"
#include "converthtmltoplaintext.h" #include "converthtmltoplaintext.h"
#include "csshelperbase.h" #include "csshelperbase.h"
...@@ -497,10 +497,10 @@ static QString makeShowAuditLogLink(const GpgME::Error &err, const QString &audi ...@@ -497,10 +497,10 @@ static QString makeShowAuditLogLink(const GpgME::Error &err, const QString &audi
// equally applies there: // equally applies there:
if (const unsigned int code = err.code()) { if (const unsigned int code = err.code()) {
if (code == GPG_ERR_NOT_IMPLEMENTED) { if (code == GPG_ERR_NOT_IMPLEMENTED) {
qCDebug(MESSAGEVIEWER_LOG) << "not showing link (not implemented)"; qCDebug(MIMETREEPARSER_LOG) << "not showing link (not implemented)";
return QString(); return QString();
} else if (code == GPG_ERR_NO_DATA) { } else if (code == GPG_ERR_NO_DATA) {
qCDebug(MESSAGEVIEWER_LOG) << "not showing link (not available)"; qCDebug(MIMETREEPARSER_LOG) << "not showing link (not available)";
return i18n("No Audit Log available"); return i18n("No Audit Log available");
} else { } else {
return i18n("Error Retrieving Audit Log: %1", QString::fromLocal8Bit(err.asString())); return i18n("Error Retrieving Audit Log: %1", QString::fromLocal8Bit(err.asString()));
...@@ -1236,7 +1236,7 @@ TextMessagePart::TextMessagePart(ObjectTreeParser *otp, KMime::Content *node, bo ...@@ -1236,7 +1236,7 @@ TextMessagePart::TextMessagePart(ObjectTreeParser *otp, KMime::Content *node, bo
, mAsIcon(asIcon) , mAsIcon(asIcon)
{ {
if (!mNode) { if (!mNode) {
qCWarning(MESSAGEVIEWER_LOG) << "not a valid node"; qCWarning(MIMETREEPARSER_LOG) << "not a valid node";
return; return;
} }
...@@ -1373,7 +1373,7 @@ HtmlMessagePart::HtmlMessagePart(ObjectTreeParser *otp, KMime::Content *node, Ob ...@@ -1373,7 +1373,7 @@ HtmlMessagePart::HtmlMessagePart(ObjectTreeParser *otp, KMime::Content *node, Ob
, mSource(source) , mSource(source)
{ {
if (!mNode) { if (!mNode) {
qCWarning(MESSAGEVIEWER_LOG) << "not a valid node"; qCWarning(MIMETREEPARSER_LOG) << "not a valid node";
return; return;
} }
...@@ -1481,7 +1481,7 @@ MimeMessagePart::MimeMessagePart(ObjectTreeParser *otp, KMime::Content *node, bo ...@@ -1481,7 +1481,7 @@ MimeMessagePart::MimeMessagePart(ObjectTreeParser *otp, KMime::Content *node, bo
, mOnlyOneMimePart(onlyOneMimePart) , mOnlyOneMimePart(onlyOneMimePart)
{ {
if (!mNode) { if (!mNode) {
qCWarning(MESSAGEVIEWER_LOG) << "not a valid node"; qCWarning(MIMETREEPARSER_LOG) << "not a valid node";