office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-07-05 00:58:46 +00:00
Code Issues Projects Releases Wiki Activity

We don't do getFoo in Okular API

Browse Source
This commit is contained in:
Albert Astals Cid 2020-11-26 13:54:57 +01:00 committed by Albert Astals Cid
parent a4030a20f5
commit 9728d8b426
10 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/document.cpp
View File

@ -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

2
core/document.h
View File

@ -1006,7 +1006,7 @@ public:
*
* @since 21.04
*/
CertificateStore *getCertStore() const;
CertificateStore *certificateStore() const;
public Q_SLOTS:
/**

2
core/generator.cpp
View File

@ -256,7 +256,7 @@ bool Generator::sign(const NewSignatureData &, const QString &)
return false;
}
CertificateStore *Generator::getCertStore() const
CertificateStore *Generator::certificateStore() const
{
return nullptr;
}

2
core/generator.h
View File

@ -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

2
core/signatureutils.cpp
View File

@ -168,7 +168,7 @@ CertificateStore::~CertificateStore()
{
}
QList<CertificateInfo *> CertificateStore::getSigningCertificates() const
QList<CertificateInfo *> CertificateStore::signingCertificates() const
{
return QList<CertificateInfo *>();
}

2
core/signatureutils.h
View File

@ -258,7 +258,7 @@ public:
/**
* Returns list of valid, usable signing certificates
*/
virtual QList<CertificateInfo *> getSigningCertificates() const;
virtual QList<CertificateInfo *> signingCertificates() const;
protected:
CertificateStore();

4
generators/poppler/generator_pdf.cpp
View File

@ -1956,7 +1956,7 @@ bool PDFGenerator::sign(const Okular::NewSignatureData &oData, const QString &rF
namespace
{
struct CertificateStoreImpl : public Okular::CertificateStore {
QList<Okular::CertificateInfo *> getSigningCertificates() const override
QList<Okular::CertificateInfo *> signingCertificates() const override
{
const QVector<Poppler::CertificateInfo> certs = Poppler::getAvailableSigningCertificates();
QList<Okular::CertificateInfo *> 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)

2
generators/poppler/generator_pdf.h
View File

@ -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<Okular::Page *> &newPagesVector) override;

2
generators/poppler/pdfsignatureutils.h
View File

@ -73,7 +73,7 @@ public:
PopplerCertificateStore();
~PopplerCertificateStore();
QList<Okular::CertificateInfo *> getSigningCertificates() const override;
QList<Okular::CertificateInfo *> signingCertificates() const override;
};
#endif

4
part/pageviewannotator.cpp
View File

@ -325,8 +325,8 @@ public:
QList<Okular::Annotation *> end() override
{
const Okular::CertificateStore *certStore = m_document->getCertStore();
const QList<Okular::CertificateInfo *> &certs = certStore->getSigningCertificates();
const Okular::CertificateStore *certStore = m_document->certificateStore();
const QList<Okular::CertificateInfo *> &certs = certStore->signingCertificates();
QStringList items;
QHash<QString, QString> nickToCommonName;