Qt: Fix unkonwn doxygen keyword warnings

--
Reimp is not a keqword and we inherit documentation anyway.
This commit is contained in:
Andre Heinecke 2016-05-10 14:32:22 +02:00
parent 56c4d9ea95
commit b7d5c2cced
25 changed files with 63 additions and 73 deletions

View File

@ -50,18 +50,13 @@ public:
private:
// these shall only be accessed through the dataprovider
// interface, where they're public:
/*! \reimp */
bool isSupported(Operation) const
{
return true;
}
/*! \reimp */
ssize_t read(void *buffer, size_t bufSize);
/*! \reimp */
ssize_t write(const void *buffer, size_t bufSize);
/*! \reimp */
off_t seek(off_t offset, int whence);
/*! \reimp */
void release();
private:
@ -83,15 +78,10 @@ public:
private:
// these shall only be accessed through the dataprovider
// interface, where they're public:
/*! \reimp */
bool isSupported(Operation) const;
/*! \reimp */
ssize_t read(void *buffer, size_t bufSize);
/*! \reimp */
ssize_t write(const void *buffer, size_t bufSize);
/*! \reimp */
off_t seek(off_t offset, int whence);
/*! \reimp */
void release();
private:

View File

@ -101,7 +101,7 @@ public:
private Q_SLOTS:
void slotResult(const GpgME::KeyListResult &);
void slotNextKey(const GpgME::Key &key);
/*! \reimp from Job */
/* from Job */
void slotCancel() Q_DECL_OVERRIDE;
private:

View File

@ -82,7 +82,7 @@ public:
*/
GpgME::Error start(const std::vector<GpgME::Key> &keys, bool allowSecretKeyDeletion = false);
/*! \reimp from Job */
/* from Job */
void slotCancel() Q_DECL_OVERRIDE;
Q_SIGNALS:

View File

@ -57,7 +57,7 @@ public:
explicit QGpgMEAddUserIDJob(GpgME::Context *context);
~QGpgMEAddUserIDJob();
/*! \reimp from AddUserIDJob */
/* from AddUserIDJob */
GpgME::Error start(const GpgME::Key &key, const QString &name, const QString &email, const QString &comment) Q_DECL_OVERRIDE;
};
}

View File

@ -57,7 +57,7 @@ public:
explicit QGpgMEChangeExpiryJob(GpgME::Context *context);
~QGpgMEChangeExpiryJob();
/*! \reimp from ChangeExpiryJob */
/* from ChangeExpiryJob */
GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry) Q_DECL_OVERRIDE;
};

View File

@ -57,7 +57,7 @@ public:
explicit QGpgMEChangeOwnerTrustJob(GpgME::Context *context);
~QGpgMEChangeOwnerTrustJob();
/*! \reimp from ChangeOwnerTrustJob */
/* from ChangeOwnerTrustJob */
GpgME::Error start(const GpgME::Key &key, GpgME::Key::OwnerTrust trust) Q_DECL_OVERRIDE;
};
}

View File

@ -57,7 +57,7 @@ public:
explicit QGpgMEChangePasswdJob(GpgME::Context *context);
~QGpgMEChangePasswdJob();
/*! \reimp from ChangePasswdJob */
/* from ChangePasswdJob */
GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE;
};

View File

@ -63,17 +63,17 @@ public:
explicit QGpgMEDecryptJob(GpgME::Context *context);
~QGpgMEDecryptJob();
/*! \reimp from DecryptJob */
/* from DecryptJob */
GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE;
/*! \reimp from DecryptJob */
/* from DecryptJob */
void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
/*! \reimp from DecryptJob */
/* from DecryptJob */
GpgME::DecryptionResult exec(const QByteArray &cipherText,
QByteArray &plainText) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:

View File

@ -68,17 +68,17 @@ public:
explicit QGpgMEDecryptVerifyJob(GpgME::Context *context);
~QGpgMEDecryptVerifyJob();
/*! \reimp from DecryptVerifyJob */
/* from DecryptVerifyJob */
GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE;
/*! \reimp from DecryptVerifyJob */
/* from DecryptVerifyJob */
void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
/*! \reimp from DecryptVerifyJob */
/* from DecryptVerifyJob */
std::pair<GpgME::DecryptionResult, GpgME::VerificationResult>
exec(const QByteArray &cipherText, QByteArray &plainText) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:

View File

@ -62,7 +62,7 @@ public:
explicit QGpgMEDeleteJob(GpgME::Context *context);
~QGpgMEDeleteJob();
/*! \reimp from DeleteJob */
/* from DeleteJob */
GpgME::Error start(const GpgME::Key &key, bool allowSecretKeyDeletion) Q_DECL_OVERRIDE;
};

