GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Fix unused variable warnings

Browse Source 
* qt/src/qgpgmenewcryptoconfig.cpp,
qt/src/threadedjobmixin.h,
qt/tests/t-encrypt.cpp,
qt/tests/t-support.h,
qt/tests/t-wkspublish.cpp: Mark additional variables as unused.
This commit is contained in:
Andre Heinecke 2016-10-05 16:44:53 +02:00
parent 370ee1aa80
commit 9d1df99038
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/qt/src/qgpgmenewcryptoconfig.cpp
View File

@ -84,7 +84,7 @@ QGpgMENewCryptoConfig::~QGpgMENewCryptoConfig()
clear(); clear();
} }
void QGpgMENewCryptoConfig::reloadConfiguration(bool showErrors) void QGpgMENewCryptoConfig::reloadConfiguration(bool)
{ {
clear(); clear();

3
lang/qt/src/threadedjobmixin.h
View File

@ -223,7 +223,8 @@ protected:
{ {
return m_auditLogError; return m_auditLogError;
} }
void showProgress(const char *what, int type, int current, int total) Q_DECL_OVERRIDE { void showProgress(const char * /*what*/,
int /*type*/, int current, int total) Q_DECL_OVERRIDE {
// will be called from the thread exec'ing the operation, so // will be called from the thread exec'ing the operation, so
// just bounce everything to the owning thread: // just bounce everything to the owning thread:
// ### hope this is thread-safe (meta obj is const, and // ### hope this is thread-safe (meta obj is const, and

6
lang/qt/tests/t-encrypt.cpp
View File

@ -117,7 +117,7 @@ private Q_SLOTS:
bool initSeen = false; bool initSeen = false;
bool finishSeen = false; bool finishSeen = false;
connect(job, &Job::progress, this, [this, &initSeen, &finishSeen] (const QString& what, int current, int total) { connect(job, &Job::progress, this, [this, &initSeen, &finishSeen] (const QString&, int current, int total) {
// We only check for progress 0 and max progress as the other progress // We only check for progress 0 and max progress as the other progress
// lines depend on the system speed and are as such unreliable to test. // lines depend on the system speed and are as such unreliable to test.
Q_ASSERT(total == PROGRESS_TEST_SIZE); Q_ASSERT(total == PROGRESS_TEST_SIZE);
@ -129,8 +129,8 @@ private Q_SLOTS:
} }
Q_ASSERT(current >= 0 && current <= total); Q_ASSERT(current >= 0 && current <= total);
}); });
connect(job, &EncryptJob::result, this, [this, &initSeen, &finishSeen] (const GpgME::EncryptionResult &result, connect(job, &EncryptJob::result, this, [this, &initSeen, &finishSeen] (const GpgME::EncryptionResult &,
const QByteArray &cipherText, const QByteArray &,
const QString, const QString,
const GpgME::Error) { const GpgME::Error) {
Q_ASSERT(initSeen); Q_ASSERT(initSeen);

4
lang/qt/tests/t-support.h
View File

@ -39,8 +39,8 @@ namespace GpgME
class TestPassphraseProvider : public PassphraseProvider class TestPassphraseProvider : public PassphraseProvider
{ {
public: public:
char *getPassphrase(const char *useridHint, const char *description, char *getPassphrase(const char * /*useridHint*/, const char * /*description*/,
bool previousWasBad, bool &canceled) Q_DECL_OVERRIDE bool /*previousWasBad*/, bool &/*canceled*/) Q_DECL_OVERRIDE
{ {
return strdup("abc"); return strdup("abc");
} }

12
lang/qt/tests/t-wkspublish.cpp
View File

@ -126,7 +126,7 @@ private Q_SLOTS:
// First check if it is supported // First check if it is supported
auto job = openpgp()->wksPublishJob(); auto job = openpgp()->wksPublishJob();
connect(job, &WKSPublishJob::result, this, connect(job, &WKSPublishJob::result, this,
[this] (Error err, QByteArray out, QByteArray errout, QString, Error) { [this] (Error err, QByteArray, QByteArray, QString, Error) {
Q_ASSERT(err); Q_ASSERT(err);
Q_EMIT asyncDone(); Q_EMIT asyncDone();
}); });
@ -144,7 +144,7 @@ private:
// First check if it is supported // First check if it is supported
auto job = openpgp()->wksPublishJob(); auto job = openpgp()->wksPublishJob();
connect(job, &WKSPublishJob::result, this, connect(job, &WKSPublishJob::result, this,
[this] (Error err, QByteArray out, QByteArray errout, QString, Error) { [this] (Error err, QByteArray, QByteArray, QString, Error) {
if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.0.16") { if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.0.16") {
std::cout << err; std::cout << err;
Q_ASSERT(err); Q_ASSERT(err);
@ -165,7 +165,7 @@ private:
} }
auto job = openpgp()->wksPublishJob(); auto job = openpgp()->wksPublishJob();
connect(job, &WKSPublishJob::result, this, connect(job, &WKSPublishJob::result, this,
[this] (Error err, QByteArray out, QByteArray errout, QString, Error) { [this] (Error err, QByteArray, QByteArray, QString, Error) {
Q_ASSERT(err); Q_ASSERT(err);
Q_EMIT asyncDone(); Q_EMIT asyncDone();
}); });
@ -197,7 +197,7 @@ private:
auto keygenjob = openpgp()->keyGenerationJob(); auto keygenjob = openpgp()->keyGenerationJob();
QByteArray fpr; QByteArray fpr;
connect(keygenjob, &KeyGenerationJob::result, this, connect(keygenjob, &KeyGenerationJob::result, this,
[this, &fpr](KeyGenerationResult result, QByteArray pubkeyData, QString, Error) [this, &fpr](KeyGenerationResult result, QByteArray, QString, Error)
{ {
Q_ASSERT(!result.error()); Q_ASSERT(!result.error());
fpr = QByteArray(result.fingerprint()); fpr = QByteArray(result.fingerprint());
@ -211,7 +211,7 @@ private:
/* Then try to create a request. */ /* Then try to create a request. */
auto job = openpgp()->wksPublishJob(); auto job = openpgp()->wksPublishJob();
connect(job, &WKSPublishJob::result, this, connect(job, &WKSPublishJob::result, this,
[this] (Error err, QByteArray out, QByteArray errout, QString, Error) { [this] (Error err, QByteArray out, QByteArray, QString, Error) {
Q_ASSERT(!err); Q_ASSERT(!err);
Q_EMIT asyncDone(); Q_EMIT asyncDone();
const QString outstr = QString(out); const QString outstr = QString(out);
@ -247,7 +247,7 @@ private:
/* Get a response. */ /* Get a response. */
auto job = openpgp()->wksPublishJob(); auto job = openpgp()->wksPublishJob();
connect(job, &WKSPublishJob::result, this, connect(job, &WKSPublishJob::result, this,
[this] (Error err, QByteArray out, QByteArray errout, QString, Error) { [this] (Error err, QByteArray out, QByteArray, QString, Error) {
Q_ASSERT(!err); Q_ASSERT(!err);
Q_EMIT asyncDone(); Q_EMIT asyncDone();
const QString outstr = QString(out); const QString outstr = QString(out);