diff options
| author | Andre Heinecke <[email protected]> | 2016-10-05 15:27:36 +0000 | 
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2016-10-05 15:36:17 +0000 | 
| commit | 88c7e84ede4b6017cac3a396e8c87c2bd3a2bf58 (patch) | |
| tree | d75492e5cca8da4374c931f87102b42979c5a9a6 | |
| parent | qt: Disable tests that require a password for 2.0 (diff) | |
| download | gpgme-88c7e84ede4b6017cac3a396e8c87c2bd3a2bf58.tar.gz gpgme-88c7e84ede4b6017cac3a396e8c87c2bd3a2bf58.zip  | |
qt: Fix spelling error in WKSPublishJob
* src/qgpgmewkspublishjob.cpp,
src/qgpgmewkspublishjob.h,
src/wkspublishjob.h,
tests/t-wkspublish.cpp: Fix spelling of received.
* src/configure.ac (LIBQGPGME_LT_CURRENT): Bump
accordingly.
--
While this is an API break I've decided to fix this now
instead of deprecating / keeping it around forever in the API.
The only known users of QGpgME are KDE Applications and
there it is not yet used.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | lang/qt/src/qgpgmewkspublishjob.cpp | 6 | ||||
| -rw-r--r-- | lang/qt/src/qgpgmewkspublishjob.h | 2 | ||||
| -rw-r--r-- | lang/qt/src/wkspublishjob.h | 2 | ||||
| -rw-r--r-- | lang/qt/tests/t-wkspublish.cpp | 4 | 
5 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 114225ad..8634d8ba 100644 --- a/configure.ac +++ b/configure.ac @@ -65,9 +65,9 @@ LIBGPGMEPP_LT_CURRENT=6  LIBGPGMEPP_LT_AGE=0  LIBGPGMEPP_LT_REVISION=1 -LIBQGPGME_LT_CURRENT=6 +LIBQGPGME_LT_CURRENT=7  LIBQGPGME_LT_AGE=0 -LIBQGPGME_LT_REVISION=1 +LIBQGPGME_LT_REVISION=0  # If the API is changed in an incompatible way: increment the next counter.  GPGME_CONFIG_API_VERSION=1 diff --git a/lang/qt/src/qgpgmewkspublishjob.cpp b/lang/qt/src/qgpgmewkspublishjob.cpp index 96f5a1d6..97738938 100644 --- a/lang/qt/src/qgpgmewkspublishjob.cpp +++ b/lang/qt/src/qgpgmewkspublishjob.cpp @@ -141,7 +141,7 @@ static QGpgMEWKSPublishJob::result_type create_worker(const char *fpr, const QSt                              proc.readAllStandardOutput(), proc.readAllStandardError(), QString(), Error());  } -static QGpgMEWKSPublishJob::result_type recieve_worker(const QByteArray &response) +static QGpgMEWKSPublishJob::result_type receive_worker(const QByteArray &response)  {      if (response.isEmpty()) {          return std::make_tuple (Error(make_error(GPG_ERR_INV_ARG)), @@ -185,9 +185,9 @@ void QGpgMEWKSPublishJob::startCreate(const char *fpr, const QString &mailbox) {      run(std::bind(&create_worker, fpr, mailbox));  } -void QGpgMEWKSPublishJob::startRecieve(const QByteArray &response) +void QGpgMEWKSPublishJob::startReceive(const QByteArray &response)  { -    run(std::bind(&recieve_worker, response)); +    run(std::bind(&receive_worker, response));  }  #include "qgpgmewkspublishjob.moc" diff --git a/lang/qt/src/qgpgmewkspublishjob.h b/lang/qt/src/qgpgmewkspublishjob.h index 1a311498..5fd3c038 100644 --- a/lang/qt/src/qgpgmewkspublishjob.h +++ b/lang/qt/src/qgpgmewkspublishjob.h @@ -62,7 +62,7 @@ public:      void startCheck(const QString &mailbox) Q_DECL_OVERRIDE;      void startCreate(const char *fpr, const QString &mailbox) Q_DECL_OVERRIDE; -    void startRecieve(const QByteArray &response) Q_DECL_OVERRIDE; +    void startReceive(const QByteArray &response) Q_DECL_OVERRIDE;  };  } diff --git a/lang/qt/src/wkspublishjob.h b/lang/qt/src/wkspublishjob.h index d7bcd5dd..0cec630d 100644 --- a/lang/qt/src/wkspublishjob.h +++ b/lang/qt/src/wkspublishjob.h @@ -82,7 +82,7 @@ public:       *       * @param response The response of the server.       **/ -    virtual void startRecieve(const QByteArray &response) = 0; +    virtual void startReceive(const QByteArray &response) = 0;  Q_SIGNALS:      /* Result of the operation returned Data and returned Error are diff --git a/lang/qt/tests/t-wkspublish.cpp b/lang/qt/tests/t-wkspublish.cpp index 130c53b8..326ecaa7 100644 --- a/lang/qt/tests/t-wkspublish.cpp +++ b/lang/qt/tests/t-wkspublish.cpp @@ -226,7 +226,7 @@ private:          Q_ASSERT(spy.wait());      } -    void testWKSPublishRecieve() { +    void testWKSPublishReceive() {          if (GpgME::engineInfo(GpgME::GpgEngine).engineVersion() < "2.0.16") {              /* Not supported */              return; @@ -258,7 +258,7 @@ private:              Q_ASSERT(outstr.contains(                       QStringLiteral("From: " TEST_ADDRESS)));          }); -        job->startRecieve(QByteArray(testResponse)); +        job->startReceive(QByteArray(testResponse));          Q_ASSERT(spy.wait());      }  | 
