diff --git a/core/document.cpp b/core/document.cpp index c8ddd57a9..fd2182366 100644 --- a/core/document.cpp +++ b/core/document.cpp @@ -2727,9 +2727,9 @@ void Document::sign(const NewSignatureData &data) } } -Okular::CertificateStore *Document::getCertStore() const +Okular::CertificateStore *Document::certificateStore() const { - return d->m_generator ? d->m_generator->getCertStore() : nullptr; + return d->m_generator ? d->m_generator->certificateStore() : nullptr; } DocumentInfo Document::documentInfo() const diff --git a/core/document.h b/core/document.h index 1e6d35c84..28d7567ee 100644 --- a/core/document.h +++ b/core/document.h @@ -1006,7 +1006,7 @@ public: * * @since 21.04 */ - CertificateStore *getCertStore() const; + CertificateStore *certificateStore() const; public Q_SLOTS: /** diff --git a/core/generator.cpp b/core/generator.cpp index 4de0a17a3..6e59a72dd 100644 --- a/core/generator.cpp +++ b/core/generator.cpp @@ -256,7 +256,7 @@ bool Generator::sign(const NewSignatureData &, const QString &) return false; } -CertificateStore *Generator::getCertStore() const +CertificateStore *Generator::certificateStore() const { return nullptr; } diff --git a/core/generator.h b/core/generator.h index 8ff182cbc..44ac21df2 100644 --- a/core/generator.h +++ b/core/generator.h @@ -312,7 +312,7 @@ public: virtual bool sign(const NewSignatureData &data, const QString &rFilename); - virtual CertificateStore *getCertStore() const; + virtual CertificateStore *certificateStore() const; /** * This method can be called to trigger the generation of diff --git a/core/signatureutils.cpp b/core/signatureutils.cpp index 0ce9213de..345dd1c7a 100644 --- a/core/signatureutils.cpp +++ b/core/signatureutils.cpp @@ -168,7 +168,7 @@ CertificateStore::~CertificateStore() { } -QList CertificateStore::getSigningCertificates() const +QList CertificateStore::signingCertificates() const { return QList(); } diff --git a/core/signatureutils.h b/core/signatureutils.h index 4afc094d7..83c98c065 100644 --- a/core/signatureutils.h +++ b/core/signatureutils.h @@ -258,7 +258,7 @@ public: /** * Returns list of valid, usable signing certificates */ - virtual QList getSigningCertificates() const; + virtual QList signingCertificates() const; protected: CertificateStore(); diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp index bfca37e8e..cfa735b7c 100644 --- a/generators/poppler/generator_pdf.cpp +++ b/generators/poppler/generator_pdf.cpp @@ -1956,7 +1956,7 @@ bool PDFGenerator::sign(const Okular::NewSignatureData &oData, const QString &rF namespace { struct CertificateStoreImpl : public Okular::CertificateStore { - QList getSigningCertificates() const override + QList signingCertificates() const override { const QVector certs = Poppler::getAvailableSigningCertificates(); QList vReturnCerts; @@ -1969,7 +1969,7 @@ struct CertificateStoreImpl : public Okular::CertificateStore { } #endif -Okular::CertificateStore *PDFGenerator::getCertStore() const +Okular::CertificateStore *PDFGenerator::certificateStore() const { #ifdef HAVE_POPPLER_SIGNING if (!certStore) diff --git a/generators/poppler/generator_pdf.h b/generators/poppler/generator_pdf.h index 2730e0655..ec7c6ddc9 100644 --- a/generators/poppler/generator_pdf.h +++ b/generators/poppler/generator_pdf.h @@ -103,7 +103,7 @@ public: bool canSign() const override; bool sign(const Okular::NewSignatureData &oData, const QString &rFilename) override; - Okular::CertificateStore *getCertStore() const override; + Okular::CertificateStore *certificateStore() const override; protected: SwapBackingFileResult swapBackingFile(QString const &newFileName, QVector &newPagesVector) override; diff --git a/generators/poppler/pdfsignatureutils.h b/generators/poppler/pdfsignatureutils.h index ca6d61860..9027f0bc7 100644 --- a/generators/poppler/pdfsignatureutils.h +++ b/generators/poppler/pdfsignatureutils.h @@ -73,7 +73,7 @@ public: PopplerCertificateStore(); ~PopplerCertificateStore(); - QList getSigningCertificates() const override; + QList signingCertificates() const override; }; #endif diff --git a/part/pageviewannotator.cpp b/part/pageviewannotator.cpp index 699cc1a13..de680ec21 100644 --- a/part/pageviewannotator.cpp +++ b/part/pageviewannotator.cpp @@ -325,8 +325,8 @@ public: QList end() override { - const Okular::CertificateStore *certStore = m_document->getCertStore(); - const QList &certs = certStore->getSigningCertificates(); + const Okular::CertificateStore *certStore = m_document->certificateStore(); + const QList &certs = certStore->signingCertificates(); QStringList items; QHash nickToCommonName;