diff options
Diffstat (limited to 'lang/qt/src/qgpgmeencryptjob.h')
| -rw-r--r-- | lang/qt/src/qgpgmeencryptjob.h | 9 | 
1 files changed, 3 insertions, 6 deletions
| diff --git a/lang/qt/src/qgpgmeencryptjob.h b/lang/qt/src/qgpgmeencryptjob.h index ff9b7a93..ea0cd428 100644 --- a/lang/qt/src/qgpgmeencryptjob.h +++ b/lang/qt/src/qgpgmeencryptjob.h @@ -56,7 +56,7 @@ class QGpgMEEncryptJob  #ifdef Q_MOC_RUN      : public EncryptJob  #else -    : public _detail::ThreadedJobMixin<EncryptJob, boost::tuple<GpgME::EncryptionResult, QByteArray, QString, GpgME::Error> > +    : public _detail::ThreadedJobMixin<EncryptJob, std::tuple<GpgME::EncryptionResult, QByteArray, QString, GpgME::Error> >  #endif  {      Q_OBJECT @@ -74,8 +74,8 @@ public:      /*! \reimp from EncryptJob */      void start(const std::vector<GpgME::Key> &recipients, -               const boost::shared_ptr<QIODevice> &plainText, -               const boost::shared_ptr<QIODevice> &cipherText, +               const std::shared_ptr<QIODevice> &plainText, +               const std::shared_ptr<QIODevice> &cipherText,                 bool alwaysTrust) Q_DECL_OVERRIDE;      /*! \reimp from EncryptJob */ @@ -83,9 +83,6 @@ public:                                   const QByteArray &plainText, bool alwaysTrust,                                   QByteArray &cipherText) Q_DECL_OVERRIDE; -    /*! \reimp from Job */ -    void showErrorDialog(QWidget *parent, const QString &caption) const Q_DECL_OVERRIDE; -      /*! \reimp from EncryptJob */      void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE; | 
