Commit d6c80c3d authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Use debug stream operator provided by libkleo

GnuPG-bug-id: 5832
parent 0481d536
......@@ -34,7 +34,7 @@ set(KF5_MIN_VERSION "5.94.0")
set(KIDENTITYMANAGEMENT_VERSION "5.20.40")
set(KMAILTRANSPORT_VERSION "5.20.40")
set(KMIME_VERSION "5.20.40")
set(LIBKLEO_VERSION "5.20.44")
set(LIBKLEO_VERSION "5.20.45")
set(QT_REQUIRED_VERSION "5.15.2")
set(GPGME_REQUIRED_VERSION "1.16.0")
......
......@@ -20,6 +20,7 @@
#include "view/tabwidget.h"
#include <Libkleo/Compat>
#include <Libkleo/Debug>
#include <Libkleo/GnuPG>
#include <dialogs/lookupcertificatesdialog.h>
......@@ -59,14 +60,6 @@ using namespace Kleo::Dialogs;
using namespace GpgME;
using namespace QGpgME;
static QDebug operator<<(QDebug s, const GpgME::Key &key)
{
if (key.primaryFingerprint()) {
return s << Formatting::summaryLine(key) << "fpr:" << key.primaryFingerprint();
} else {
return s << Formatting::summaryLine(key) << "id:" << key.keyID();
}
}
class LookupCertificatesCommand::Private : public ImportCertificatesCommand::Private
{
friend class ::Kleo::Commands::LookupCertificatesCommand;
......
......@@ -24,6 +24,7 @@
#include "kleopatra_debug.h"
#include <Libkleo/Debug>
#include <Libkleo/KeyCache>
#include <Libkleo/KeyFilter>
#include <Libkleo/KeyGroup>
......@@ -54,14 +55,6 @@ Q_DECLARE_METATYPE(KeyGroup)
static QStringList s_lookedUpKeys;
static QDebug operator<<(QDebug debug, const GpgME::Key &key)
{
const bool oldSetting = debug.autoInsertSpaces();
debug.nospace() << "Key(" << Formatting::summaryLine(key) << ", id: " << key.keyID() << ")";
debug.setAutoInsertSpaces(oldSetting);
return debug.maybeSpace();
}
namespace
{
class CompletionProxyModel : public KeyListSortFilterProxyModel
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment