From 4655b2dc6b33aca3bd6737eadadfb8afcf8694bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Mon, 19 Jun 2023 12:53:42 +0200 Subject: [PATCH] qt: Rename JobPrivate::start to JobPrivate::startNow * lang/qt/src/job_p.h (JobPrivate::start): Rename to startNow. * lang/qt/src/job.cpp (Job::startNow): Adapt function call. * lang/qt/src/qgpgmechangeexpiryjob.cpp (QGpgMEChangeExpiryJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmedecryptverifyarchivejob.cpp (QGpgMEDecryptVerifyArchiveJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmeencryptarchivejob.cpp (QGpgMEEncryptArchiveJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmeencryptjob.cpp (QGpgMEEncryptJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmeimportjob.cpp (QGpgMEImportJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmelistallkeysjob.cpp (QGpgMEListAllKeysJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmesignarchivejob.cpp (QGpgMESignArchiveJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmesignencryptarchivejob.cpp (QGpgMESignEncryptArchiveJobPrivate::start): Rename to startNow. * lang/qt/src/qgpgmesignencryptjob.cpp (QGpgMESignEncryptJobPrivate::start): Rename to startNow. -- Using the same name for the public and the private method avoids confusion. GnuPG-bug-id: 6530 --- lang/qt/src/job.cpp | 2 +- lang/qt/src/job_p.h | 2 +- lang/qt/src/qgpgmechangeexpiryjob.cpp | 2 +- lang/qt/src/qgpgmedecryptverifyarchivejob.cpp | 2 +- lang/qt/src/qgpgmeencryptarchivejob.cpp | 2 +- lang/qt/src/qgpgmeencryptjob.cpp | 2 +- lang/qt/src/qgpgmeimportjob.cpp | 2 +- lang/qt/src/qgpgmelistallkeysjob.cpp | 2 +- lang/qt/src/qgpgmesignarchivejob.cpp | 2 +- lang/qt/src/qgpgmesignencryptarchivejob.cpp | 2 +- lang/qt/src/qgpgmesignencryptjob.cpp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lang/qt/src/job.cpp b/lang/qt/src/job.cpp index 5e07f787..9e01a0ea 100644 --- a/lang/qt/src/job.cpp +++ b/lang/qt/src/job.cpp @@ -146,7 +146,7 @@ void QGpgME::Job::startNow() { auto d = getJobPrivate(this); Q_ASSERT(d && "This Job class has no JobPrivate class"); - d->start(); + d->startNow(); } #define make_job_subclass_ext(x,y) \ diff --git a/lang/qt/src/job_p.h b/lang/qt/src/job_p.h index 43063dd1..e4397465 100644 --- a/lang/qt/src/job_p.h +++ b/lang/qt/src/job_p.h @@ -49,7 +49,7 @@ class JobPrivate public: virtual ~JobPrivate() {} - virtual void start() = 0; + virtual void startNow() = 0; }; // Setter and getters for the externally stored pimpl instances of jobs diff --git a/lang/qt/src/qgpgmechangeexpiryjob.cpp b/lang/qt/src/qgpgmechangeexpiryjob.cpp index 4d928bd9..83a5b172 100644 --- a/lang/qt/src/qgpgmechangeexpiryjob.cpp +++ b/lang/qt/src/qgpgmechangeexpiryjob.cpp @@ -66,7 +66,7 @@ public: ~QGpgMEChangeExpiryJobPrivate() override = default; private: - void start() override + void startNow() override { q->run(); } diff --git a/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp b/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp index 68c97f87..e47ca5e6 100644 --- a/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp +++ b/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp @@ -64,7 +64,7 @@ public: ~QGpgMEDecryptVerifyArchiveJobPrivate() override = default; private: - void start() override + void startNow() override { q->run(); } diff --git a/lang/qt/src/qgpgmeencryptarchivejob.cpp b/lang/qt/src/qgpgmeencryptarchivejob.cpp index 3dc5b433..2a7855c3 100644 --- a/lang/qt/src/qgpgmeencryptarchivejob.cpp +++ b/lang/qt/src/qgpgmeencryptarchivejob.cpp @@ -65,7 +65,7 @@ public: ~QGpgMEEncryptArchiveJobPrivate() override = default; private: - void start() override + void startNow() override { q->run(); } diff --git a/lang/qt/src/qgpgmeencryptjob.cpp b/lang/qt/src/qgpgmeencryptjob.cpp index dffd3acb..8ad9cc2c 100644 --- a/lang/qt/src/qgpgmeencryptjob.cpp +++ b/lang/qt/src/qgpgmeencryptjob.cpp @@ -72,7 +72,7 @@ public: ~QGpgMEEncryptJobPrivate() override = default; private: - void start() override + void startNow() override { q->run(); } diff --git a/lang/qt/src/qgpgmeimportjob.cpp b/lang/qt/src/qgpgmeimportjob.cpp index 9f09ca7c..239cb84c 100644 --- a/lang/qt/src/qgpgmeimportjob.cpp +++ b/lang/qt/src/qgpgmeimportjob.cpp @@ -67,7 +67,7 @@ public: ~QGpgMEImportJobPrivate() override = default; private: - void start() override + void startNow() override { q->run(); } diff --git a/lang/qt/src/qgpgmelistallkeysjob.cpp b/lang/qt/src/qgpgmelistallkeysjob.cpp index 78ffaded..bc6ea0d7 100644 --- a/lang/qt/src/qgpgmelistallkeysjob.cpp +++ b/lang/qt/src/qgpgmelistallkeysjob.cpp @@ -77,7 +77,7 @@ public: ~QGpgMEListAllKeysJobPrivate() override = default; private: - void start() override + void startNow() override { q->run(); } diff --git a/lang/qt/src/qgpgmesignarchivejob.cpp b/lang/qt/src/qgpgmesignarchivejob.cpp index cd569f31..59614916 100644 --- a/lang/qt/src/qgpgmesignarchivejob.cpp +++ b/lang/qt/src/qgpgmesignarchivejob.cpp @@ -65,7 +65,7 @@ public: ~QGpgMESignArchiveJobPrivate() override = default; private: - void start() override + void startNow() override { q->run(); } diff --git a/lang/qt/src/qgpgmesignencryptarchivejob.cpp b/lang/qt/src/qgpgmesignencryptarchivejob.cpp index c5e00ef0..e7f5f30f 100644 --- a/lang/qt/src/qgpgmesignencryptarchivejob.cpp +++ b/lang/qt/src/qgpgmesignencryptarchivejob.cpp @@ -72,7 +72,7 @@ public: ~QGpgMESignEncryptArchiveJobPrivate() override = default; private: - void start() override + void startNow() override { q->run(); } diff --git a/lang/qt/src/qgpgmesignencryptjob.cpp b/lang/qt/src/qgpgmesignencryptjob.cpp index e752c0bc..6a62ee86 100644 --- a/lang/qt/src/qgpgmesignencryptjob.cpp +++ b/lang/qt/src/qgpgmesignencryptjob.cpp @@ -73,7 +73,7 @@ public: ~QGpgMESignEncryptJobPrivate() override = default; private: - void start() override + void startNow() override { q->run(); }