aboutsummaryrefslogtreecommitdiffstats
path: root/lang/qt/src/qgpgmechangeexpiryjob.cpp
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2016-05-17 15:49:56 +0000
committerAndre Heinecke <[email protected]>2016-05-17 15:54:53 +0000
commit9b36ebf37a3b889c955ba68038bd5b3d9c5cde4e (patch)
tree2c8856a9c0cca4e8d45b4358c0e12ac9d3600da7 /lang/qt/src/qgpgmechangeexpiryjob.cpp
parentpython: Delete duplicated license texts/ (diff)
downloadgpgme-9b36ebf37a3b889c955ba68038bd5b3d9c5cde4e.tar.gz
gpgme-9b36ebf37a3b889c955ba68038bd5b3d9c5cde4e.zip
Qt / Cpp: Port auto_ptr to unique_ptr
* lang/cpp/src/context.cpp, lang/cpp/src/context.h, lang/cpp/src/context_p.h (Context::createForEngine), (Context::edit, Context::startEditing), (Context::takeLastEditInteractor, Context::cardEdit), (Context::startCardEditing, Context::takeLastCardEditInteractor), (Context::assuanTransact, Context::startAssuanTransaction), (Context::takeLastAssuanTransaction): Port to unique_ptr. * lang/qt/src/qgpgmeadduseridjob.cpp, lang/qt/src/qgpgmechangeexpiryjob.cpp, lang/qt/src/qgpgmechangeownertrustjob.cpp, lang/qt/src/qgpgmechangepasswdjob.cpp, lang/qt/src/qgpgmesignkeyjob.cpp: Update accordingly. -- This is another API break but as we already broke API with GpgME++ and QGpgME from KDE Frameworks this is a good time to do this to avoid using a deprected C++ class in the API.
Diffstat (limited to 'lang/qt/src/qgpgmechangeexpiryjob.cpp')
-rw-r--r--lang/qt/src/qgpgmechangeexpiryjob.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/lang/qt/src/qgpgmechangeexpiryjob.cpp b/lang/qt/src/qgpgmechangeexpiryjob.cpp
index e0c6c4d1..43ceee38 100644
--- a/lang/qt/src/qgpgmechangeexpiryjob.cpp
+++ b/lang/qt/src/qgpgmechangeexpiryjob.cpp
@@ -59,15 +59,14 @@ QGpgMEChangeExpiryJob::~QGpgMEChangeExpiryJob() {}
static QGpgMEChangeExpiryJob::result_type change_expiry(Context *ctx, const Key &key, const QDateTime &expiry)
{
- std::auto_ptr<EditInteractor>
- ei(expiry.isValid()
+ EditInteractor *ei = expiry.isValid()
? new GpgSetExpiryTimeEditInteractor(expiry.date().toString(Qt::ISODate).toStdString())
- : new GpgSetExpiryTimeEditInteractor());
+ : new GpgSetExpiryTimeEditInteractor();
QGpgME::QByteArrayDataProvider dp;
Data data(&dp);
assert(!data.isNull());
- const Error err = ctx->edit(key, ei, data);
+ const Error err = ctx->edit(key, std::unique_ptr<EditInteractor> (ei), data);
Error ae;
const QString log = _detail::audit_log_as_html(ctx, ae);
return std::make_tuple(err, log, ae);