View File

@ -57,10 +57,10 @@ public:
explicit QGpgMEDownloadJob(GpgME::Context *context);
~QGpgMEDownloadJob();
/*! \reimp from DownloadJob */
/* from DownloadJob */
GpgME::Error start(const QStringList &fingerprints) Q_DECL_OVERRIDE;
/*! \reimp from DownloadJob */
/* from DownloadJob */
GpgME::Error start(const QByteArray &fingerprint, const std::shared_ptr<QIODevice> &keyData) Q_DECL_OVERRIDE;
};

View File

@ -68,25 +68,25 @@ public:
explicit QGpgMEEncryptJob(GpgME::Context *context);
~QGpgMEEncryptJob();
/*! \reimp from EncryptJob */
/* from EncryptJob */
GpgME::Error start(const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE;
/*! \reimp from EncryptJob */
/* from EncryptJob */
void start(const std::vector<GpgME::Key> &recipients,
const std::shared_ptr<QIODevice> &plainText,
const std::shared_ptr<QIODevice> &cipherText,
bool alwaysTrust) Q_DECL_OVERRIDE;
/*! \reimp from EncryptJob */
/* from EncryptJob */
GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust,
QByteArray &cipherText) Q_DECL_OVERRIDE;
/*! \reimp from EncryptJob */
/* from EncryptJob */
void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:

View File

@ -57,7 +57,7 @@ public:
explicit QGpgMEExportJob(GpgME::Context *context);
~QGpgMEExportJob();
/*! \reimp from ExportJob */
/* from ExportJob */
GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
};

View File

@ -63,13 +63,13 @@ public:
explicit QGpgMEImportFromKeyserverJob(GpgME::Context *context);
~QGpgMEImportFromKeyserverJob();
/*! \reimp from ImportFromKeyserverJob */
/* from ImportFromKeyserverJob */
GpgME::Error start(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
/*! \reimp from ImportFromKeyserverJob */
/* from ImportFromKeyserverJob */
GpgME::ImportResult exec(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:

View File

@ -63,13 +63,13 @@ public:
explicit QGpgMEImportJob(GpgME::Context *context);
~QGpgMEImportJob();
/*! \reimp from ImportJob */
/* from ImportJob */
GpgME::Error start(const QByteArray &keyData) Q_DECL_OVERRIDE;
/*! \reimp from ImportJob */
/* from ImportJob */
GpgME::ImportResult exec(const QByteArray &keyData) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:

View File

@ -63,7 +63,7 @@ public:
explicit QGpgMEKeyGenerationJob(GpgME::Context *context);
~QGpgMEKeyGenerationJob();
/*! \reimp from KeygenerationJob */
/* from KeygenerationJob */
GpgME::Error start(const QString &parameters) Q_DECL_OVERRIDE;
};

View File

@ -68,13 +68,13 @@ public:
explicit QGpgMEKeyListJob(GpgME::Context *context);
~QGpgMEKeyListJob();
/*! \reimp from KeyListJob */
/* from KeyListJob */
GpgME::Error start(const QStringList &patterns, bool secretOnly) Q_DECL_OVERRIDE;
/*! \reimp from KeyListJob */
/* from KeyListJob */
GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly, std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &result) Q_DECL_OVERRIDE;
private:

View File

@ -68,13 +68,13 @@ public:
explicit QGpgMEListAllKeysJob(GpgME::Context *context);
~QGpgMEListAllKeysJob();
/*! \reimp from ListAllKeysJob */
/* from ListAllKeysJob */
GpgME::Error start(bool mergeKeys) Q_DECL_OVERRIDE;
/*! \reimp from ListAllKeysJob */
/* from ListAllKeysJob */
GpgME::KeyListResult exec(std::vector<GpgME::Key> &pub, std::vector<GpgME::Key> &sec, bool mergeKeys) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &result) Q_DECL_OVERRIDE;
private:

View File

@ -54,11 +54,11 @@ public:
QGpgMERefreshKeysJob();
~QGpgMERefreshKeysJob();
/*! \reimp from RefreshKeysJob */
/* from RefreshKeysJob */
GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
private Q_SLOTS:
/*! \reimp from Job */
/* from Job */
void slotCancel() Q_DECL_OVERRIDE;
void slotStatus(QProcess *, const QString &, const QStringList &);

View File

