From 59e2251a083b0ed61b3ab6d47015cef7cc6ceb05 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Thu, 11 Aug 2016 17:38:36 +0200 Subject: [PATCH] Qt: Ensure all public classes are exported * src/abstractimportjob.h, src/cryptoconfig.h, src/deletejob.h, src/exportjob.h, src/importfromkeyserverjob.h, src/importjob.h, src/keygenerationjob.h, src/keylistjob.h, src/listallkeysjob.h, src/refreshkeysjob.h, src/signencryptjob.h, src/specialjob.h, src/verifydetachedjob.h: Export classes. -- This is an adoption of kde's libkleo commit: d6a71a4e Thanks dvratil@kde.org --- lang/qt/src/abstractimportjob.h | 4 +++- lang/qt/src/cryptoconfig.h | 9 +++++---- lang/qt/src/deletejob.h | 3 ++- lang/qt/src/exportjob.h | 3 ++- lang/qt/src/importfromkeyserverjob.h | 3 ++- lang/qt/src/importjob.h | 3 ++- lang/qt/src/keygenerationjob.h | 3 ++- lang/qt/src/keylistjob.h | 3 ++- lang/qt/src/listallkeysjob.h | 3 ++- lang/qt/src/refreshkeysjob.h | 3 ++- lang/qt/src/signencryptjob.h | 3 ++- lang/qt/src/specialjob.h | 3 ++- lang/qt/src/verifydetachedjob.h | 1 + 13 files changed, 29 insertions(+), 15 deletions(-) diff --git a/lang/qt/src/abstractimportjob.h b/lang/qt/src/abstractimportjob.h index 33f6a2ac..572f203b 100644 --- a/lang/qt/src/abstractimportjob.h +++ b/lang/qt/src/abstractimportjob.h @@ -36,6 +36,8 @@ #include "job.h" +#include "qgpgme_export.h" + namespace GpgME { class Error; @@ -45,7 +47,7 @@ class ImportResult; namespace QGpgME { -class AbstractImportJob : public Job +class QGPGME_EXPORT AbstractImportJob : public Job { Q_OBJECT protected: diff --git a/lang/qt/src/cryptoconfig.h b/lang/qt/src/cryptoconfig.h index 858dbb72..c3f0c7e3 100644 --- a/lang/qt/src/cryptoconfig.h +++ b/lang/qt/src/cryptoconfig.h @@ -34,6 +34,7 @@ #ifndef CRYPTOCONFIG_H #define CRYPTOCONFIG_H +#include "qgpgme_export.h" #ifdef __cplusplus /* we read this file from a C compiler, and are only interested in the * enums... */ @@ -50,7 +51,7 @@ namespace QGpgME /** * Description of a single option */ -class CryptoConfigEntry +class QGPGME_EXPORT CryptoConfigEntry { public: @@ -252,7 +253,7 @@ public: /** * Group containing a set of config options */ -class CryptoConfigGroup +class QGPGME_EXPORT CryptoConfigGroup { public: @@ -301,7 +302,7 @@ public: /** * Crypto config for one component (e.g. gpg-agent, dirmngr etc.) */ -class CryptoConfigComponent +class QGPGME_EXPORT CryptoConfigComponent { public: @@ -341,7 +342,7 @@ public: /** * Main interface to crypto configuration. */ -class CryptoConfig +class QGPGME_EXPORT CryptoConfig { public: diff --git a/lang/qt/src/deletejob.h b/lang/qt/src/deletejob.h index 1f4e8cfd..f8479b17 100644 --- a/lang/qt/src/deletejob.h +++ b/lang/qt/src/deletejob.h @@ -34,6 +34,7 @@ #ifndef __KLEO_DELETEJOB_H__ #define __KLEO_DELETEJOB_H__ +#include "qgpgme_export.h" #include "job.h" namespace GpgME @@ -58,7 +59,7 @@ namespace QGpgME After result() is emitted, the DeleteJob will schedule it's own destruction by calling QObject::deleteLater(). */ -class DeleteJob : public Job +class QGPGME_EXPORT DeleteJob : public Job { Q_OBJECT protected: diff --git a/lang/qt/src/exportjob.h b/lang/qt/src/exportjob.h index df21f032..583d4c03 100644 --- a/lang/qt/src/exportjob.h +++ b/lang/qt/src/exportjob.h @@ -34,6 +34,7 @@ #ifndef __QGPGME_EXPORTJOB_H__ #define __QGPGME_EXPORTJOB_H__ +#include "qgpgme_export.h" #include "job.h" #include @@ -61,7 +62,7 @@ namespace QGpgME After result() is emitted, the ExportJob will schedule it's own destruction by calling QObject::deleteLater(). */ -class ExportJob : public Job +class QGPGME_EXPORT ExportJob : public Job { Q_OBJECT protected: diff --git a/lang/qt/src/importfromkeyserverjob.h b/lang/qt/src/importfromkeyserverjob.h index 7ab13cb2..f548ea74 100644 --- a/lang/qt/src/importfromkeyserverjob.h +++ b/lang/qt/src/importfromkeyserverjob.h @@ -35,6 +35,7 @@ #define __KLEO_IMPORTFROMKEYSERVERJOB_H__ #include "abstractimportjob.h" +#include "qgpgme_export.h" namespace GpgME { @@ -61,7 +62,7 @@ namespace QGpgME After result() is emitted, the ImportJob will schedule it's own destruction by calling QObject::deleteLater(). */ -class ImportFromKeyserverJob : public AbstractImportJob +class QGPGME_EXPORT ImportFromKeyserverJob : public AbstractImportJob { Q_OBJECT protected: diff --git a/lang/qt/src/importjob.h b/lang/qt/src/importjob.h index d9f60d1a..5c7b24d3 100644 --- a/lang/qt/src/importjob.h +++ b/lang/qt/src/importjob.h @@ -35,6 +35,7 @@ #define __KLEO_IMPORTJOB_H__ #include "abstractimportjob.h" +#include "qgpgme_export.h" #include @@ -60,7 +61,7 @@ namespace QGpgME After result() is emitted, the ImportJob will schedule it's own destruction by calling QObject::deleteLater(). */ -class ImportJob : public AbstractImportJob +class QGPGME_EXPORT ImportJob : public AbstractImportJob { Q_OBJECT protected: diff --git a/lang/qt/src/keygenerationjob.h b/lang/qt/src/keygenerationjob.h index 90f29bfb..a0beeac2 100644 --- a/lang/qt/src/keygenerationjob.h +++ b/lang/qt/src/keygenerationjob.h @@ -35,6 +35,7 @@ #define __KLEO_KEYGENERATIONJOB_H__ #include "job.h" +#include "qgpgme_export.h" #include @@ -60,7 +61,7 @@ namespace QGpgME After result() is emitted, the KeyGenerationJob will schedule it's own destruction by calling QObject::deleteLater(). */ -class KeyGenerationJob : public Job +class QGPGME_EXPORT KeyGenerationJob : public Job { Q_OBJECT protected: diff --git a/lang/qt/src/keylistjob.h b/lang/qt/src/keylistjob.h index 6e62c4fb..fc7a048c 100644 --- a/lang/qt/src/keylistjob.h +++ b/lang/qt/src/keylistjob.h @@ -35,6 +35,7 @@ #define __KLEO_KEYLISTJOB_H__ #include "job.h" +#include "qgpgme_export.h" #ifdef BUILDING_QGPGME # include "key.h" @@ -70,7 +71,7 @@ namespace QGpgME KeyListJob will schedule it's own destruction by calling QObject::deleteLater(). */ -class KeyListJob : public Job +class QGPGME_EXPORT KeyListJob : public Job { Q_OBJECT protected: diff --git a/lang/qt/src/listallkeysjob.h b/lang/qt/src/listallkeysjob.h index 9d4711d2..4fbb4698 100644 --- a/lang/qt/src/listallkeysjob.h +++ b/lang/qt/src/listallkeysjob.h @@ -35,6 +35,7 @@ #define __KLEO_LISTALLKEYSJOB_H__ #include "job.h" +#include "qgpgme_export.h" #ifdef BUILDING_QGPGME # include "key.h" @@ -69,7 +70,7 @@ namespace QGpgME This is potentially much faster than a KeyListJob with empty pattern. */ -class ListAllKeysJob : public Job +class QGPGME_EXPORT ListAllKeysJob : public Job { Q_OBJECT protected: diff --git a/lang/qt/src/refreshkeysjob.h b/lang/qt/src/refreshkeysjob.h index d0bc51f4..a97de803 100644 --- a/lang/qt/src/refreshkeysjob.h +++ b/lang/qt/src/refreshkeysjob.h @@ -35,6 +35,7 @@ #define __KLEO_REFRESHKEYSJOB_H__ #include "job.h" +#include "qgpgme_export.h" #include @@ -62,7 +63,7 @@ namespace QGpgME After result() is emitted, the KeyListJob will schedule it's own destruction by calling QObject::deleteLater(). */ -class RefreshKeysJob : public Job +class QGPGME_EXPORT RefreshKeysJob : public Job { Q_OBJECT protected: diff --git a/lang/qt/src/signencryptjob.h b/lang/qt/src/signencryptjob.h index b0aafe3c..4e07744b 100644 --- a/lang/qt/src/signencryptjob.h +++ b/lang/qt/src/signencryptjob.h @@ -35,6 +35,7 @@ #define __KLEO_SIGNENCRYPTJOB_H__ #include "job.h" +#include "qgpgme_export.h" #ifdef BUILDING_QGPGME # include "global.h" @@ -75,7 +76,7 @@ namespace QGpgME After result() is emitted, the SignEncryptJob will schedule it's own destruction by calling QObject::deleteLater(). */ -class SignEncryptJob : public Job +class QGPGME_EXPORT SignEncryptJob : public Job { Q_OBJECT protected: diff --git a/lang/qt/src/specialjob.h b/lang/qt/src/specialjob.h index 788371e7..2c80f20a 100644 --- a/lang/qt/src/specialjob.h +++ b/lang/qt/src/specialjob.h @@ -35,6 +35,7 @@ #define __KLEO_SPECIALJOB_H__ #include "job.h" +#include "qgpgme_export.h" namespace GpgME { @@ -65,7 +66,7 @@ namespace QGpgME through the read-only result property, the latter of which needs to be defined in each SpecialJob subclass. */ -class SpecialJob : public Job +class QGPGME_EXPORT SpecialJob : public Job { Q_OBJECT protected: diff --git a/lang/qt/src/verifydetachedjob.h b/lang/qt/src/verifydetachedjob.h index 0cb92e63..b339a8c8 100644 --- a/lang/qt/src/verifydetachedjob.h +++ b/lang/qt/src/verifydetachedjob.h @@ -35,6 +35,7 @@ #define __KLEO_VERIFYDETACHEDJOB_H__ #include "job.h" +#include "qgpgme_export.h" #include