qt: Fix unused variable warnings
authorAndre Heinecke <aheinecke@intevation.de>
Wed, 5 Oct 2016 14:44:53 +0000 (16:44 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Wed, 5 Oct 2016 14:44:53 +0000 (16:44 +0200)
* 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.

lang/qt/src/qgpgmenewcryptoconfig.cpp
lang/qt/src/threadedjobmixin.h
lang/qt/tests/t-encrypt.cpp
lang/qt/tests/t-support.h
lang/qt/tests/t-wkspublish.cpp

index 62566d5..eb3af56 100644 (file)
@@ -84,7 +84,7 @@ QGpgMENewCryptoConfig::~QGpgMENewCryptoConfig()
     clear();
 }
 
-void QGpgMENewCryptoConfig::reloadConfiguration(bool showErrors)
+void QGpgMENewCryptoConfig::reloadConfiguration(bool)
 {
     clear();
 
index 62d7f1c..d1b1043 100644 (file)
@@ -223,7 +223,8 @@ protected:
     {
         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
         // just bounce everything to the owning thread:
         // ### hope this is thread-safe (meta obj is const, and
index bc6b878..c3ce610 100644 (file)
@@ -117,7 +117,7 @@ private Q_SLOTS:
 
         bool initSeen = 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
                 // lines depend on the system speed and are as such unreliable to test.
                 Q_ASSERT(total == PROGRESS_TEST_SIZE);
@@ -129,8 +129,8 @@ private Q_SLOTS:
                 }
                 Q_ASSERT(current >= 0 && current <= total);
             });
-        connect(job, &EncryptJob::result, this, [this, &initSeen, &finishSeen] (const GpgME::EncryptionResult &result,
-                                                                                const QByteArray &cipherText,
+        connect(job, &EncryptJob::result, this, [this, &initSeen, &finishSeen] (const GpgME::EncryptionResult &,
+                                                                                const QByteArray &,
                                                                                 const QString,
                                                                                 const GpgME::Error) {
                 Q_ASSERT(initSeen);
index 59d9a4d..704fab4 100644 (file)
@@ -39,8 +39,8 @@ namespace GpgME
 class TestPassphraseProvider : public PassphraseProvider
 {
 public:
-    char *getPassphrase(const char *useridHint, const char *description,
-                        bool previousWasBad, bool &canceled) Q_DECL_OVERRIDE
+    char *getPassphrase(const char * /*useridHint*/, const char * /*description*/,
+                        bool /*previousWasBad*/, bool &/*canceled*/) Q_DECL_OVERRIDE
     {
         return strdup("abc");
     }
index 4558fdc..130c53b 100644 (file)
@@ -126,7 +126,7 @@ private Q_SLOTS:
         // First check if it is supported
         auto job = openpgp()->wksPublishJob();
         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_EMIT asyncDone();
         });
@@ -144,7 +144,7 @@ private:
         // First check if it is supported
         auto job = openpgp()->wksPublishJob();
         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") {
                 std::cout << err;
                 Q_ASSERT(err);
@@ -165,7 +165,7 @@ private:
         }
         auto job = openpgp()->wksPublishJob();
         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_EMIT asyncDone();
         });
@@ -197,7 +197,7 @@ private:
         auto keygenjob = openpgp()->keyGenerationJob();
         QByteArray fpr;
         connect(keygenjob, &KeyGenerationJob::result, this,
-                [this, &fpr](KeyGenerationResult result, QByteArray pubkeyData, QString, Error)
+                [this, &fpr](KeyGenerationResult result, QByteArray, QString, Error)
         {
             Q_ASSERT(!result.error());
             fpr = QByteArray(result.fingerprint());
@@ -211,7 +211,7 @@ private:
         /* Then try to create a request. */
         auto job = openpgp()->wksPublishJob();
         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_EMIT asyncDone();
             const QString outstr = QString(out);
@@ -247,7 +247,7 @@ private:
         /* Get a response. */
         auto job = openpgp()->wksPublishJob();
         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_EMIT asyncDone();
             const QString outstr = QString(out);