diff options
Diffstat (limited to 'src/core/function')
33 files changed, 78 insertions, 83 deletions
diff --git a/src/core/function/ArchiveFileOperator.h b/src/core/function/ArchiveFileOperator.h index eedbeca6..49ecb1c3 100644 --- a/src/core/function/ArchiveFileOperator.h +++ b/src/core/function/ArchiveFileOperator.h @@ -35,7 +35,7 @@ namespace GpgFrontend { -class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { +class GF_CORE_EXPORT ArchiveFileOperator { public: /** * @brief diff --git a/src/core/function/CacheManager.h b/src/core/function/CacheManager.h index 6a466b60..af054d98 100644 --- a/src/core/function/CacheManager.h +++ b/src/core/function/CacheManager.h @@ -32,7 +32,7 @@ namespace GpgFrontend { -class GPGFRONTEND_CORE_EXPORT CacheManager +class GF_CORE_EXPORT CacheManager : public SingletonFunctionObject<CacheManager> { public: /** @@ -90,8 +90,8 @@ class GPGFRONTEND_CORE_EXPORT CacheManager * @param default_value * @return QJsonDocument */ - auto LoadDurableCache(const QString& key, - QJsonDocument default_value) -> QJsonDocument; + auto LoadDurableCache(const QString& key, QJsonDocument default_value) + -> QJsonDocument; /** * @brief diff --git a/src/core/function/CoreSignalStation.h b/src/core/function/CoreSignalStation.h index a5bea44a..ddc8fa19 100644 --- a/src/core/function/CoreSignalStation.h +++ b/src/core/function/CoreSignalStation.h @@ -28,8 +28,6 @@ #pragma once -#include "core/GpgFrontendCoreExport.h" - namespace GpgFrontend { class GpgPassphraseContext; @@ -38,7 +36,7 @@ class GpgPassphraseContext; * @brief * */ -class GPGFRONTEND_CORE_EXPORT CoreSignalStation : public QObject { +class GF_CORE_EXPORT CoreSignalStation : public QObject { Q_OBJECT static std::unique_ptr<CoreSignalStation> instance; diff --git a/src/core/function/DataObjectOperator.h b/src/core/function/DataObjectOperator.h index fca93fc5..eac64d7a 100644 --- a/src/core/function/DataObjectOperator.h +++ b/src/core/function/DataObjectOperator.h @@ -35,7 +35,7 @@ namespace GpgFrontend { -class GPGFRONTEND_CORE_EXPORT DataObjectOperator +class GF_CORE_EXPORT DataObjectOperator : public SingletonFunctionObject<DataObjectOperator> { public: /** diff --git a/src/core/function/GlobalSettingStation.h b/src/core/function/GlobalSettingStation.h index 9ef29792..82223261 100644 --- a/src/core/function/GlobalSettingStation.h +++ b/src/core/function/GlobalSettingStation.h @@ -41,7 +41,7 @@ namespace GpgFrontend { * This class handles reading and writing of global settings, as well as * managing application directories and resource paths. */ -class GPGFRONTEND_CORE_EXPORT GlobalSettingStation +class GF_CORE_EXPORT GlobalSettingStation : public SingletonFunctionObject<GlobalSettingStation> { public: /** @@ -144,6 +144,6 @@ class GPGFRONTEND_CORE_EXPORT GlobalSettingStation SecureUniquePtr<Impl> p_; }; -auto GPGFRONTEND_CORE_EXPORT GetSettings() -> QSettings; +auto GF_CORE_EXPORT GetSettings() -> QSettings; } // namespace GpgFrontend diff --git a/src/core/function/KeyPackageOperator.h b/src/core/function/KeyPackageOperator.h index d8c87dd1..da1e904c 100644 --- a/src/core/function/KeyPackageOperator.h +++ b/src/core/function/KeyPackageOperator.h @@ -37,7 +37,7 @@ namespace GpgFrontend { * @brief give the possibility to import or export a key package * */ -class GPGFRONTEND_CORE_EXPORT KeyPackageOperator { +class GF_CORE_EXPORT KeyPackageOperator { public: /** * @brief generate passphrase for key package and save it to file @@ -47,8 +47,8 @@ class GPGFRONTEND_CORE_EXPORT KeyPackageOperator { * @return true if passphrase was generated and saved * @return false if passphrase was not generated and saved */ - static auto GeneratePassphrase(const QString &phrase_path, - QString &phrase) -> bool; + static auto GeneratePassphrase(const QString &phrase_path, QString &phrase) + -> bool; /** * @brief generate the name of the key package diff --git a/src/core/function/PassphraseGenerator.h b/src/core/function/PassphraseGenerator.h index 8fa7cc92..8b9afc9b 100644 --- a/src/core/function/PassphraseGenerator.h +++ b/src/core/function/PassphraseGenerator.h @@ -37,7 +37,7 @@ namespace GpgFrontend { * * This class is used to generate a passphrase. */ -class GPGFRONTEND_CORE_EXPORT PassphraseGenerator +class GF_CORE_EXPORT PassphraseGenerator : public SingletonFunctionObject<PassphraseGenerator> { public: /** diff --git a/src/core/function/SecureMemoryAllocator.h b/src/core/function/SecureMemoryAllocator.h index 9b98e0e4..1d683fbd 100644 --- a/src/core/function/SecureMemoryAllocator.h +++ b/src/core/function/SecureMemoryAllocator.h @@ -28,11 +28,9 @@ #pragma once -#include "core/GpgFrontendCoreExport.h" - namespace GpgFrontend { -class GPGFRONTEND_CORE_EXPORT SecureMemoryAllocator { +class GF_CORE_EXPORT SecureMemoryAllocator { public: static auto Allocate(std::size_t) -> void *; diff --git a/src/core/function/basic/ChannelObject.h b/src/core/function/basic/ChannelObject.h index 66c60511..752837e9 100644 --- a/src/core/function/basic/ChannelObject.h +++ b/src/core/function/basic/ChannelObject.h @@ -36,7 +36,7 @@ namespace GpgFrontend { * @brief object which in channel system is called "channel" * */ -class GPGFRONTEND_CORE_EXPORT ChannelObject { +class GF_CORE_EXPORT ChannelObject { public: /** * @brief Construct a new Default Channel Object object diff --git a/src/core/function/basic/GpgFunctionObject.h b/src/core/function/basic/GpgFunctionObject.h index fea400aa..b9cb2581 100644 --- a/src/core/function/basic/GpgFunctionObject.h +++ b/src/core/function/basic/GpgFunctionObject.h @@ -30,7 +30,6 @@ #include <mutex> -#include "core/GpgFrontendCoreExport.h" #include "core/function/basic/ChannelObject.h" #include "core/function/basic/SingletonStorage.h" #include "core/function/basic/SingletonStorageCollection.h" @@ -39,15 +38,15 @@ namespace GpgFrontend { -auto GPGFRONTEND_CORE_EXPORT GetChannelObjectInstance( - const std::type_info& type, int channel) -> ChannelObject*; +auto GF_CORE_EXPORT GetChannelObjectInstance(const std::type_info& type, + int channel) -> ChannelObject*; -auto GPGFRONTEND_CORE_EXPORT CreateChannelObjectInstance( +auto GF_CORE_EXPORT CreateChannelObjectInstance( const std::type_info& type, int channel, SecureUniquePtr<ChannelObject> channel_object) -> ChannelObject*; -auto GPGFRONTEND_CORE_EXPORT -GetGlobalFunctionObjectTypeLock(const std::type_info& type) -> std::mutex&; +auto GF_CORE_EXPORT GetGlobalFunctionObjectTypeLock(const std::type_info& type) + -> std::mutex&; /** * @brief diff --git a/src/core/function/basic/SingletonStorage.h b/src/core/function/basic/SingletonStorage.h index 574a16ec..867fe7e0 100644 --- a/src/core/function/basic/SingletonStorage.h +++ b/src/core/function/basic/SingletonStorage.h @@ -37,7 +37,7 @@ class ChannelObject; using ChannelObjectPtr = SecureUniquePtr<ChannelObject>; -class GPGFRONTEND_CORE_EXPORT SingletonStorage { +class GF_CORE_EXPORT SingletonStorage { public: /** * @brief @@ -80,8 +80,8 @@ class GPGFRONTEND_CORE_EXPORT SingletonStorage { * @param p_obj * @return T* */ - auto SetObjectInChannel(int channel, - ChannelObjectPtr p_obj) -> ChannelObject*; + auto SetObjectInChannel(int channel, ChannelObjectPtr p_obj) + -> ChannelObject*; private: class Impl; diff --git a/src/core/function/basic/SingletonStorageCollection.h b/src/core/function/basic/SingletonStorageCollection.h index 42dd8515..24f84eec 100644 --- a/src/core/function/basic/SingletonStorageCollection.h +++ b/src/core/function/basic/SingletonStorageCollection.h @@ -36,7 +36,7 @@ class SingletonStorage; using SingletonStoragePtr = std::unique_ptr<SingletonStorage, SecureObjectDeleter<SingletonStorage>>; -class GPGFRONTEND_CORE_EXPORT SingletonStorageCollection { +class GF_CORE_EXPORT SingletonStorageCollection { public: /** * @brief 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: /** diff --git a/src/core/function/result_analyse/GpgDecryptResultAnalyse.h b/src/core/function/result_analyse/GpgDecryptResultAnalyse.h index cb3eee02..b07a8904 100644 --- a/src/core/function/result_analyse/GpgDecryptResultAnalyse.h +++ b/src/core/function/result_analyse/GpgDecryptResultAnalyse.h @@ -37,8 +37,7 @@ namespace GpgFrontend { * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgDecryptResultAnalyse - : public GpgResultAnalyse { +class GF_CORE_EXPORT GpgDecryptResultAnalyse : public GpgResultAnalyse { Q_OBJECT public: /** diff --git a/src/core/function/result_analyse/GpgEncryptResultAnalyse.h b/src/core/function/result_analyse/GpgEncryptResultAnalyse.h index 26c7cf9a..c7062ad4 100644 --- a/src/core/function/result_analyse/GpgEncryptResultAnalyse.h +++ b/src/core/function/result_analyse/GpgEncryptResultAnalyse.h @@ -36,8 +36,7 @@ namespace GpgFrontend { * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgEncryptResultAnalyse - : public GpgResultAnalyse { +class GF_CORE_EXPORT GpgEncryptResultAnalyse : public GpgResultAnalyse { Q_OBJECT public: /** diff --git a/src/core/function/result_analyse/GpgResultAnalyse.h b/src/core/function/result_analyse/GpgResultAnalyse.h index fa84ddb4..99e28b2c 100644 --- a/src/core/function/result_analyse/GpgResultAnalyse.h +++ b/src/core/function/result_analyse/GpgResultAnalyse.h @@ -27,9 +27,11 @@ */ #pragma once +#include "GFCoreExport.h" + namespace GpgFrontend { -class GPGFRONTEND_CORE_EXPORT GpgResultAnalyse : public QObject { +class GF_CORE_EXPORT GpgResultAnalyse : public QObject { Q_OBJECT public: /** @@ -37,7 +39,7 @@ class GPGFRONTEND_CORE_EXPORT GpgResultAnalyse : public QObject { * */ explicit GpgResultAnalyse(int channel) - : current_gpg_context_channel_(channel){}; + : current_gpg_context_channel_(channel) {}; /** * @brief Get the Result Report object diff --git a/src/core/function/result_analyse/GpgSignResultAnalyse.h b/src/core/function/result_analyse/GpgSignResultAnalyse.h index c004086f..080f8411 100644 --- a/src/core/function/result_analyse/GpgSignResultAnalyse.h +++ b/src/core/function/result_analyse/GpgSignResultAnalyse.h @@ -37,7 +37,7 @@ namespace GpgFrontend { * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgSignResultAnalyse : public GpgResultAnalyse { +class GF_CORE_EXPORT GpgSignResultAnalyse : public GpgResultAnalyse { Q_OBJECT public: /** diff --git a/src/core/function/result_analyse/GpgVerifyResultAnalyse.h b/src/core/function/result_analyse/GpgVerifyResultAnalyse.h index 7166ae4d..53b79351 100644 --- a/src/core/function/result_analyse/GpgVerifyResultAnalyse.h +++ b/src/core/function/result_analyse/GpgVerifyResultAnalyse.h @@ -37,7 +37,7 @@ namespace GpgFrontend { * @brief * */ -class GPGFRONTEND_CORE_EXPORT GpgVerifyResultAnalyse : public GpgResultAnalyse { +class GF_CORE_EXPORT GpgVerifyResultAnalyse : public GpgResultAnalyse { Q_OBJECT public: /** |