diff options
Diffstat (limited to 'src/core/function/gpg')
-rw-r--r-- | src/core/function/gpg/GpgAbstractKeyGetter.h | 2 | ||||
-rw-r--r-- | src/core/function/gpg/GpgAdvancedOperator.h | 2 | ||||
-rw-r--r-- | src/core/function/gpg/GpgAssuanHelper.h | 2 | ||||
-rw-r--r-- | src/core/function/gpg/GpgAutomatonHandler.h | 6 | ||||
-rw-r--r-- | src/core/function/gpg/GpgBasicOperator.h | 18 | ||||
-rw-r--r-- | src/core/function/gpg/GpgCommandExecutor.h | 4 | ||||
-rw-r--r-- | src/core/function/gpg/GpgComponentManager.h | 2 | ||||
-rw-r--r-- | src/core/function/gpg/GpgContext.h | 3 | ||||
-rw-r--r-- | src/core/function/gpg/GpgFileOpera.h | 9 | ||||
-rw-r--r-- | src/core/function/gpg/GpgKeyGetter.h | 6 | ||||
-rw-r--r-- | src/core/function/gpg/GpgKeyGroupGetter.h | 2 | ||||
-rw-r--r-- | src/core/function/gpg/GpgKeyImportExporter.h | 9 | ||||
-rw-r--r-- | src/core/function/gpg/GpgKeyManager.h | 10 | ||||
-rw-r--r-- | src/core/function/gpg/GpgKeyOpera.h | 7 | ||||
-rw-r--r-- | src/core/function/gpg/GpgSmartCardManager.h | 10 | ||||
-rw-r--r-- | src/core/function/gpg/GpgUIDOperator.h | 2 |
16 files changed, 47 insertions, 47 deletions
diff --git a/src/core/function/gpg/GpgAbstractKeyGetter.h b/src/core/function/gpg/GpgAbstractKeyGetter.h index 571121a9..6e74506f 100644 --- a/src/core/function/gpg/GpgAbstractKeyGetter.h +++ b/src/core/function/gpg/GpgAbstractKeyGetter.h @@ -41,7 +41,7 @@ class GpgKeyTableModel; * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgAbstractKeyGetter +class GF_CORE_EXPORT GpgAbstractKeyGetter : public SingletonFunctionObject<GpgAbstractKeyGetter> { public: /** diff --git a/src/core/function/gpg/GpgAdvancedOperator.h b/src/core/function/gpg/GpgAdvancedOperator.h index 48a2d755..0c4fc998 100644 --- a/src/core/function/gpg/GpgAdvancedOperator.h +++ b/src/core/function/gpg/GpgAdvancedOperator.h @@ -39,7 +39,7 @@ namespace GpgFrontend { -class GPGFRONTEND_CORE_EXPORT GpgAdvancedOperator +class GF_CORE_EXPORT GpgAdvancedOperator : public SingletonFunctionObject<GpgAdvancedOperator> { public: /** diff --git a/src/core/function/gpg/GpgAssuanHelper.h b/src/core/function/gpg/GpgAssuanHelper.h index b2a7f2b7..75f565cd 100644 --- a/src/core/function/gpg/GpgAssuanHelper.h +++ b/src/core/function/gpg/GpgAssuanHelper.h @@ -32,7 +32,7 @@ namespace GpgFrontend { -class GPGFRONTEND_CORE_EXPORT GpgAssuanHelper +class GF_CORE_EXPORT GpgAssuanHelper : public SingletonFunctionObject<GpgAssuanHelper> { public: struct AssuanCallbackContext; diff --git a/src/core/function/gpg/GpgAutomatonHandler.h b/src/core/function/gpg/GpgAutomatonHandler.h index 34c23455..0c334602 100644 --- a/src/core/function/gpg/GpgAutomatonHandler.h +++ b/src/core/function/gpg/GpgAutomatonHandler.h @@ -34,7 +34,7 @@ namespace GpgFrontend { -class GPGFRONTEND_CORE_EXPORT GpgAutomatonHandler +class GF_CORE_EXPORT GpgAutomatonHandler : public SingletonFunctionObject<GpgAutomatonHandler> { public: using Command = QString; @@ -109,8 +109,8 @@ class GPGFRONTEND_CORE_EXPORT GpgAutomatonHandler */ auto DoInteract(const GpgKeyPtr& key, AutomatonNextStateHandler next_state_handler, - AutomatonActionHandler action_handler, - int flags = 0) -> std::tuple<GpgError, bool>; + AutomatonActionHandler action_handler, int flags = 0) + -> std::tuple<GpgError, bool>; /** * @brief diff --git a/src/core/function/gpg/GpgBasicOperator.h b/src/core/function/gpg/GpgBasicOperator.h index ac6908f4..cfd91227 100644 --- a/src/core/function/gpg/GpgBasicOperator.h +++ b/src/core/function/gpg/GpgBasicOperator.h @@ -41,7 +41,7 @@ namespace GpgFrontend { * @brief Basic operation collection * */ -class GPGFRONTEND_CORE_EXPORT GpgBasicOperator +class GF_CORE_EXPORT GpgBasicOperator : public SingletonFunctionObject<GpgBasicOperator> { public: /** @@ -63,8 +63,8 @@ class GPGFRONTEND_CORE_EXPORT GpgBasicOperator * @brief * */ - auto EncryptSync(const GpgAbstractKeyPtrList&, const GFBuffer&, - bool) -> std::tuple<GpgError, DataObjectPtr>; + auto EncryptSync(const GpgAbstractKeyPtrList&, const GFBuffer&, bool) + -> std::tuple<GpgError, DataObjectPtr>; /** * @brief Call the interface provided by GPGME to symmetrical encryption @@ -85,8 +85,8 @@ class GPGFRONTEND_CORE_EXPORT GpgBasicOperator * @param cb * @return std::tuple<GpgError, DataObjectPtr> */ - auto EncryptSymmetricSync(const GFBuffer& in_buffer, - bool ascii) -> std::tuple<GpgError, DataObjectPtr>; + auto EncryptSymmetricSync(const GFBuffer& in_buffer, bool ascii) + -> std::tuple<GpgError, DataObjectPtr>; /** * @@ -115,8 +115,8 @@ class GPGFRONTEND_CORE_EXPORT GpgBasicOperator */ auto EncryptSignSync(const GpgAbstractKeyPtrList& keys, const GpgAbstractKeyPtrList& signers, - const GFBuffer& in_buffer, - bool ascii) -> std::tuple<GpgError, DataObjectPtr>; + const GFBuffer& in_buffer, bool ascii) + -> std::tuple<GpgError, DataObjectPtr>; /** * @brief Call the interface provided by gpgme for decryption operation @@ -212,8 +212,8 @@ class GPGFRONTEND_CORE_EXPORT GpgBasicOperator * @return std::tuple<GpgError, DataObjectPtr> */ auto SignSync(const GpgAbstractKeyPtrList& signers, const GFBuffer& in_buffer, - GpgSignMode mode, - bool ascii) -> std::tuple<GpgError, DataObjectPtr>; + GpgSignMode mode, bool ascii) + -> std::tuple<GpgError, DataObjectPtr>; /** * @brief Set the private key for signatures, this operation is a global diff --git a/src/core/function/gpg/GpgCommandExecutor.h b/src/core/function/gpg/GpgCommandExecutor.h index 046b61e4..e565f03b 100644 --- a/src/core/function/gpg/GpgCommandExecutor.h +++ b/src/core/function/gpg/GpgCommandExecutor.h @@ -41,10 +41,10 @@ using GpgCommandExecutorInterator = std::function<void(QProcess *)>; * @brief Extra commands related to GPG * */ -class GPGFRONTEND_CORE_EXPORT GpgCommandExecutor +class GF_CORE_EXPORT GpgCommandExecutor : public SingletonFunctionObject<GpgCommandExecutor> { public: - struct GPGFRONTEND_CORE_EXPORT ExecuteContext { + struct GF_CORE_EXPORT ExecuteContext { QString cmd; QStringList arguments; GpgCommandExecutorCallback cb_func; diff --git a/src/core/function/gpg/GpgComponentManager.h b/src/core/function/gpg/GpgComponentManager.h index 1048793f..15828004 100644 --- a/src/core/function/gpg/GpgComponentManager.h +++ b/src/core/function/gpg/GpgComponentManager.h @@ -33,7 +33,7 @@ namespace GpgFrontend { -class GPGFRONTEND_CORE_EXPORT GpgComponentManager +class GF_CORE_EXPORT GpgComponentManager : public SingletonFunctionObject<GpgComponentManager> { public: /** diff --git a/src/core/function/gpg/GpgContext.h b/src/core/function/gpg/GpgContext.h index 57df610c..09fe0aea 100644 --- a/src/core/function/gpg/GpgContext.h +++ b/src/core/function/gpg/GpgContext.h @@ -56,8 +56,7 @@ enum class GpgComponentType { kGPG_AGENT, kDIRMNGR, kKEYBOXD, kGPG_AGENT_SSH }; * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgContext - : public SingletonFunctionObject<GpgContext> { +class GF_CORE_EXPORT GpgContext : public SingletonFunctionObject<GpgContext> { public: explicit GpgContext(int channel); diff --git a/src/core/function/gpg/GpgFileOpera.h b/src/core/function/gpg/GpgFileOpera.h index 4cbe70d2..ed544da2 100644 --- a/src/core/function/gpg/GpgFileOpera.h +++ b/src/core/function/gpg/GpgFileOpera.h @@ -40,7 +40,7 @@ namespace GpgFrontend { * * @class class: GpgBasicOperator */ -class GPGFRONTEND_CORE_EXPORT GpgFileOpera +class GF_CORE_EXPORT GpgFileOpera : public SingletonFunctionObject<GpgFileOpera> { public: /** @@ -74,9 +74,10 @@ class GPGFRONTEND_CORE_EXPORT GpgFileOpera * @param out_path * @return std::tuple<GpgError, DataObjectPtr> */ - auto EncryptFileSync( - const GpgAbstractKeyPtrList& keys, const QString& in_path, bool ascii, - const QString& out_path) -> std::tuple<GpgError, DataObjectPtr>; + auto EncryptFileSync(const GpgAbstractKeyPtrList& keys, + const QString& in_path, bool ascii, + const QString& out_path) + -> std::tuple<GpgError, DataObjectPtr>; /** * @brief diff --git a/src/core/function/gpg/GpgKeyGetter.h b/src/core/function/gpg/GpgKeyGetter.h index 1fe4aeb7..35790c98 100644 --- a/src/core/function/gpg/GpgKeyGetter.h +++ b/src/core/function/gpg/GpgKeyGetter.h @@ -38,7 +38,7 @@ namespace GpgFrontend { * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgKeyGetter +class GF_CORE_EXPORT GpgKeyGetter : public SingletonFunctionObject<GpgKeyGetter> { public: /** @@ -69,8 +69,8 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyGetter * @param use_cache * @return QSharedPointer<GpgKey> */ - auto GetKeyPtr(const QString& key_id, - bool use_cache = true) -> QSharedPointer<GpgKey>; + auto GetKeyPtr(const QString& key_id, bool use_cache = true) + -> QSharedPointer<GpgKey>; /** * @brief Get the Pubkey object diff --git a/src/core/function/gpg/GpgKeyGroupGetter.h b/src/core/function/gpg/GpgKeyGroupGetter.h index 823fe338..f9b6dbdc 100644 --- a/src/core/function/gpg/GpgKeyGroupGetter.h +++ b/src/core/function/gpg/GpgKeyGroupGetter.h @@ -116,7 +116,7 @@ struct GpgKeyGroupTreeNode { [[nodiscard]] auto KeyIds() const -> QStringList; }; -class GPGFRONTEND_CORE_EXPORT GpgKeyGroupGetter +class GF_CORE_EXPORT GpgKeyGroupGetter : public SingletonFunctionObject<GpgKeyGroupGetter> { public: /** diff --git a/src/core/function/gpg/GpgKeyImportExporter.h b/src/core/function/gpg/GpgKeyImportExporter.h index dcadec36..12578a08 100644 --- a/src/core/function/gpg/GpgKeyImportExporter.h +++ b/src/core/function/gpg/GpgKeyImportExporter.h @@ -41,7 +41,7 @@ class GpgImportInformation; * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgKeyImportExporter +class GF_CORE_EXPORT GpgKeyImportExporter : public SingletonFunctionObject<GpgKeyImportExporter> { public: /** @@ -68,9 +68,10 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyImportExporter * @param ascii * @return std::tuple<GpgError, GFBuffer> */ - [[nodiscard]] auto ExportKey( - const GpgAbstractKeyPtr& key, bool secret, bool ascii, bool shortest, - bool ssh_mode = false) const -> std::tuple<GpgError, GFBuffer>; + [[nodiscard]] auto ExportKey(const GpgAbstractKeyPtr& key, bool secret, + bool ascii, bool shortest, + bool ssh_mode = false) const + -> std::tuple<GpgError, GFBuffer>; /** * @brief diff --git a/src/core/function/gpg/GpgKeyManager.h b/src/core/function/gpg/GpgKeyManager.h index 384319f8..d698de98 100644 --- a/src/core/function/gpg/GpgKeyManager.h +++ b/src/core/function/gpg/GpgKeyManager.h @@ -39,7 +39,7 @@ namespace GpgFrontend { * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgKeyManager +class GF_CORE_EXPORT GpgKeyManager : public SingletonFunctionObject<GpgKeyManager> { public: /** @@ -58,8 +58,8 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyManager * @return if successful */ auto SignKey(const GpgKeyPtr& key, const GpgAbstractKeyPtrList& keys, - const QString& uid, - const std::unique_ptr<QDateTime>& expires) -> bool; + const QString& uid, const std::unique_ptr<QDateTime>& expires) + -> bool; /** * @brief @@ -69,8 +69,8 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyManager * @return true * @return false */ - auto RevSign(const GpgKeyPtr& key, - const SignIdArgsList& signature_id) -> bool; + auto RevSign(const GpgKeyPtr& key, const SignIdArgsList& signature_id) + -> bool; /** * @brief Set the Expire object diff --git a/src/core/function/gpg/GpgKeyOpera.h b/src/core/function/gpg/GpgKeyOpera.h index 0b91f88a..dac81757 100644 --- a/src/core/function/gpg/GpgKeyOpera.h +++ b/src/core/function/gpg/GpgKeyOpera.h @@ -45,8 +45,7 @@ class KeyGenerateInfo; * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgKeyOpera - : public SingletonFunctionObject<GpgKeyOpera> { +class GF_CORE_EXPORT GpgKeyOpera : public SingletonFunctionObject<GpgKeyOpera> { public: /** * @brief Construct a new Gpg Key Opera object @@ -106,8 +105,8 @@ class GPGFRONTEND_CORE_EXPORT GpgKeyOpera * @param tofu_policy * @return GpgFrontend::GpgError */ - auto ModifyTOFUPolicy(const GpgKeyPtr& key, - gpgme_tofu_policy_t tofu_policy) -> GpgError; + auto ModifyTOFUPolicy(const GpgKeyPtr& key, gpgme_tofu_policy_t tofu_policy) + -> GpgError; /** * @brief * diff --git a/src/core/function/gpg/GpgSmartCardManager.h b/src/core/function/gpg/GpgSmartCardManager.h index 95fcd7c7..5c21e243 100644 --- a/src/core/function/gpg/GpgSmartCardManager.h +++ b/src/core/function/gpg/GpgSmartCardManager.h @@ -40,7 +40,7 @@ namespace GpgFrontend { * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgSmartCardManager +class GF_CORE_EXPORT GpgSmartCardManager : public SingletonFunctionObject<GpgSmartCardManager> { public: /** @@ -89,8 +89,8 @@ class GPGFRONTEND_CORE_EXPORT GpgSmartCardManager * * @return std::tuple<bool, QString> */ - auto ModifyAttr(const QString& attr, - const QString& value) -> std::tuple<GpgError, QString>; + auto ModifyAttr(const QString& attr, const QString& value) + -> std::tuple<GpgError, QString>; /** * @brief @@ -107,8 +107,8 @@ class GPGFRONTEND_CORE_EXPORT GpgSmartCardManager */ auto GenerateKey(const QString& serial_number, const QString& name, const QString& email, const QString& comment, - const QDateTime& expire, - bool non_expire) -> std::tuple<GpgError, QString>; + const QDateTime& expire, bool non_expire) + -> std::tuple<GpgError, QString>; /** * @brief diff --git a/src/core/function/gpg/GpgUIDOperator.h b/src/core/function/gpg/GpgUIDOperator.h index 0e222388..1f99a55f 100644 --- a/src/core/function/gpg/GpgUIDOperator.h +++ b/src/core/function/gpg/GpgUIDOperator.h @@ -37,7 +37,7 @@ namespace GpgFrontend { * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgUIDOperator +class GF_CORE_EXPORT GpgUIDOperator : public SingletonFunctionObject<GpgUIDOperator> { public: /** |