From 9b36ebf37a3b889c955ba68038bd5b3d9c5cde4e Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Tue, 17 May 2016 17:49:56 +0200 Subject: 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. --- lang/qt/src/qgpgmeadduseridjob.cpp | 6 ++---- lang/qt/src/qgpgmechangeexpiryjob.cpp | 7 +++---- lang/qt/src/qgpgmechangeownertrustjob.cpp | 5 ++--- lang/qt/src/qgpgmechangepasswdjob.cpp | 2 +- lang/qt/src/qgpgmesignkeyjob.cpp | 6 ++---- 5 files changed, 10 insertions(+), 16 deletions(-) (limited to 'lang/qt') diff --git a/lang/qt/src/qgpgmeadduseridjob.cpp b/lang/qt/src/qgpgmeadduseridjob.cpp index aa873f43..eb3bfab6 100644 --- a/lang/qt/src/qgpgmeadduseridjob.cpp +++ b/lang/qt/src/qgpgmeadduseridjob.cpp @@ -57,18 +57,16 @@ QGpgMEAddUserIDJob::~QGpgMEAddUserIDJob() {} static QGpgMEAddUserIDJob::result_type add_user_id(Context *ctx, const Key &key, const QString &name, const QString &email, const QString &comment) { - std::auto_ptr gau(new GpgAddUserIDEditInteractor); + GpgAddUserIDEditInteractor *gau = new GpgAddUserIDEditInteractor; gau->setNameUtf8(name.toUtf8().constData()); gau->setEmailUtf8(email.toUtf8().constData()); gau->setCommentUtf8(comment.toUtf8().constData()); - std::auto_ptr ei(gau); - 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 (gau), data); Error ae; const QString log = _detail::audit_log_as_html(ctx, ae); return std::make_tuple(err, log, ae); 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 - 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 (ei), data); Error ae; const QString log = _detail::audit_log_as_html(ctx, ae); return std::make_tuple(err, log, ae); diff --git a/lang/qt/src/qgpgmechangeownertrustjob.cpp b/lang/qt/src/qgpgmechangeownertrustjob.cpp index 2f055f11..55131d90 100644 --- a/lang/qt/src/qgpgmechangeownertrustjob.cpp +++ b/lang/qt/src/qgpgmechangeownertrustjob.cpp @@ -56,14 +56,13 @@ QGpgMEChangeOwnerTrustJob::~QGpgMEChangeOwnerTrustJob() {} static QGpgMEChangeOwnerTrustJob::result_type change_ownertrust(Context *ctx, const Key &key, Key::OwnerTrust trust) { - std::auto_ptr - ei(new GpgSetOwnerTrustEditInteractor(trust)); + EditInteractor *ei = new GpgSetOwnerTrustEditInteractor(trust); 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(ei), data); Error ae; const QString log = _detail::audit_log_as_html(ctx, ae); return std::make_tuple(err, log, ae); diff --git a/lang/qt/src/qgpgmechangepasswdjob.cpp b/lang/qt/src/qgpgmechangepasswdjob.cpp index 675eee67..0aec9273 100644 --- a/lang/qt/src/qgpgmechangepasswdjob.cpp +++ b/lang/qt/src/qgpgmechangepasswdjob.cpp @@ -56,7 +56,7 @@ QGpgMEChangePasswdJob::~QGpgMEChangePasswdJob() {} static QGpgMEChangePasswdJob::result_type change_passwd(Context *ctx, const Key &key) { #if 0 // in case we want to fall back to edit interactor for gpg... - std::auto_ptr ei(new GpgChangePasswdEditInteractor); + std::unique_ptr ei(new GpgChangePasswdEditInteractor); QGpgME::QByteArrayDataProvider dp; Data data(&dp); diff --git a/lang/qt/src/qgpgmesignkeyjob.cpp b/lang/qt/src/qgpgmesignkeyjob.cpp index 9a12f613..e6c1478e 100644 --- a/lang/qt/src/qgpgmesignkeyjob.cpp +++ b/lang/qt/src/qgpgmesignkeyjob.cpp @@ -64,18 +64,16 @@ static QGpgMESignKeyJob::result_type sign_key(Context *ctx, const Key &key, cons QGpgME::QByteArrayDataProvider dp; Data data(&dp); - std::auto_ptr skei(new GpgSignKeyEditInteractor); + GpgSignKeyEditInteractor *skei(new GpgSignKeyEditInteractor); skei->setUserIDsToSign(uids); skei->setCheckLevel(checkLevel); skei->setSigningOptions(opts); - std::auto_ptr ei(skei); - if (!signer.isNull()) if (const Error err = ctx->addSigningKey(signer)) { return std::make_tuple(err, QString(), Error()); } - const Error err = ctx->edit(key, ei, data); + const Error err = ctx->edit(key, std::unique_ptr (skei), data); Error ae; const QString log = _detail::audit_log_as_html(ctx, ae); return std::make_tuple(err, log, ae); -- cgit v1.2.3