qt: Remove unused and commented-out code
* lang/qt/src/qgpgmeencryptarchivejob.cpp, lang/qt/src/qgpgmeencryptarchivejob.h (QGpgMEEncryptArchiveJob): Remove member function resultHook and member mResult. * lang/qt/src/qgpgmesignarchivejob.cpp, lang/qt/src/qgpgmesignarchivejob.h (QGpgMESignArchiveJob): Remove member function resultHook and member mResult. -- GnuPG-bug-id: 6342
This commit is contained in:
parent
41a30f6d9f
commit
d3a8c2c8b6
@ -44,14 +44,7 @@
|
|||||||
#include "encryptarchivejob_p.h"
|
#include "encryptarchivejob_p.h"
|
||||||
#include "filelistdataprovider.h"
|
#include "filelistdataprovider.h"
|
||||||
|
|
||||||
// #include <context.h>
|
|
||||||
#include <data.h>
|
#include <data.h>
|
||||||
// #include <encryptionresult.h>
|
|
||||||
//
|
|
||||||
// #include <QBuffer>
|
|
||||||
// #include <QFileInfo>
|
|
||||||
//
|
|
||||||
// #include <cassert>
|
|
||||||
|
|
||||||
using namespace QGpgME;
|
using namespace QGpgME;
|
||||||
using namespace GpgME;
|
using namespace GpgME;
|
||||||
@ -135,18 +128,4 @@ GpgME::Error QGpgMEEncryptArchiveJob::start(const std::vector<GpgME::Key> &recip
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
// EncryptionResult QGpgMEEncryptArchiveJob::exec(const std::vector<Key> &recipients, const QByteArray &plainText,
|
|
||||||
// const Context::EncryptionFlags eflags, QByteArray &cipherText)
|
|
||||||
// {
|
|
||||||
// const result_type r = encrypt_qba(context(), recipients, plainText, eflags, mOutputIsBase64Encoded, fileName());
|
|
||||||
// cipherText = std::get<1>(r);
|
|
||||||
// resultHook(r);
|
|
||||||
// return mResult;
|
|
||||||
// }
|
|
||||||
|
|
||||||
void QGpgMEEncryptArchiveJob::resultHook(const result_type &tuple)
|
|
||||||
{
|
|
||||||
mResult = std::get<0>(tuple);
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "qgpgmeencryptarchivejob.moc"
|
#include "qgpgmeencryptarchivejob.moc"
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
#include "threadedjobmixin.h"
|
#include "threadedjobmixin.h"
|
||||||
|
|
||||||
#include <encryptionresult.h>
|
#include <encryptionresult.h>
|
||||||
#include <key.h>
|
|
||||||
|
|
||||||
namespace QGpgME
|
namespace QGpgME
|
||||||
{
|
{
|
||||||
@ -64,17 +63,6 @@ public:
|
|||||||
const std::vector<QString> &paths,
|
const std::vector<QString> &paths,
|
||||||
const std::shared_ptr<QIODevice> &cipherText,
|
const std::shared_ptr<QIODevice> &cipherText,
|
||||||
const GpgME::Context::EncryptionFlags flags) override;
|
const GpgME::Context::EncryptionFlags flags) override;
|
||||||
|
|
||||||
// GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients,
|
|
||||||
// const std::vector<QString> &paths,
|
|
||||||
// const std::shared_ptr<QIODevice> &cipherText,
|
|
||||||
// const GpgME::Context::EncryptionFlags flags) override;
|
|
||||||
|
|
||||||
/* from ThreadedJobMixin */
|
|
||||||
void resultHook(const result_type &r) override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
GpgME::EncryptionResult mResult;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -133,9 +133,4 @@ GpgME::Error QGpgMESignArchiveJob::start(const std::vector<GpgME::Key> &signers,
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
void QGpgMESignArchiveJob::resultHook(const result_type &tuple)
|
|
||||||
{
|
|
||||||
mResult = std::get<0>(tuple);
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "qgpgmesignarchivejob.moc"
|
#include "qgpgmesignarchivejob.moc"
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
#include "threadedjobmixin.h"
|
#include "threadedjobmixin.h"
|
||||||
|
|
||||||
#include <signingresult.h>
|
#include <signingresult.h>
|
||||||
#include <key.h>
|
|
||||||
|
|
||||||
namespace QGpgME
|
namespace QGpgME
|
||||||
{
|
{
|
||||||
@ -63,12 +62,6 @@ public:
|
|||||||
GpgME::Error start(const std::vector<GpgME::Key> &signers,
|
GpgME::Error start(const std::vector<GpgME::Key> &signers,
|
||||||
const std::vector<QString> &paths,
|
const std::vector<QString> &paths,
|
||||||
const std::shared_ptr<QIODevice> &output) override;
|
const std::shared_ptr<QIODevice> &output) override;
|
||||||
|
|
||||||
/* from ThreadedJobMixin */
|
|
||||||
void resultHook(const result_type &r) override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
GpgME::SigningResult mResult;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user