From acf574af64d6ace5b090029748ecaf9d87163be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Fri, 24 May 2024 11:39:42 +0200 Subject: [PATCH] qt: Always include C++ binding headers with gpgme++/ prefix * lang/qt/src/Makefile.am, lang/qt/tests/Makefile.am (AM_CPPFLAGS): Add builddir instead of srcdir of C++ bindings as include path. * lang/qt/src/changeexpiryjob.cpp, lang/qt/src/changeexpiryjob.h, lang/qt/src/changeownertrustjob.h, lang/qt/src/dataprovider.cpp, lang/qt/src/dataprovider.h, lang/qt/src/debug.cpp, lang/qt/src/decryptverifyarchivejob.cpp, lang/qt/src/decryptverifyarchivejob.h, lang/qt/src/encryptarchivejob.cpp, lang/qt/src/encryptarchivejob.h, lang/qt/src/encryptjob.h, lang/qt/src/encryptjob_p.h, lang/qt/src/filelistdataprovider.cpp, lang/qt/src/filelistdataprovider.h, lang/qt/src/hierarchicalkeylistjob.h, lang/qt/src/importjob.cpp, lang/qt/src/importjob.h, lang/qt/src/importjob_p.h, lang/qt/src/job.h, lang/qt/src/keyformailboxjob.h, lang/qt/src/keylistjob.h, lang/qt/src/listallkeysjob.h, lang/qt/src/multideletejob.cpp, lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp, lang/qt/src/qgpgmeadduseridjob.cpp, lang/qt/src/qgpgmebackend.cpp, lang/qt/src/qgpgmechangeexpiryjob.cpp, lang/qt/src/qgpgmechangeownertrustjob.cpp, lang/qt/src/qgpgmechangepasswdjob.cpp, lang/qt/src/qgpgmedecryptjob.cpp, lang/qt/src/qgpgmedecryptjob.h, lang/qt/src/qgpgmedecryptverifyarchivejob.cpp, lang/qt/src/qgpgmedecryptverifyarchivejob.h, lang/qt/src/qgpgmedecryptverifyjob.cpp, lang/qt/src/qgpgmedecryptverifyjob.h, lang/qt/src/qgpgmedeletejob.cpp, lang/qt/src/qgpgmedownloadjob.cpp, lang/qt/src/qgpgmeencryptarchivejob.cpp, lang/qt/src/qgpgmeencryptarchivejob.h, lang/qt/src/qgpgmeencryptjob.cpp, lang/qt/src/qgpgmeencryptjob.h, lang/qt/src/qgpgmeexportjob.cpp, lang/qt/src/qgpgmeimportfromkeyserverjob.cpp, lang/qt/src/qgpgmeimportfromkeyserverjob.h, lang/qt/src/qgpgmeimportjob.cpp, lang/qt/src/qgpgmeimportjob.h, lang/qt/src/qgpgmekeyformailboxjob.h, lang/qt/src/qgpgmekeygenerationjob.cpp, lang/qt/src/qgpgmekeygenerationjob.h, lang/qt/src/qgpgmekeylistjob.cpp, lang/qt/src/qgpgmekeylistjob.h, lang/qt/src/qgpgmelistallkeysjob.cpp, lang/qt/src/qgpgmelistallkeysjob.h, lang/qt/src/qgpgmenewcryptoconfig.cpp, lang/qt/src/qgpgmenewcryptoconfig.h, lang/qt/src/qgpgmequickjob.cpp, lang/qt/src/qgpgmereceivekeysjob.h, lang/qt/src/qgpgmerefreshsmimekeysjob.cpp, lang/qt/src/qgpgmerefreshsmimekeysjob.h, lang/qt/src/qgpgmerevokekeyjob.cpp, lang/qt/src/qgpgmesetprimaryuseridjob.cpp, lang/qt/src/qgpgmesignarchivejob.cpp, lang/qt/src/qgpgmesignarchivejob.h, lang/qt/src/qgpgmesignencryptarchivejob.cpp, lang/qt/src/qgpgmesignencryptarchivejob.h, lang/qt/src/qgpgmesignencryptjob.cpp, lang/qt/src/qgpgmesignencryptjob.h, lang/qt/src/qgpgmesignjob.cpp, lang/qt/src/qgpgmesignjob.h, lang/qt/src/qgpgmesignkeyjob.cpp, lang/qt/src/qgpgmetofupolicyjob.cpp, lang/qt/src/qgpgmeverifydetachedjob.cpp, lang/qt/src/qgpgmeverifydetachedjob.h, lang/qt/src/qgpgmeverifyopaquejob.cpp, lang/qt/src/qgpgmeverifyopaquejob.h, lang/qt/src/qgpgmewkdlookupjob.cpp, lang/qt/src/qgpgmewkdrefreshjob.cpp, lang/qt/src/qgpgmewkdrefreshjob.h, lang/qt/src/qgpgmewkspublishjob.cpp, lang/qt/src/quickjob.h, lang/qt/src/signarchivejob.cpp, lang/qt/src/signarchivejob.h, lang/qt/src/signencryptarchivejob.cpp, lang/qt/src/signencryptarchivejob.h, lang/qt/src/signencryptjob.h, lang/qt/src/signencryptjob_p.h, lang/qt/src/signjob.h, lang/qt/src/signjob_p.h, lang/qt/src/threadedjobmixin.cpp, lang/qt/src/threadedjobmixin.h, lang/qt/src/tofupolicyjob.h, lang/qt/src/util.cpp, lang/qt/src/wkdlookupresult.cpp, lang/qt/src/wkdlookupresult.h, lang/qt/src/wkdrefreshjob_p.h, lang/qt/tests/run-decryptverifyarchivejob.cpp, lang/qt/tests/run-decryptverifyjob.cpp, lang/qt/tests/run-encryptarchivejob.cpp, lang/qt/tests/run-encryptjob.cpp, lang/qt/tests/run-exportjob.cpp, lang/qt/tests/run-importjob.cpp, lang/qt/tests/run-keyformailboxjob.cpp, lang/qt/tests/run-receivekeysjob.cpp, lang/qt/tests/run-refreshkeysjob.cpp, lang/qt/tests/run-signarchivejob.cpp, lang/qt/tests/run-signjob.cpp, lang/qt/tests/run-verifydetachedjob.cpp, lang/qt/tests/run-verifyopaquejob.cpp, lang/qt/tests/run-wkdrefreshjob.cpp, lang/qt/tests/t-addexistingsubkey.cpp, lang/qt/tests/t-changeexpiryjob.cpp, lang/qt/tests/t-config.cpp, lang/qt/tests/t-decryptverify.cpp, lang/qt/tests/t-encrypt.cpp, lang/qt/tests/t-import.cpp, lang/qt/tests/t-keylist.cpp, lang/qt/tests/t-keylocate.cpp, lang/qt/tests/t-ownertrust.cpp, lang/qt/tests/t-remarks.cpp, lang/qt/tests/t-revokekey.cpp, lang/qt/tests/t-setprimaryuserid.cpp, lang/qt/tests/t-support.cpp, lang/qt/tests/t-support.h, lang/qt/tests/t-tofuinfo.cpp, lang/qt/tests/t-trustsignatures.cpp, lang/qt/tests/t-various.cpp, lang/qt/tests/t-verify.cpp, lang/qt/tests/t-wkdlookup.cpp, lang/qt/tests/t-wkspublish.cpp: Include GpgME++ headers with gpgme++/ prefix. -- This prepares the Qt bindings for building them separately from the C++ bindings. GnuPG-bug-id: 7110 --- lang/qt/src/Makefile.am | 4 ++-- lang/qt/src/changeexpiryjob.cpp | 2 +- lang/qt/src/changeexpiryjob.h | 6 +----- lang/qt/src/changeownertrustjob.h | 6 +----- lang/qt/src/dataprovider.cpp | 2 +- lang/qt/src/dataprovider.h | 4 ---- lang/qt/src/debug.cpp | 2 +- lang/qt/src/decryptverifyarchivejob.cpp | 2 +- lang/qt/src/decryptverifyarchivejob.h | 6 +----- lang/qt/src/encryptarchivejob.cpp | 2 +- lang/qt/src/encryptarchivejob.h | 6 +----- lang/qt/src/encryptjob.h | 8 ++------ lang/qt/src/encryptjob_p.h | 4 ++-- lang/qt/src/filelistdataprovider.cpp | 2 +- lang/qt/src/filelistdataprovider.h | 4 ---- lang/qt/src/hierarchicalkeylistjob.h | 4 ---- lang/qt/src/importjob.cpp | 2 +- lang/qt/src/importjob.h | 6 +----- lang/qt/src/importjob_p.h | 2 +- lang/qt/src/job.h | 6 +----- lang/qt/src/keyformailboxjob.h | 6 +----- lang/qt/src/keylistjob.h | 6 +----- lang/qt/src/listallkeysjob.h | 6 +----- lang/qt/src/multideletejob.cpp | 6 +++--- lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp | 8 ++++---- lang/qt/src/qgpgmeadduseridjob.cpp | 8 ++++---- lang/qt/src/qgpgmebackend.cpp | 4 ++-- lang/qt/src/qgpgmechangeexpiryjob.cpp | 4 ++-- lang/qt/src/qgpgmechangeownertrustjob.cpp | 8 ++++---- lang/qt/src/qgpgmechangepasswdjob.cpp | 6 +++--- lang/qt/src/qgpgmedecryptjob.cpp | 6 +++--- lang/qt/src/qgpgmedecryptjob.h | 4 ---- lang/qt/src/qgpgmedecryptverifyarchivejob.cpp | 2 +- lang/qt/src/qgpgmedecryptverifyarchivejob.h | 4 ++-- lang/qt/src/qgpgmedecryptverifyjob.cpp | 8 ++++---- lang/qt/src/qgpgmedecryptverifyjob.h | 8 -------- lang/qt/src/qgpgmedeletejob.cpp | 4 ++-- lang/qt/src/qgpgmedownloadjob.cpp | 4 ++-- lang/qt/src/qgpgmeencryptarchivejob.cpp | 2 +- lang/qt/src/qgpgmeencryptarchivejob.h | 2 +- lang/qt/src/qgpgmeencryptjob.cpp | 6 +++--- lang/qt/src/qgpgmeencryptjob.h | 8 -------- lang/qt/src/qgpgmeexportjob.cpp | 6 +++--- lang/qt/src/qgpgmeimportfromkeyserverjob.cpp | 6 +++--- lang/qt/src/qgpgmeimportfromkeyserverjob.h | 4 ---- lang/qt/src/qgpgmeimportjob.cpp | 6 +++--- lang/qt/src/qgpgmeimportjob.h | 4 ---- lang/qt/src/qgpgmekeyformailboxjob.h | 9 ++------- lang/qt/src/qgpgmekeygenerationjob.cpp | 4 ++-- lang/qt/src/qgpgmekeygenerationjob.h | 4 ---- lang/qt/src/qgpgmekeylistjob.cpp | 6 +++--- lang/qt/src/qgpgmekeylistjob.h | 8 -------- lang/qt/src/qgpgmelistallkeysjob.cpp | 10 +++++----- lang/qt/src/qgpgmelistallkeysjob.h | 8 -------- lang/qt/src/qgpgmenewcryptoconfig.cpp | 4 ++-- lang/qt/src/qgpgmenewcryptoconfig.h | 7 +------ lang/qt/src/qgpgmequickjob.cpp | 5 +++-- lang/qt/src/qgpgmereceivekeysjob.h | 6 +----- lang/qt/src/qgpgmerefreshsmimekeysjob.cpp | 4 ++-- lang/qt/src/qgpgmerefreshsmimekeysjob.h | 7 ++----- lang/qt/src/qgpgmerevokekeyjob.cpp | 8 ++++---- lang/qt/src/qgpgmesetprimaryuseridjob.cpp | 2 +- lang/qt/src/qgpgmesignarchivejob.cpp | 2 +- lang/qt/src/qgpgmesignarchivejob.h | 2 +- lang/qt/src/qgpgmesignencryptarchivejob.cpp | 2 +- lang/qt/src/qgpgmesignencryptarchivejob.h | 4 ++-- lang/qt/src/qgpgmesignencryptjob.cpp | 8 ++++---- lang/qt/src/qgpgmesignencryptjob.h | 12 ------------ lang/qt/src/qgpgmesignjob.cpp | 6 +++--- lang/qt/src/qgpgmesignjob.h | 8 -------- lang/qt/src/qgpgmesignkeyjob.cpp | 6 +++--- lang/qt/src/qgpgmetofupolicyjob.cpp | 6 +++--- lang/qt/src/qgpgmeverifydetachedjob.cpp | 6 +++--- lang/qt/src/qgpgmeverifydetachedjob.h | 4 ---- lang/qt/src/qgpgmeverifyopaquejob.cpp | 6 +++--- lang/qt/src/qgpgmeverifyopaquejob.h | 4 ---- lang/qt/src/qgpgmewkdlookupjob.cpp | 6 +++--- lang/qt/src/qgpgmewkdrefreshjob.cpp | 2 +- lang/qt/src/qgpgmewkdrefreshjob.h | 2 +- lang/qt/src/qgpgmewkspublishjob.cpp | 5 +++-- lang/qt/src/quickjob.h | 6 +----- lang/qt/src/signarchivejob.cpp | 2 +- lang/qt/src/signarchivejob.h | 6 +----- lang/qt/src/signencryptarchivejob.cpp | 2 +- lang/qt/src/signencryptarchivejob.h | 6 +----- lang/qt/src/signencryptjob.h | 9 ++------- lang/qt/src/signencryptjob_p.h | 2 +- lang/qt/src/signjob.h | 7 +------ lang/qt/src/signjob_p.h | 2 +- lang/qt/src/threadedjobmixin.cpp | 2 +- lang/qt/src/threadedjobmixin.h | 9 ++------- lang/qt/src/tofupolicyjob.h | 6 +----- lang/qt/src/util.cpp | 2 +- lang/qt/src/wkdlookupresult.cpp | 2 +- lang/qt/src/wkdlookupresult.h | 6 +----- lang/qt/src/wkdrefreshjob_p.h | 2 +- lang/qt/tests/Makefile.am | 4 ++-- lang/qt/tests/run-decryptverifyarchivejob.cpp | 6 +++--- lang/qt/tests/run-decryptverifyjob.cpp | 6 +++--- lang/qt/tests/run-encryptarchivejob.cpp | 6 +++--- lang/qt/tests/run-encryptjob.cpp | 6 +++--- lang/qt/tests/run-exportjob.cpp | 2 +- lang/qt/tests/run-importjob.cpp | 2 +- lang/qt/tests/run-keyformailboxjob.cpp | 4 ++-- lang/qt/tests/run-receivekeysjob.cpp | 2 +- lang/qt/tests/run-refreshkeysjob.cpp | 4 ++-- lang/qt/tests/run-signarchivejob.cpp | 4 ++-- lang/qt/tests/run-signjob.cpp | 4 ++-- lang/qt/tests/run-verifydetachedjob.cpp | 4 ++-- lang/qt/tests/run-verifyopaquejob.cpp | 4 ++-- lang/qt/tests/run-wkdrefreshjob.cpp | 4 ++-- lang/qt/tests/t-addexistingsubkey.cpp | 6 +++--- lang/qt/tests/t-changeexpiryjob.cpp | 4 ++-- lang/qt/tests/t-config.cpp | 2 +- lang/qt/tests/t-decryptverify.cpp | 6 +++--- lang/qt/tests/t-encrypt.cpp | 10 +++++----- lang/qt/tests/t-import.cpp | 6 +++--- lang/qt/tests/t-keylist.cpp | 6 +++--- lang/qt/tests/t-keylocate.cpp | 4 ++-- lang/qt/tests/t-ownertrust.cpp | 2 +- lang/qt/tests/t-remarks.cpp | 4 ++-- lang/qt/tests/t-revokekey.cpp | 4 ++-- lang/qt/tests/t-setprimaryuserid.cpp | 6 +++--- lang/qt/tests/t-support.cpp | 6 +++--- lang/qt/tests/t-support.h | 2 +- lang/qt/tests/t-tofuinfo.cpp | 17 +++++++++-------- lang/qt/tests/t-trustsignatures.cpp | 4 ++-- lang/qt/tests/t-various.cpp | 8 ++++---- lang/qt/tests/t-verify.cpp | 5 +++-- lang/qt/tests/t-wkdlookup.cpp | 4 ++-- lang/qt/tests/t-wkspublish.cpp | 6 +++--- 131 files changed, 239 insertions(+), 415 deletions(-) diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am index de0d7b05..87fb9f16 100644 --- a/lang/qt/src/Makefile.am +++ b/lang/qt/src/Makefile.am @@ -332,7 +332,7 @@ camelcaseinclude_HEADERS = $(camelcase_headers) nodist_qgpgmeinclude_HEADERS = qgpgme_version.h if WANT_QT5 -AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ +AM_CPPFLAGS = -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \ -DBUILDING_QGPGME -Wsuggest-override \ -Wzero-as-null-pointer-constant @@ -345,7 +345,7 @@ libqgpgme_la_LDFLAGS = -no-undefined -version-info \ @LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@ endif if WANT_QT6 -AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ +AM_CPPFLAGS = -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \ -DBUILDING_QGPGME -Wsuggest-override \ -Wzero-as-null-pointer-constant diff --git a/lang/qt/src/changeexpiryjob.cpp b/lang/qt/src/changeexpiryjob.cpp index 96d02167..333fbabe 100644 --- a/lang/qt/src/changeexpiryjob.cpp +++ b/lang/qt/src/changeexpiryjob.cpp @@ -38,7 +38,7 @@ #include "changeexpiryjob.h" #include "changeexpiryjob_p.h" -#include +#include using namespace GpgME; using namespace QGpgME; diff --git a/lang/qt/src/changeexpiryjob.h b/lang/qt/src/changeexpiryjob.h index 0c5e1b2b..abec51ea 100644 --- a/lang/qt/src/changeexpiryjob.h +++ b/lang/qt/src/changeexpiryjob.h @@ -37,11 +37,7 @@ #include "job.h" -#ifdef BUILDING_QGPGME -# include "key.h" -#else -# include -#endif +#include #include diff --git a/lang/qt/src/changeownertrustjob.h b/lang/qt/src/changeownertrustjob.h index 42a806a8..6e4613ee 100644 --- a/lang/qt/src/changeownertrustjob.h +++ b/lang/qt/src/changeownertrustjob.h @@ -37,11 +37,7 @@ #include "job.h" -#ifdef BUILDING_QGPGME -# include "key.h" -#else -# include -#endif +#include namespace QGpgME { diff --git a/lang/qt/src/dataprovider.cpp b/lang/qt/src/dataprovider.cpp index dc93e289..e376ca8d 100644 --- a/lang/qt/src/dataprovider.cpp +++ b/lang/qt/src/dataprovider.cpp @@ -28,7 +28,7 @@ #include -#include +#include #include #include diff --git a/lang/qt/src/dataprovider.h b/lang/qt/src/dataprovider.h index 6162d2b8..c0bd361b 100644 --- a/lang/qt/src/dataprovider.h +++ b/lang/qt/src/dataprovider.h @@ -26,11 +26,7 @@ #include "qgpgme_export.h" -#ifdef BUILDING_QGPGME -#include -#else #include -#endif #include diff --git a/lang/qt/src/debug.cpp b/lang/qt/src/debug.cpp index 2f6d200b..03244dc6 100644 --- a/lang/qt/src/debug.cpp +++ b/lang/qt/src/debug.cpp @@ -35,7 +35,7 @@ #include "config.h" #endif -#include "error.h" +#include #include "debug.h" #include diff --git a/lang/qt/src/decryptverifyarchivejob.cpp b/lang/qt/src/decryptverifyarchivejob.cpp index 76c1721a..b1699c3d 100644 --- a/lang/qt/src/decryptverifyarchivejob.cpp +++ b/lang/qt/src/decryptverifyarchivejob.cpp @@ -38,7 +38,7 @@ #include "decryptverifyarchivejob.h" #include "decryptverifyarchivejob_p.h" -#include +#include using namespace QGpgME; diff --git a/lang/qt/src/decryptverifyarchivejob.h b/lang/qt/src/decryptverifyarchivejob.h index 6d87dd36..f80170c5 100644 --- a/lang/qt/src/decryptverifyarchivejob.h +++ b/lang/qt/src/decryptverifyarchivejob.h @@ -36,11 +36,7 @@ #include "job.h" -#ifdef BUILDING_QGPGME -# include "context.h" -#else -# include -#endif +#include namespace GpgME { diff --git a/lang/qt/src/encryptarchivejob.cpp b/lang/qt/src/encryptarchivejob.cpp index aa51bcf3..f4cf288f 100644 --- a/lang/qt/src/encryptarchivejob.cpp +++ b/lang/qt/src/encryptarchivejob.cpp @@ -38,7 +38,7 @@ #include "encryptarchivejob.h" #include "encryptarchivejob_p.h" -#include +#include using namespace QGpgME; diff --git a/lang/qt/src/encryptarchivejob.h b/lang/qt/src/encryptarchivejob.h index 66d45619..bba8acb6 100644 --- a/lang/qt/src/encryptarchivejob.h +++ b/lang/qt/src/encryptarchivejob.h @@ -36,11 +36,7 @@ #include "job.h" -#ifdef BUILDING_QGPGME -# include "context.h" -#else -# include -#endif +#include namespace GpgME { diff --git a/lang/qt/src/encryptjob.h b/lang/qt/src/encryptjob.h index 48b36598..dde9d6e8 100644 --- a/lang/qt/src/encryptjob.h +++ b/lang/qt/src/encryptjob.h @@ -38,16 +38,12 @@ #define __KLEO_ENCRYPTJOB_H__ #include "job.h" -#include "data.h" +#include #include #include -#ifdef BUILDING_QGPGME -# include "context.h" -#else -# include -#endif +#include class QByteArray; class QIODevice; diff --git a/lang/qt/src/encryptjob_p.h b/lang/qt/src/encryptjob_p.h index b92d784e..95126e13 100644 --- a/lang/qt/src/encryptjob_p.h +++ b/lang/qt/src/encryptjob_p.h @@ -36,8 +36,8 @@ #include "job_p.h" -#include -#include +#include +#include namespace QGpgME { diff --git a/lang/qt/src/filelistdataprovider.cpp b/lang/qt/src/filelistdataprovider.cpp index 1aa0f7f2..004854ef 100644 --- a/lang/qt/src/filelistdataprovider.cpp +++ b/lang/qt/src/filelistdataprovider.cpp @@ -41,7 +41,7 @@ #include -#include +#include #include diff --git a/lang/qt/src/filelistdataprovider.h b/lang/qt/src/filelistdataprovider.h index 25e52e41..60bb0548 100644 --- a/lang/qt/src/filelistdataprovider.h +++ b/lang/qt/src/filelistdataprovider.h @@ -36,11 +36,7 @@ #include "qgpgme_export.h" -#ifdef BUILDING_QGPGME -#include -#else #include -#endif #include #include diff --git a/lang/qt/src/hierarchicalkeylistjob.h b/lang/qt/src/hierarchicalkeylistjob.h index 362f036c..431ff712 100644 --- a/lang/qt/src/hierarchicalkeylistjob.h +++ b/lang/qt/src/hierarchicalkeylistjob.h @@ -39,11 +39,7 @@ #include "keylistjob.h" #include "cryptobackend.h" -#ifdef BUILDING_QGPGME -# include "keylistresult.h" -#else #include -#endif #include diff --git a/lang/qt/src/importjob.cpp b/lang/qt/src/importjob.cpp index ea896cad..f0ec63ca 100644 --- a/lang/qt/src/importjob.cpp +++ b/lang/qt/src/importjob.cpp @@ -38,7 +38,7 @@ #include "importjob.h" #include "importjob_p.h" -#include +#include using namespace GpgME; using namespace QGpgME; diff --git a/lang/qt/src/importjob.h b/lang/qt/src/importjob.h index 8308ca0e..e92f7415 100644 --- a/lang/qt/src/importjob.h +++ b/lang/qt/src/importjob.h @@ -40,11 +40,7 @@ #include "abstractimportjob.h" #include "qgpgme_export.h" -#ifdef BUILDING_QGPGME -# include -#else -# include -#endif +#include namespace GpgME { diff --git a/lang/qt/src/importjob_p.h b/lang/qt/src/importjob_p.h index dc3488cf..7ee8f914 100644 --- a/lang/qt/src/importjob_p.h +++ b/lang/qt/src/importjob_p.h @@ -36,7 +36,7 @@ #include "job_p.h" -#include +#include namespace QGpgME { diff --git a/lang/qt/src/job.h b/lang/qt/src/job.h index b5a6bcf4..56da33d7 100644 --- a/lang/qt/src/job.h +++ b/lang/qt/src/job.h @@ -41,11 +41,7 @@ #include #include -#ifdef BUILDING_QGPGME -# include "error.h" -#else -# include -#endif +#include class QWidget; diff --git a/lang/qt/src/keyformailboxjob.h b/lang/qt/src/keyformailboxjob.h index 5e089074..33027c0c 100644 --- a/lang/qt/src/keyformailboxjob.h +++ b/lang/qt/src/keyformailboxjob.h @@ -37,11 +37,7 @@ #include "job.h" -#ifdef BUILDING_QGPGME -# include "key.h" -#else -# include -#endif +#include namespace GpgME { diff --git a/lang/qt/src/keylistjob.h b/lang/qt/src/keylistjob.h index ace9fbe0..7a4bd712 100644 --- a/lang/qt/src/keylistjob.h +++ b/lang/qt/src/keylistjob.h @@ -38,11 +38,7 @@ #include "job.h" #include "qgpgme_export.h" -#ifdef BUILDING_QGPGME -# include "key.h" -#else -# include -#endif +#include #include diff --git a/lang/qt/src/listallkeysjob.h b/lang/qt/src/listallkeysjob.h index 561293ca..fa2f53a9 100644 --- a/lang/qt/src/listallkeysjob.h +++ b/lang/qt/src/listallkeysjob.h @@ -40,11 +40,7 @@ #include "job.h" #include "qgpgme_export.h" -#ifdef BUILDING_QGPGME -# include "key.h" -#else -# include -#endif +#include #include diff --git a/lang/qt/src/multideletejob.cpp b/lang/qt/src/multideletejob.cpp index d660a931..1c1e15d0 100644 --- a/lang/qt/src/multideletejob.cpp +++ b/lang/qt/src/multideletejob.cpp @@ -38,9 +38,9 @@ #include "protocol.h" #include "deletejob.h" -#include -#include -#include +#include +#include +#include #include diff --git a/lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp b/lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp index dc0d0f01..7750d36b 100644 --- a/lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp +++ b/lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp @@ -41,10 +41,10 @@ #include -#include "context.h" -#include "data.h" -#include "gpgaddexistingsubkeyeditinteractor.h" -#include "key.h" +#include +#include +#include +#include #include diff --git a/lang/qt/src/qgpgmeadduseridjob.cpp b/lang/qt/src/qgpgmeadduseridjob.cpp index 94894fc2..3dec6581 100644 --- a/lang/qt/src/qgpgmeadduseridjob.cpp +++ b/lang/qt/src/qgpgmeadduseridjob.cpp @@ -40,10 +40,10 @@ #include "dataprovider.h" -#include "context.h" -#include "data.h" -#include "gpgadduserideditinteractor.h" -#include "key.h" +#include +#include +#include +#include #include #include diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/qgpgmebackend.cpp index aa96db0d..9cd34006 100644 --- a/lang/qt/src/qgpgmebackend.cpp +++ b/lang/qt/src/qgpgmebackend.cpp @@ -40,8 +40,8 @@ #include "qgpgmegpgcardjob.h" -#include "error.h" -#include "engineinfo.h" +#include +#include #include "protocol_p.h" diff --git a/lang/qt/src/qgpgmechangeexpiryjob.cpp b/lang/qt/src/qgpgmechangeexpiryjob.cpp index c6cb3f85..7f98a943 100644 --- a/lang/qt/src/qgpgmechangeexpiryjob.cpp +++ b/lang/qt/src/qgpgmechangeexpiryjob.cpp @@ -42,8 +42,8 @@ #include "changeexpiryjob_p.h" -#include "context.h" -#include "key.h" +#include +#include #include diff --git a/lang/qt/src/qgpgmechangeownertrustjob.cpp b/lang/qt/src/qgpgmechangeownertrustjob.cpp index 0c67e98a..07febab6 100644 --- a/lang/qt/src/qgpgmechangeownertrustjob.cpp +++ b/lang/qt/src/qgpgmechangeownertrustjob.cpp @@ -40,10 +40,10 @@ #include "dataprovider.h" -#include "context.h" -#include "data.h" -#include "gpgsetownertrusteditinteractor.h" -#include "key.h" +#include +#include +#include +#include #include #include diff --git a/lang/qt/src/qgpgmechangepasswdjob.cpp b/lang/qt/src/qgpgmechangepasswdjob.cpp index 3465c6fa..0607b6d3 100644 --- a/lang/qt/src/qgpgmechangepasswdjob.cpp +++ b/lang/qt/src/qgpgmechangepasswdjob.cpp @@ -40,9 +40,9 @@ #include "dataprovider.h" -#include "context.h" -#include "data.h" -#include "key.h" +#include +#include +#include #include #include diff --git a/lang/qt/src/qgpgmedecryptjob.cpp b/lang/qt/src/qgpgmedecryptjob.cpp index 6d7d4f17..95240a49 100644 --- a/lang/qt/src/qgpgmedecryptjob.cpp +++ b/lang/qt/src/qgpgmedecryptjob.cpp @@ -40,9 +40,9 @@ #include "dataprovider.h" -#include "context.h" -#include "decryptionresult.h" -#include "data.h" +#include +#include +#include #include diff --git a/lang/qt/src/qgpgmedecryptjob.h b/lang/qt/src/qgpgmedecryptjob.h index 29ac5d44..ae489734 100644 --- a/lang/qt/src/qgpgmedecryptjob.h +++ b/lang/qt/src/qgpgmedecryptjob.h @@ -39,11 +39,7 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "decryptionresult.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp b/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp index 1d642b0f..eda4bfd8 100644 --- a/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp +++ b/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp @@ -45,7 +45,7 @@ #include -#include +#include using namespace QGpgME; using namespace GpgME; diff --git a/lang/qt/src/qgpgmedecryptverifyarchivejob.h b/lang/qt/src/qgpgmedecryptverifyarchivejob.h index b43be070..50ca0839 100644 --- a/lang/qt/src/qgpgmedecryptverifyarchivejob.h +++ b/lang/qt/src/qgpgmedecryptverifyarchivejob.h @@ -38,8 +38,8 @@ #include "threadedjobmixin.h" -#include -#include +#include +#include namespace QGpgME { diff --git a/lang/qt/src/qgpgmedecryptverifyjob.cpp b/lang/qt/src/qgpgmedecryptverifyjob.cpp index 2a28389e..2cd857b6 100644 --- a/lang/qt/src/qgpgmedecryptverifyjob.cpp +++ b/lang/qt/src/qgpgmedecryptverifyjob.cpp @@ -42,10 +42,10 @@ #include "decryptverifyjob_p.h" #include "util.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include "qgpgme_debug.h" diff --git a/lang/qt/src/qgpgmedecryptverifyjob.h b/lang/qt/src/qgpgmedecryptverifyjob.h index 14258ae2..1a1721df 100644 --- a/lang/qt/src/qgpgmedecryptverifyjob.h +++ b/lang/qt/src/qgpgmedecryptverifyjob.h @@ -39,16 +39,8 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "decryptionresult.h" -#else #include -#endif -#ifdef BUILDING_QGPGME -# include "verificationresult.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmedeletejob.cpp b/lang/qt/src/qgpgmedeletejob.cpp index dffcb0cc..16f822b5 100644 --- a/lang/qt/src/qgpgmedeletejob.cpp +++ b/lang/qt/src/qgpgmedeletejob.cpp @@ -38,8 +38,8 @@ #include "qgpgmedeletejob.h" -#include "context.h" -#include "key.h" +#include +#include #include diff --git a/lang/qt/src/qgpgmedownloadjob.cpp b/lang/qt/src/qgpgmedownloadjob.cpp index b5786a12..d7c608f4 100644 --- a/lang/qt/src/qgpgmedownloadjob.cpp +++ b/lang/qt/src/qgpgmedownloadjob.cpp @@ -40,8 +40,8 @@ #include "dataprovider.h" -#include "context.h" -#include "data.h" +#include +#include #include diff --git a/lang/qt/src/qgpgmeencryptarchivejob.cpp b/lang/qt/src/qgpgmeencryptarchivejob.cpp index b3586d80..02b9e587 100644 --- a/lang/qt/src/qgpgmeencryptarchivejob.cpp +++ b/lang/qt/src/qgpgmeencryptarchivejob.cpp @@ -48,7 +48,7 @@ #include -#include +#include using namespace QGpgME; using namespace GpgME; diff --git a/lang/qt/src/qgpgmeencryptarchivejob.h b/lang/qt/src/qgpgmeencryptarchivejob.h index 64c3b18f..6b818f20 100644 --- a/lang/qt/src/qgpgmeencryptarchivejob.h +++ b/lang/qt/src/qgpgmeencryptarchivejob.h @@ -38,7 +38,7 @@ #include "threadedjobmixin.h" -#include +#include namespace QGpgME { diff --git a/lang/qt/src/qgpgmeencryptjob.cpp b/lang/qt/src/qgpgmeencryptjob.cpp index f8c71f6b..c8dd5f1b 100644 --- a/lang/qt/src/qgpgmeencryptjob.cpp +++ b/lang/qt/src/qgpgmeencryptjob.cpp @@ -44,9 +44,9 @@ #include "encryptjob_p.h" #include "util.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/lang/qt/src/qgpgmeencryptjob.h b/lang/qt/src/qgpgmeencryptjob.h index 3b21b40b..4fcb0c69 100644 --- a/lang/qt/src/qgpgmeencryptjob.h +++ b/lang/qt/src/qgpgmeencryptjob.h @@ -39,16 +39,8 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "encryptionresult.h" -#else #include -#endif -#ifdef BUILDING_QGPGME -# include "key.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmeexportjob.cpp b/lang/qt/src/qgpgmeexportjob.cpp index 2daaf567..239b46b0 100644 --- a/lang/qt/src/qgpgmeexportjob.cpp +++ b/lang/qt/src/qgpgmeexportjob.cpp @@ -42,9 +42,9 @@ #include "dataprovider.h" -#include "context.h" -#include "data.h" -#include "key.h" +#include +#include +#include #include diff --git a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp b/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp index f9d47879..e5e06b23 100644 --- a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp +++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp @@ -40,9 +40,9 @@ #include "dataprovider.h" -#include "context.h" -#include "data.h" -#include "key.h" +#include +#include +#include #include diff --git a/lang/qt/src/qgpgmeimportfromkeyserverjob.h b/lang/qt/src/qgpgmeimportfromkeyserverjob.h index b67ea29c..917863ed 100644 --- a/lang/qt/src/qgpgmeimportfromkeyserverjob.h +++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.h @@ -39,11 +39,7 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "importresult.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmeimportjob.cpp b/lang/qt/src/qgpgmeimportjob.cpp index 650f0ade..7c33288d 100644 --- a/lang/qt/src/qgpgmeimportjob.cpp +++ b/lang/qt/src/qgpgmeimportjob.cpp @@ -44,9 +44,9 @@ #include "dataprovider.h" -#include -#include -#include +#include +#include +#include using namespace QGpgME; using namespace GpgME; diff --git a/lang/qt/src/qgpgmeimportjob.h b/lang/qt/src/qgpgmeimportjob.h index 130d29ce..d36fc359 100644 --- a/lang/qt/src/qgpgmeimportjob.h +++ b/lang/qt/src/qgpgmeimportjob.h @@ -41,11 +41,7 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "importresult.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmekeyformailboxjob.h b/lang/qt/src/qgpgmekeyformailboxjob.h index 8c26691a..0e8cc1dc 100644 --- a/lang/qt/src/qgpgmekeyformailboxjob.h +++ b/lang/qt/src/qgpgmekeyformailboxjob.h @@ -39,13 +39,8 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "keylistresult.h" -# include "key.h" -#else -# include -# include -#endif +#include +#include namespace QGpgME { diff --git a/lang/qt/src/qgpgmekeygenerationjob.cpp b/lang/qt/src/qgpgmekeygenerationjob.cpp index 7cf4c8c5..ce0b4d40 100644 --- a/lang/qt/src/qgpgmekeygenerationjob.cpp +++ b/lang/qt/src/qgpgmekeygenerationjob.cpp @@ -40,8 +40,8 @@ #include "dataprovider.h" -#include "context.h" -#include "data.h" +#include +#include #include diff --git a/lang/qt/src/qgpgmekeygenerationjob.h b/lang/qt/src/qgpgmekeygenerationjob.h index 31ee003f..35d5c2f4 100644 --- a/lang/qt/src/qgpgmekeygenerationjob.h +++ b/lang/qt/src/qgpgmekeygenerationjob.h @@ -39,11 +39,7 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "keygenerationresult.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmekeylistjob.cpp b/lang/qt/src/qgpgmekeylistjob.cpp index d3d13119..633cff5b 100644 --- a/lang/qt/src/qgpgmekeylistjob.cpp +++ b/lang/qt/src/qgpgmekeylistjob.cpp @@ -38,9 +38,9 @@ #include "qgpgmekeylistjob.h" -#include "key.h" -#include "context.h" -#include "keylistresult.h" +#include +#include +#include #include #include diff --git a/lang/qt/src/qgpgmekeylistjob.h b/lang/qt/src/qgpgmekeylistjob.h index eb25afaf..c1199768 100644 --- a/lang/qt/src/qgpgmekeylistjob.h +++ b/lang/qt/src/qgpgmekeylistjob.h @@ -39,16 +39,8 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "keylistresult.h" -#else #include -#endif -#ifdef BUILDING_QGPGME -# include "key.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmelistallkeysjob.cpp b/lang/qt/src/qgpgmelistallkeysjob.cpp index cac09233..ab9f1f42 100644 --- a/lang/qt/src/qgpgmelistallkeysjob.cpp +++ b/lang/qt/src/qgpgmelistallkeysjob.cpp @@ -43,11 +43,11 @@ #include "listallkeysjob_p.h" #include "debug.h" -#include "key.h" -#include "context.h" -#include "engineinfo.h" -#include "global.h" -#include "keylistresult.h" +#include +#include +#include +#include +#include #include "qgpgme_debug.h" #include diff --git a/lang/qt/src/qgpgmelistallkeysjob.h b/lang/qt/src/qgpgmelistallkeysjob.h index 8234a27f..93686a4b 100644 --- a/lang/qt/src/qgpgmelistallkeysjob.h +++ b/lang/qt/src/qgpgmelistallkeysjob.h @@ -39,16 +39,8 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "keylistresult.h" -#else #include -#endif -#ifdef BUILDING_QGPGME -# include "key.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp index 15d50b4a..0615776b 100644 --- a/lang/qt/src/qgpgmenewcryptoconfig.cpp +++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp @@ -45,8 +45,8 @@ #include #include -#include "global.h" -#include "error.h" +#include +#include #include "debug.h" #include diff --git a/lang/qt/src/qgpgmenewcryptoconfig.h b/lang/qt/src/qgpgmenewcryptoconfig.h index 7bdf5d3a..05726e37 100644 --- a/lang/qt/src/qgpgmenewcryptoconfig.h +++ b/lang/qt/src/qgpgmenewcryptoconfig.h @@ -42,12 +42,7 @@ #include #include -#ifdef BUILDING_QGPGME -# include "configuration.h" -#else -# include -#endif - +#include #include #include diff --git a/lang/qt/src/qgpgmequickjob.cpp b/lang/qt/src/qgpgmequickjob.cpp index 1c6023a4..8da1f9a0 100644 --- a/lang/qt/src/qgpgmequickjob.cpp +++ b/lang/qt/src/qgpgmequickjob.cpp @@ -37,8 +37,9 @@ #include "qgpgmequickjob.h" -#include "context.h" -#include "key.h" +#include +#include + #include "util.h" using namespace QGpgME; diff --git a/lang/qt/src/qgpgmereceivekeysjob.h b/lang/qt/src/qgpgmereceivekeysjob.h index 51ceefa0..4c6a24be 100644 --- a/lang/qt/src/qgpgmereceivekeysjob.h +++ b/lang/qt/src/qgpgmereceivekeysjob.h @@ -38,11 +38,7 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "importresult.h" -#else -# include -#endif +#include namespace QGpgME { diff --git a/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp b/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp index cff115ec..730cef80 100644 --- a/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp +++ b/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp @@ -44,8 +44,8 @@ #include #include "qgpgme_debug.h" -#include "context.h" -#include +#include +#include #include #include diff --git a/lang/qt/src/qgpgmerefreshsmimekeysjob.h b/lang/qt/src/qgpgmerefreshsmimekeysjob.h index b75bb0e2..f2324581 100644 --- a/lang/qt/src/qgpgmerefreshsmimekeysjob.h +++ b/lang/qt/src/qgpgmerefreshsmimekeysjob.h @@ -36,11 +36,8 @@ #define __QGPGME_QGPGMEREFRESHSMIMEKEYSJOB_H__ #include "refreshkeysjob.h" -#ifdef BUILDING_QGPGME -# include "context.h" -#else -#include "gpgme++/context.h" -#endif + +#include #include #include diff --git a/lang/qt/src/qgpgmerevokekeyjob.cpp b/lang/qt/src/qgpgmerevokekeyjob.cpp index 9875b3d3..bf51144d 100644 --- a/lang/qt/src/qgpgmerevokekeyjob.cpp +++ b/lang/qt/src/qgpgmerevokekeyjob.cpp @@ -39,10 +39,10 @@ #include "dataprovider.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/lang/qt/src/qgpgmesetprimaryuseridjob.cpp b/lang/qt/src/qgpgmesetprimaryuseridjob.cpp index 32da1fc2..a7d603d5 100644 --- a/lang/qt/src/qgpgmesetprimaryuseridjob.cpp +++ b/lang/qt/src/qgpgmesetprimaryuseridjob.cpp @@ -39,7 +39,7 @@ #include "util.h" -#include +#include using namespace QGpgME; using namespace GpgME; diff --git a/lang/qt/src/qgpgmesignarchivejob.cpp b/lang/qt/src/qgpgmesignarchivejob.cpp index 4a0e1f7f..4d257284 100644 --- a/lang/qt/src/qgpgmesignarchivejob.cpp +++ b/lang/qt/src/qgpgmesignarchivejob.cpp @@ -48,7 +48,7 @@ #include -#include +#include using namespace QGpgME; using namespace GpgME; diff --git a/lang/qt/src/qgpgmesignarchivejob.h b/lang/qt/src/qgpgmesignarchivejob.h index 2618e39a..5755a91c 100644 --- a/lang/qt/src/qgpgmesignarchivejob.h +++ b/lang/qt/src/qgpgmesignarchivejob.h @@ -38,7 +38,7 @@ #include "threadedjobmixin.h" -#include +#include namespace QGpgME { diff --git a/lang/qt/src/qgpgmesignencryptarchivejob.cpp b/lang/qt/src/qgpgmesignencryptarchivejob.cpp index c156bcba..c3e23b43 100644 --- a/lang/qt/src/qgpgmesignencryptarchivejob.cpp +++ b/lang/qt/src/qgpgmesignencryptarchivejob.cpp @@ -48,7 +48,7 @@ #include -#include +#include using namespace QGpgME; using namespace GpgME; diff --git a/lang/qt/src/qgpgmesignencryptarchivejob.h b/lang/qt/src/qgpgmesignencryptarchivejob.h index 80e6da4f..2675b28a 100644 --- a/lang/qt/src/qgpgmesignencryptarchivejob.h +++ b/lang/qt/src/qgpgmesignencryptarchivejob.h @@ -38,8 +38,8 @@ #include "threadedjobmixin.h" -#include -#include +#include +#include namespace QGpgME { diff --git a/lang/qt/src/qgpgmesignencryptjob.cpp b/lang/qt/src/qgpgmesignencryptjob.cpp index 8b919d86..8634d91d 100644 --- a/lang/qt/src/qgpgmesignencryptjob.cpp +++ b/lang/qt/src/qgpgmesignencryptjob.cpp @@ -44,10 +44,10 @@ #include "signencryptjob_p.h" #include "util.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/lang/qt/src/qgpgmesignencryptjob.h b/lang/qt/src/qgpgmesignencryptjob.h index 0d24c120..a0014d2b 100644 --- a/lang/qt/src/qgpgmesignencryptjob.h +++ b/lang/qt/src/qgpgmesignencryptjob.h @@ -39,21 +39,9 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "signingresult.h" -#else #include -#endif -#ifdef BUILDING_QGPGME -# include "encryptionresult.h" -#else #include -#endif -#ifdef BUILDING_QGPGME -# include "key.h" -#else #include -#endif #include diff --git a/lang/qt/src/qgpgmesignjob.cpp b/lang/qt/src/qgpgmesignjob.cpp index 7ad71767..79077f4a 100644 --- a/lang/qt/src/qgpgmesignjob.cpp +++ b/lang/qt/src/qgpgmesignjob.cpp @@ -42,9 +42,9 @@ #include "signjob_p.h" #include "util.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/lang/qt/src/qgpgmesignjob.h b/lang/qt/src/qgpgmesignjob.h index 59977dba..27d352d0 100644 --- a/lang/qt/src/qgpgmesignjob.h +++ b/lang/qt/src/qgpgmesignjob.h @@ -39,16 +39,8 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "signingresult.h" -#else #include -#endif -#ifdef BUILDING_QGPGME -# include "key.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmesignkeyjob.cpp b/lang/qt/src/qgpgmesignkeyjob.cpp index 1693a5be..0fdab165 100644 --- a/lang/qt/src/qgpgmesignkeyjob.cpp +++ b/lang/qt/src/qgpgmesignkeyjob.cpp @@ -43,9 +43,9 @@ #include "dataprovider.h" -#include "context.h" -#include "data.h" -#include "gpgsignkeyeditinteractor.h" +#include +#include +#include #include "qgpgme_debug.h" diff --git a/lang/qt/src/qgpgmetofupolicyjob.cpp b/lang/qt/src/qgpgmetofupolicyjob.cpp index 91283a8b..f5d43fa1 100644 --- a/lang/qt/src/qgpgmetofupolicyjob.cpp +++ b/lang/qt/src/qgpgmetofupolicyjob.cpp @@ -35,9 +35,9 @@ #include "qgpgmetofupolicyjob.h" -#include "context.h" -#include "key.h" -#include "tofuinfo.h" +#include +#include +#include using namespace QGpgME; diff --git a/lang/qt/src/qgpgmeverifydetachedjob.cpp b/lang/qt/src/qgpgmeverifydetachedjob.cpp index 467b94f3..1f6e47cd 100644 --- a/lang/qt/src/qgpgmeverifydetachedjob.cpp +++ b/lang/qt/src/qgpgmeverifydetachedjob.cpp @@ -44,9 +44,9 @@ #include -#include -#include -#include +#include +#include +#include #include diff --git a/lang/qt/src/qgpgmeverifydetachedjob.h b/lang/qt/src/qgpgmeverifydetachedjob.h index ec23eccc..36350254 100644 --- a/lang/qt/src/qgpgmeverifydetachedjob.h +++ b/lang/qt/src/qgpgmeverifydetachedjob.h @@ -39,11 +39,7 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "verificationresult.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmeverifyopaquejob.cpp b/lang/qt/src/qgpgmeverifyopaquejob.cpp index a3a022de..19e61e37 100644 --- a/lang/qt/src/qgpgmeverifyopaquejob.cpp +++ b/lang/qt/src/qgpgmeverifyopaquejob.cpp @@ -42,9 +42,9 @@ #include "util.h" #include "verifyopaquejob_p.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/lang/qt/src/qgpgmeverifyopaquejob.h b/lang/qt/src/qgpgmeverifyopaquejob.h index 27464c6b..b46de8f8 100644 --- a/lang/qt/src/qgpgmeverifyopaquejob.h +++ b/lang/qt/src/qgpgmeverifyopaquejob.h @@ -39,11 +39,7 @@ #include "threadedjobmixin.h" -#ifdef BUILDING_QGPGME -# include "verificationresult.h" -#else #include -#endif namespace QGpgME { diff --git a/lang/qt/src/qgpgmewkdlookupjob.cpp b/lang/qt/src/qgpgmewkdlookupjob.cpp index 3917d272..25f0a2bf 100644 --- a/lang/qt/src/qgpgmewkdlookupjob.cpp +++ b/lang/qt/src/qgpgmewkdlookupjob.cpp @@ -39,9 +39,9 @@ #include "qgpgme_debug.h" -#include -#include -#include +#include +#include +#include #include diff --git a/lang/qt/src/qgpgmewkdrefreshjob.cpp b/lang/qt/src/qgpgmewkdrefreshjob.cpp index f590ed4b..264d9f21 100644 --- a/lang/qt/src/qgpgmewkdrefreshjob.cpp +++ b/lang/qt/src/qgpgmewkdrefreshjob.cpp @@ -42,7 +42,7 @@ #include "qgpgmekeylistjob.h" #include "wkdrefreshjob_p.h" -#include +#include #include diff --git a/lang/qt/src/qgpgmewkdrefreshjob.h b/lang/qt/src/qgpgmewkdrefreshjob.h index 1b775aed..2a242d65 100644 --- a/lang/qt/src/qgpgmewkdrefreshjob.h +++ b/lang/qt/src/qgpgmewkdrefreshjob.h @@ -37,7 +37,7 @@ #include "threadedjobmixin.h" #include "wkdrefreshjob.h" -#include +#include namespace QGpgME { diff --git a/lang/qt/src/qgpgmewkspublishjob.cpp b/lang/qt/src/qgpgmewkspublishjob.cpp index 3d00631d..74cf25cc 100644 --- a/lang/qt/src/qgpgmewkspublishjob.cpp +++ b/lang/qt/src/qgpgmewkspublishjob.cpp @@ -35,8 +35,9 @@ #include "qgpgmewkspublishjob.h" -#include "context.h" -#include "key.h" +#include +#include + #include "util.h" #include diff --git a/lang/qt/src/quickjob.h b/lang/qt/src/quickjob.h index 2d159bbe..049438d6 100644 --- a/lang/qt/src/quickjob.h +++ b/lang/qt/src/quickjob.h @@ -39,11 +39,7 @@ #include -#ifdef BUILDING_QGPGME -# include "key.h" -#else -# include -#endif +#include class QString; diff --git a/lang/qt/src/signarchivejob.cpp b/lang/qt/src/signarchivejob.cpp index 411dbc57..0d898b25 100644 --- a/lang/qt/src/signarchivejob.cpp +++ b/lang/qt/src/signarchivejob.cpp @@ -38,7 +38,7 @@ #include "signarchivejob.h" #include "signarchivejob_p.h" -#include +#include using namespace QGpgME; diff --git a/lang/qt/src/signarchivejob.h b/lang/qt/src/signarchivejob.h index 7d1f6513..0b4cdeb4 100644 --- a/lang/qt/src/signarchivejob.h +++ b/lang/qt/src/signarchivejob.h @@ -36,11 +36,7 @@ #include "job.h" -#ifdef BUILDING_QGPGME -# include "context.h" -#else -# include -#endif +#include namespace GpgME { diff --git a/lang/qt/src/signencryptarchivejob.cpp b/lang/qt/src/signencryptarchivejob.cpp index 429b6bf1..114d6f33 100644 --- a/lang/qt/src/signencryptarchivejob.cpp +++ b/lang/qt/src/signencryptarchivejob.cpp @@ -38,7 +38,7 @@ #include "signencryptarchivejob.h" #include "signencryptarchivejob_p.h" -#include +#include using namespace QGpgME; diff --git a/lang/qt/src/signencryptarchivejob.h b/lang/qt/src/signencryptarchivejob.h index fddf3012..c8742aec 100644 --- a/lang/qt/src/signencryptarchivejob.h +++ b/lang/qt/src/signencryptarchivejob.h @@ -36,11 +36,7 @@ #include "job.h" -#ifdef BUILDING_QGPGME -# include "context.h" -#else -# include -#endif +#include namespace GpgME { diff --git a/lang/qt/src/signencryptjob.h b/lang/qt/src/signencryptjob.h index 54f4aa53..73b8c227 100644 --- a/lang/qt/src/signencryptjob.h +++ b/lang/qt/src/signencryptjob.h @@ -40,13 +40,8 @@ #include "job.h" #include "qgpgme_export.h" -#ifdef BUILDING_QGPGME -# include "global.h" -# include "context.h" -#else -# include -# include -#endif +#include +#include #include #include diff --git a/lang/qt/src/signencryptjob_p.h b/lang/qt/src/signencryptjob_p.h index 600d752b..8f5c91ec 100644 --- a/lang/qt/src/signencryptjob_p.h +++ b/lang/qt/src/signencryptjob_p.h @@ -36,7 +36,7 @@ #include "job_p.h" -#include +#include namespace QGpgME { diff --git a/lang/qt/src/signjob.h b/lang/qt/src/signjob.h index 085f8498..be29f4d8 100644 --- a/lang/qt/src/signjob.h +++ b/lang/qt/src/signjob.h @@ -37,12 +37,7 @@ #include "job.h" -#ifdef BUILDING_QGPGME -# include "global.h" -#else -# include -#endif - +#include #include #include diff --git a/lang/qt/src/signjob_p.h b/lang/qt/src/signjob_p.h index e1eae6b8..ec974332 100644 --- a/lang/qt/src/signjob_p.h +++ b/lang/qt/src/signjob_p.h @@ -36,7 +36,7 @@ #include "job_p.h" -#include +#include namespace QGpgME { diff --git a/lang/qt/src/threadedjobmixin.cpp b/lang/qt/src/threadedjobmixin.cpp index a1438a7f..c6372c0d 100644 --- a/lang/qt/src/threadedjobmixin.cpp +++ b/lang/qt/src/threadedjobmixin.cpp @@ -40,7 +40,7 @@ #include "dataprovider.h" -#include "data.h" +#include #include #include diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h index ad07e121..7a18aa4d 100644 --- a/lang/qt/src/threadedjobmixin.h +++ b/lang/qt/src/threadedjobmixin.h @@ -41,13 +41,8 @@ #include #include -#ifdef BUILDING_QGPGME -# include "context.h" -# include "interfaces/progressprovider.h" -#else -# include -# include -#endif +#include +#include #include "job.h" diff --git a/lang/qt/src/tofupolicyjob.h b/lang/qt/src/tofupolicyjob.h index b3a79c5f..90debaef 100644 --- a/lang/qt/src/tofupolicyjob.h +++ b/lang/qt/src/tofupolicyjob.h @@ -35,11 +35,7 @@ #include "qgpgme_export.h" -#ifdef BUILDING_QGPGME -# include "tofuinfo.h" -#else -# include -#endif +#include namespace GpgME { diff --git a/lang/qt/src/util.cpp b/lang/qt/src/util.cpp index 4b437ffb..51ae9589 100644 --- a/lang/qt/src/util.cpp +++ b/lang/qt/src/util.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/lang/qt/src/wkdlookupresult.cpp b/lang/qt/src/wkdlookupresult.cpp index c44b7370..ac1a89e9 100644 --- a/lang/qt/src/wkdlookupresult.cpp +++ b/lang/qt/src/wkdlookupresult.cpp @@ -37,7 +37,7 @@ #include "wkdlookupresult.h" -#include +#include using namespace QGpgME; using namespace GpgME; diff --git a/lang/qt/src/wkdlookupresult.h b/lang/qt/src/wkdlookupresult.h index 1e91d055..5696fb6d 100644 --- a/lang/qt/src/wkdlookupresult.h +++ b/lang/qt/src/wkdlookupresult.h @@ -36,11 +36,7 @@ #include "qgpgme_export.h" -#ifdef BUILDING_QGPGME -# include -#else -# include -#endif +#include #include diff --git a/lang/qt/src/wkdrefreshjob_p.h b/lang/qt/src/wkdrefreshjob_p.h index 60fdfedd..8e729936 100644 --- a/lang/qt/src/wkdrefreshjob_p.h +++ b/lang/qt/src/wkdrefreshjob_p.h @@ -36,7 +36,7 @@ #include "job_p.h" -#include +#include namespace QGpgME { diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am index 878e32bd..2072e049 100644 --- a/lang/qt/tests/Makefile.am +++ b/lang/qt/tests/Makefile.am @@ -52,7 +52,7 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \ ../../../src/libgpgme.la @GPGME_QT5_LIBS@ @GPG_ERROR_LIBS@ \ @GPGME_QT5TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++ -AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \ +AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_builddir)/lang/cpp/src \ -I$(top_builddir)/src \ @GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \ @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ -DBUILDING_QGPGME \ @@ -63,7 +63,7 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgmeqt6.la \ ../../../src/libgpgme.la @GPGME_QT6_LIBS@ @GPG_ERROR_LIBS@ \ @GPGME_QT6TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++ -AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \ +AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_builddir)/lang/cpp/src \ -I$(top_builddir)/src \ @GPG_ERROR_CFLAGS@ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ \ @LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ -DBUILDING_QGPGME \ diff --git a/lang/qt/tests/run-decryptverifyarchivejob.cpp b/lang/qt/tests/run-decryptverifyarchivejob.cpp index 59073458..38cf6b86 100644 --- a/lang/qt/tests/run-decryptverifyarchivejob.cpp +++ b/lang/qt/tests/run-decryptverifyarchivejob.cpp @@ -41,9 +41,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/lang/qt/tests/run-decryptverifyjob.cpp b/lang/qt/tests/run-decryptverifyjob.cpp index 2ddfb1ae..4d2e947c 100644 --- a/lang/qt/tests/run-decryptverifyjob.cpp +++ b/lang/qt/tests/run-decryptverifyjob.cpp @@ -43,9 +43,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/lang/qt/tests/run-encryptarchivejob.cpp b/lang/qt/tests/run-encryptarchivejob.cpp index c1d617fb..2d9c09a3 100644 --- a/lang/qt/tests/run-encryptarchivejob.cpp +++ b/lang/qt/tests/run-encryptarchivejob.cpp @@ -46,9 +46,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/lang/qt/tests/run-encryptjob.cpp b/lang/qt/tests/run-encryptjob.cpp index c3d6c9ee..47e6e248 100644 --- a/lang/qt/tests/run-encryptjob.cpp +++ b/lang/qt/tests/run-encryptjob.cpp @@ -44,9 +44,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/lang/qt/tests/run-exportjob.cpp b/lang/qt/tests/run-exportjob.cpp index 40072c85..6cb43c22 100644 --- a/lang/qt/tests/run-exportjob.cpp +++ b/lang/qt/tests/run-exportjob.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include diff --git a/lang/qt/tests/run-importjob.cpp b/lang/qt/tests/run-importjob.cpp index 0ae92b09..a0b9ffc1 100644 --- a/lang/qt/tests/run-importjob.cpp +++ b/lang/qt/tests/run-importjob.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include diff --git a/lang/qt/tests/run-keyformailboxjob.cpp b/lang/qt/tests/run-keyformailboxjob.cpp index dc3f9671..8ec0c5b3 100644 --- a/lang/qt/tests/run-keyformailboxjob.cpp +++ b/lang/qt/tests/run-keyformailboxjob.cpp @@ -38,8 +38,8 @@ #include "keylistjob.h" #include "protocol.h" -#include "key.h" -#include "keylistresult.h" +#include +#include #include diff --git a/lang/qt/tests/run-receivekeysjob.cpp b/lang/qt/tests/run-receivekeysjob.cpp index 0dc1575b..6bfe047f 100644 --- a/lang/qt/tests/run-receivekeysjob.cpp +++ b/lang/qt/tests/run-receivekeysjob.cpp @@ -34,7 +34,7 @@ #include "config.h" #endif -#include +#include #include #include diff --git a/lang/qt/tests/run-refreshkeysjob.cpp b/lang/qt/tests/run-refreshkeysjob.cpp index 940c0c77..e2bf7d1f 100644 --- a/lang/qt/tests/run-refreshkeysjob.cpp +++ b/lang/qt/tests/run-refreshkeysjob.cpp @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/lang/qt/tests/run-signarchivejob.cpp b/lang/qt/tests/run-signarchivejob.cpp index c7e1fee7..c832372a 100644 --- a/lang/qt/tests/run-signarchivejob.cpp +++ b/lang/qt/tests/run-signarchivejob.cpp @@ -45,8 +45,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/lang/qt/tests/run-signjob.cpp b/lang/qt/tests/run-signjob.cpp index c1342b66..a85c6034 100644 --- a/lang/qt/tests/run-signjob.cpp +++ b/lang/qt/tests/run-signjob.cpp @@ -43,8 +43,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/lang/qt/tests/run-verifydetachedjob.cpp b/lang/qt/tests/run-verifydetachedjob.cpp index 6ee21109..65274383 100644 --- a/lang/qt/tests/run-verifydetachedjob.cpp +++ b/lang/qt/tests/run-verifydetachedjob.cpp @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/lang/qt/tests/run-verifyopaquejob.cpp b/lang/qt/tests/run-verifyopaquejob.cpp index 37466bd3..080c988c 100644 --- a/lang/qt/tests/run-verifyopaquejob.cpp +++ b/lang/qt/tests/run-verifyopaquejob.cpp @@ -43,8 +43,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/lang/qt/tests/run-wkdrefreshjob.cpp b/lang/qt/tests/run-wkdrefreshjob.cpp index c75718e6..85110b0d 100644 --- a/lang/qt/tests/run-wkdrefreshjob.cpp +++ b/lang/qt/tests/run-wkdrefreshjob.cpp @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp index c0eee57b..df620ddb 100644 --- a/lang/qt/tests/t-addexistingsubkey.cpp +++ b/lang/qt/tests/t-addexistingsubkey.cpp @@ -41,9 +41,9 @@ #include #include -#include "context.h" -#include "data.h" -#include "engineinfo.h" +#include +#include +#include #include diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp index 3da74d46..54a54aeb 100644 --- a/lang/qt/tests/t-changeexpiryjob.cpp +++ b/lang/qt/tests/t-changeexpiryjob.cpp @@ -37,8 +37,8 @@ #include "t-support.h" #include "changeexpiryjob.h" -#include "context.h" -#include "engineinfo.h" +#include +#include #include "protocol.h" #include diff --git a/lang/qt/tests/t-config.cpp b/lang/qt/tests/t-config.cpp index b84dbfd4..2f73b9a6 100644 --- a/lang/qt/tests/t-config.cpp +++ b/lang/qt/tests/t-config.cpp @@ -39,7 +39,7 @@ #include "t-support.h" #include "protocol.h" #include "cryptoconfig.h" -#include "engineinfo.h" +#include #include diff --git a/lang/qt/tests/t-decryptverify.cpp b/lang/qt/tests/t-decryptverify.cpp index 5522a604..9df10933 100644 --- a/lang/qt/tests/t-decryptverify.cpp +++ b/lang/qt/tests/t-decryptverify.cpp @@ -43,9 +43,9 @@ #include #include -#include -#include -#include +#include +#include +#include using namespace QGpgME; using namespace GpgME; diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp index 35b9bbf9..aac49a4b 100644 --- a/lang/qt/tests/t-encrypt.cpp +++ b/lang/qt/tests/t-encrypt.cpp @@ -41,14 +41,14 @@ #include "keylistjob.h" #include "encryptjob.h" #include "signencryptjob.h" -#include "signingresult.h" +#include #include "encryptjob.h" -#include "encryptionresult.h" -#include "decryptionresult.h" +#include +#include #include "decryptjob.h" #include "qgpgmebackend.h" -#include "keylistresult.h" -#include "engineinfo.h" +#include +#include #include "verifyopaquejob.h" #include "t-support.h" diff --git a/lang/qt/tests/t-import.cpp b/lang/qt/tests/t-import.cpp index 1c0040c9..be17a03c 100644 --- a/lang/qt/tests/t-import.cpp +++ b/lang/qt/tests/t-import.cpp @@ -36,12 +36,12 @@ #include "t-support.h" -#include "context.h" -#include "engineinfo.h" +#include +#include #include "protocol.h" #include "importjob.h" -#include +#include #include #include diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp index 80781d2f..75bc4120 100644 --- a/lang/qt/tests/t-keylist.cpp +++ b/lang/qt/tests/t-keylist.cpp @@ -41,10 +41,10 @@ #include "keylistjob.h" #include "listallkeysjob.h" #include "qgpgmebackend.h" -#include "keylistresult.h" +#include -#include "context.h" -#include "engineinfo.h" +#include +#include #include diff --git a/lang/qt/tests/t-keylocate.cpp b/lang/qt/tests/t-keylocate.cpp index d3143da2..88062f50 100644 --- a/lang/qt/tests/t-keylocate.cpp +++ b/lang/qt/tests/t-keylocate.cpp @@ -39,8 +39,8 @@ #include #include "keylistjob.h" #include "protocol.h" -#include "keylistresult.h" -#include "engineinfo.h" +#include +#include #include "t-support.h" diff --git a/lang/qt/tests/t-ownertrust.cpp b/lang/qt/tests/t-ownertrust.cpp index 31d22479..bb2df08a 100644 --- a/lang/qt/tests/t-ownertrust.cpp +++ b/lang/qt/tests/t-ownertrust.cpp @@ -39,7 +39,7 @@ #include #include "keylistjob.h" #include "protocol.h" -#include "keylistresult.h" +#include #include "changeownertrustjob.h" #include "t-support.h" diff --git a/lang/qt/tests/t-remarks.cpp b/lang/qt/tests/t-remarks.cpp index f8aebd31..86a5f6a5 100644 --- a/lang/qt/tests/t-remarks.cpp +++ b/lang/qt/tests/t-remarks.cpp @@ -42,8 +42,8 @@ #include "keylistjob.h" #include "protocol.h" #include "signkeyjob.h" -#include "context.h" -#include "engineinfo.h" +#include +#include #include "t-support.h" diff --git a/lang/qt/tests/t-revokekey.cpp b/lang/qt/tests/t-revokekey.cpp index 83d5e717..4d8b0ca5 100644 --- a/lang/qt/tests/t-revokekey.cpp +++ b/lang/qt/tests/t-revokekey.cpp @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/lang/qt/tests/t-setprimaryuserid.cpp b/lang/qt/tests/t-setprimaryuserid.cpp index c1bd1069..e57d1c6e 100644 --- a/lang/qt/tests/t-setprimaryuserid.cpp +++ b/lang/qt/tests/t-setprimaryuserid.cpp @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include +#include using namespace QGpgME; using namespace GpgME; diff --git a/lang/qt/tests/t-support.cpp b/lang/qt/tests/t-support.cpp index 6db082fd..48ad0cd9 100644 --- a/lang/qt/tests/t-support.cpp +++ b/lang/qt/tests/t-support.cpp @@ -48,9 +48,9 @@ #include #include -#include "context.h" -#include "engineinfo.h" -#include "importresult.h" +#include +#include +#include using namespace GpgME; using namespace QGpgME; diff --git a/lang/qt/tests/t-support.h b/lang/qt/tests/t-support.h index fd7be44a..eb4ba57d 100644 --- a/lang/qt/tests/t-support.h +++ b/lang/qt/tests/t-support.h @@ -32,7 +32,7 @@ #ifndef T_SUPPORT_H #define T_SUPPORT_H -#include "interfaces/passphraseprovider.h" +#include #include #include diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp index c8d35ada..b495ec5c 100644 --- a/lang/qt/tests/t-tofuinfo.cpp +++ b/lang/qt/tests/t-tofuinfo.cpp @@ -39,20 +39,21 @@ #include #include "protocol.h" -#include "tofuinfo.h" +#include #include "tofupolicyjob.h" #include "verifyopaquejob.h" -#include "verificationresult.h" -#include "signingresult.h" +#include +#include #include "importjob.h" -#include "importresult.h" +#include #include "keylistjob.h" -#include "keylistresult.h" +#include #include "signjob.h" -#include "key.h" +#include + #include "t-support.h" -#include "engineinfo.h" -#include "context.h" +#include +#include #include using namespace QGpgME; diff --git a/lang/qt/tests/t-trustsignatures.cpp b/lang/qt/tests/t-trustsignatures.cpp index b4baea4e..356b49b7 100644 --- a/lang/qt/tests/t-trustsignatures.cpp +++ b/lang/qt/tests/t-trustsignatures.cpp @@ -36,8 +36,8 @@ #include "t-support.h" -#include "context.h" -#include "engineinfo.h" +#include +#include #include "protocol.h" #include "signkeyjob.h" diff --git a/lang/qt/tests/t-various.cpp b/lang/qt/tests/t-various.cpp index b7e43a6a..6759f3b6 100644 --- a/lang/qt/tests/t-various.cpp +++ b/lang/qt/tests/t-various.cpp @@ -40,11 +40,11 @@ #include #include "keylistjob.h" #include "protocol.h" -#include "keylistresult.h" -#include "context.h" -#include "engineinfo.h" +#include +#include +#include #include "dn.h" -#include "data.h" +#include #include "dataprovider.h" #include "signkeyjob.h" diff --git a/lang/qt/tests/t-verify.cpp b/lang/qt/tests/t-verify.cpp index 0dbecf79..f1bba08f 100644 --- a/lang/qt/tests/t-verify.cpp +++ b/lang/qt/tests/t-verify.cpp @@ -40,8 +40,9 @@ #include "protocol.h" #include "verifyopaquejob.h" -#include "verificationresult.h" -#include "key.h" +#include +#include + #include "t-support.h" using namespace QGpgME; diff --git a/lang/qt/tests/t-wkdlookup.cpp b/lang/qt/tests/t-wkdlookup.cpp index 5c2816cf..03b7823a 100644 --- a/lang/qt/tests/t-wkdlookup.cpp +++ b/lang/qt/tests/t-wkdlookup.cpp @@ -35,8 +35,8 @@ #include "t-support.h" -#include "data.h" -#include "engineinfo.h" +#include +#include #include "protocol.h" #include "wkdlookupjob.h" #include "wkdlookupresult.h" diff --git a/lang/qt/tests/t-wkspublish.cpp b/lang/qt/tests/t-wkspublish.cpp index 618f0b48..cb75d149 100644 --- a/lang/qt/tests/t-wkspublish.cpp +++ b/lang/qt/tests/t-wkspublish.cpp @@ -39,11 +39,11 @@ #include #include "wkspublishjob.h" #include "keygenerationjob.h" -#include "keygenerationresult.h" +#include #include "importjob.h" -#include "importresult.h" +#include #include "protocol.h" -#include "engineinfo.h" +#include #include "t-support.h"