From 223622f786efde373f03105b141a14061e2c1b2e Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Thu, 26 May 2011 13:19:41 +0200 Subject: [PATCH] remove keyring manager like methods which don't stay in scope for purpuose of this class. --- remote/signing.cpp | 10 ---------- remote/signing.h | 25 +++++++------------------ 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/remote/signing.cpp b/remote/signing.cpp index d3474580d..0fd2ada76 100644 --- a/remote/signing.cpp +++ b/remote/signing.cpp @@ -513,16 +513,6 @@ TrustLevel Signing::trustLevelOf(const QString &keyID) const return d->addKeyToCache(keyID.toAscii()); } -QStringList Signing::privateKeys() const -{ - return d->keysID(true); -} - -QStringList Signing::publicKeys() const -{ - return d->keysID(false); -} - QString Signing::signerOf(const KUrl &plasmoidPath, const KUrl &plasmoidSignaturePath) const { kDebug() << "Checking existence of " << plasmoidPath.pathOrUrl(); diff --git a/remote/signing.h b/remote/signing.h index 425ade063..7ce667e7f 100644 --- a/remote/signing.h +++ b/remote/signing.h @@ -100,35 +100,22 @@ public: ~Signing(); /** - * Returns a QStringList object containing all the key ID that matches the TrustLevel passed - * as parameter to the function + * Returns a list of all the key IDs processed by this Signing object that match the + * requested TrustLevel. * * @param trustLevel the TrustLevel we want to - * * @return the QStringList with all the ID of the matching keys, or an empty one otherwise */ QStringList keysByTrustLevel(TrustLevel trustLevel) const; /** - * Return the TrustLevel associated with the key passed as parameter to the function + * Return the TrustLevel associated with the key passed as parameter to the function. * * @param keyID the key we want to retrieve its trust level - * * @return the TrustLevel value */ TrustLevel trustLevelOf(const QString &keyID) const; - /** - * @return a QStringList object containing the ID of all the private keys found in the keyring. - */ - QStringList privateKeys() const; - - /** - * @return a QStringList object containing the ID of all the public keys found in the keyring. - * @note Private/Public key pairs are not returned: @see privateKeys() for that. - */ - QStringList publicKeys() const; - /** * Tests for a successful match between the object and signature files, referenced by their * absolute path. The signature path is optional and, if not specified, the function will @@ -137,11 +124,13 @@ public: * @arg path the full path of the package we want to test * @arg signaturePath optional path for the signature file * - * @return a Qstring with the signer's unique key id, or an empty one if a signer was not found. + * @return The signer's unique key id, or an empty string if a signer was not found. + * Failure can be due to the signature not matching or the signature file missing. + * On success, this informatoin can then be used with trustLevelOf and/or + * descriptiveString to get more information on the key. */ QString signerOf(const KUrl &path, const KUrl &signaturePath = KUrl()) const ; - /** * @return the QString path of the keystore being used. */