@ -57,11 +57,11 @@ public:
QGpgMESecretKeyExportJob(bool armour, const QString &charset);
~QGpgMESecretKeyExportJob();
/*! \reimp from ExportJob */
/* from ExportJob */
GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
private Q_SLOTS:
/*! \reimp from Job */
/* from Job */
void slotCancel() Q_DECL_OVERRIDE;
void slotStdout();

View File

@ -75,12 +75,12 @@ public:
explicit QGpgMESignEncryptJob(GpgME::Context *context);
~QGpgMESignEncryptJob();
/*! \reimp from SignEncryptJob */
/* from SignEncryptJob */
GpgME::Error start(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE;
/*! \reimp from SignEncryptJob */
/* from SignEncryptJob */
void start(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients,
const std::shared_ptr<QIODevice> &plainText,
@ -93,10 +93,10 @@ public:
const QByteArray &plainText, bool alwaysTrust,
QByteArray &cipherText) Q_DECL_OVERRIDE;
/*! \reimp from SignEncryptJob */
/* from SignEncryptJob */
void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:

View File

@ -68,27 +68,27 @@ public:
explicit QGpgMESignJob(GpgME::Context *context);
~QGpgMESignJob();
/*! \reimp from SignJob */
/* from SignJob */
GpgME::Error start(const std::vector<GpgME::Key> &signers,
const QByteArray &plainText,
GpgME::SignatureMode mode) Q_DECL_OVERRIDE;
/*! \reimp from SignJob */
/* from SignJob */
void start(const std::vector<GpgME::Key> &signers,
const std::shared_ptr<QIODevice> &plainText,
const std::shared_ptr<QIODevice> &signature,
GpgME::SignatureMode mode) Q_DECL_OVERRIDE;
/*! \reimp from SignJob */
/* from SignJob */
GpgME::SigningResult exec(const std::vector<GpgME::Key> &signers,
const QByteArray &plainText,
GpgME::SignatureMode mode,
QByteArray &signature) Q_DECL_OVERRIDE;
/*! \reimp from SignJob */
/* from SignJob */
void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:

View File

@ -63,22 +63,22 @@ public:
explicit QGpgMESignKeyJob(GpgME::Context *context);
~QGpgMESignKeyJob();
/*! \reimp from SignKeyJob */
/* from SignKeyJob */
GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE;
/*! \reimp from SignKeyJob */
/* from SignKeyJob */
void setUserIDsToSign(const std::vector<unsigned int> &idsToSign) Q_DECL_OVERRIDE;
/*! \reimp from SignKeyJob */
/* from SignKeyJob */
void setCheckLevel(unsigned int checkLevel) Q_DECL_OVERRIDE;
/*! \reimp from SignKeyJob */
/* from SignKeyJob */
void setExportable(bool exportable) Q_DECL_OVERRIDE;
/*! \reimp from SignKeyJob */
/* from SignKeyJob */
void setSigningKey(const GpgME::Key &key) Q_DECL_OVERRIDE;
/*! \reimp from SignKeyJob */
/* from SignKeyJob */
void setNonRevocable(bool nonRevocable) Q_DECL_OVERRIDE;
private:

View File

@ -63,17 +63,17 @@ public:
explicit QGpgMEVerifyDetachedJob(GpgME::Context *context);
~QGpgMEVerifyDetachedJob();
/*! \reimp from VerifyDetachedJob */
/* from VerifyDetachedJob */
GpgME::Error start(const QByteArray &signature, const QByteArray &signedData) Q_DECL_OVERRIDE;
/*! \reimp from VerifyDetachedJob */
/* from VerifyDetachedJob */
void start(const std::shared_ptr<QIODevice> &signature, const std::shared_ptr<QIODevice> &signedData) Q_DECL_OVERRIDE;
/*! \reimp from VerifyDetachedJob */
/* from VerifyDetachedJob */
GpgME::VerificationResult exec(const QByteArray &signature,
const QByteArray &signedData) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:

View File

@ -63,16 +63,16 @@ public:
explicit QGpgMEVerifyOpaqueJob(GpgME::Context *context);
~QGpgMEVerifyOpaqueJob();
/*! \reimp from VerifyOpaqueJob */
/* from VerifyOpaqueJob */
GpgME::Error start(const QByteArray &signedData) Q_DECL_OVERRIDE;
/*! \reimp from VerifyOpaqueJob */
/* from VerifyOpaqueJob */
void start(const std::shared_ptr<QIODevice> &signedData, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
/*! \reimp form VerifyOpaqueJob */
/* form VerifyOpaqueJob */
GpgME::VerificationResult exec(const QByteArray &signedData, QByteArray &plainData) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
/* from ThreadedJobMixin */
void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private: