GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Always include C++ binding headers with gpgme++/ prefix

Browse Source 
* 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
This commit is contained in:
Ingo Klöcker 2024-05-24 11:39:42 +02:00
parent 8be031ebdb
commit 5b0903c9af
No known key found for this signature in database
GPG Key ID: F5A5D1692277A1E9
131 changed files with 239 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/qt/src/Makefile.am
View File

@ -326,7 +326,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
@ -339,7 +339,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

2
lang/qt/src/changeexpiryjob.cpp
View File

@ -38,7 +38,7 @@
#include "changeexpiryjob.h"
#include "changeexpiryjob_p.h"
#include <context.h>
#include <gpgme++/context.h>
using namespace GpgME;
using namespace QGpgME;

4
lang/qt/src/changeexpiryjob.h
View File

@ -37,11 +37,7 @@
#include "job.h"
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
#include <vector>

4
lang/qt/src/changeownertrustjob.h
View File

@ -37,11 +37,7 @@
#include "job.h"
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
namespace QGpgME
{

2
lang/qt/src/dataprovider.cpp
View File

@ -28,7 +28,7 @@
#include <dataprovider.h>
#include <error.h>
#include <gpgme++/error.h>
#include <QIODevice>
#include <QProcess>

4
lang/qt/src/dataprovider.h
View File

@ -26,11 +26,7 @@
#include "qgpgme_export.h"
#ifdef BUILDING_QGPGME
#include <interfaces/dataprovider.h>
#else
#include <gpgme++/interfaces/dataprovider.h>
#endif
#include <memory>

2
lang/qt/src/debug.cpp
View File

@ -35,7 +35,7 @@
#include "config.h"
#endif
#include "error.h"
#include <gpgme++/error.h>
#include "debug.h"
#include <QDebug>

2
lang/qt/src/decryptverifyarchivejob.cpp
View File

@ -38,7 +38,7 @@
#include "decryptverifyarchivejob.h"
#include "decryptverifyarchivejob_p.h"
#include <engineinfo.h>
#include <gpgme++/engineinfo.h>
using namespace QGpgME;

4
lang/qt/src/decryptverifyarchivejob.h
View File

@ -36,11 +36,7 @@
#include "job.h"
#ifdef BUILDING_QGPGME
# include "context.h"
#else
#include <gpgme++/context.h>
#endif
namespace GpgME
{

2
lang/qt/src/encryptarchivejob.cpp
View File

@ -38,7 +38,7 @@
#include "encryptarchivejob.h"
#include "encryptarchivejob_p.h"
#include <engineinfo.h>
#include <gpgme++/engineinfo.h>
using namespace QGpgME;

4
lang/qt/src/encryptarchivejob.h
View File

@ -36,11 +36,7 @@
#include "job.h"
#ifdef BUILDING_QGPGME
# include "context.h"
#else
#include <gpgme++/context.h>
#endif
namespace GpgME
{

6
lang/qt/src/encryptjob.h
View File

@ -38,16 +38,12 @@
#define __KLEO_ENCRYPTJOB_H__
#include "job.h"
#include "data.h"
#include <gpgme++/data.h>
#include <memory>
#include <vector>
#ifdef BUILDING_QGPGME
# include "context.h"
#else
#include <gpgme++/context.h>
#endif
class QByteArray;
class QIODevice;

4
lang/qt/src/encryptjob_p.h
View File

@ -36,8 +36,8 @@
#include "job_p.h"
#include <data.h>
#include <key.h>
#include <gpgme++/data.h>
#include <gpgme++/key.h>
namespace QGpgME
{

2
lang/qt/src/filelistdataprovider.cpp
View File

@ -41,7 +41,7 @@
#include <QString>
#include <error.h>
#include <gpgme++/error.h>
#include <numeric>

4
lang/qt/src/filelistdataprovider.h
View File

@ -36,11 +36,7 @@
#include "qgpgme_export.h"
#ifdef BUILDING_QGPGME
#include <interfaces/dataprovider.h>
#else
#include <gpgme++/interfaces/dataprovider.h>
#endif
#include <memory>
#include <vector>

4
lang/qt/src/hierarchicalkeylistjob.h
View File

@ -39,11 +39,7 @@
#include "keylistjob.h"
#include "cryptobackend.h"
#ifdef BUILDING_QGPGME
# include "keylistresult.h"
#else
#include <gpgme++/keylistresult.h>
#endif
#include <QPointer>

2
lang/qt/src/importjob.cpp
View File

@ -38,7 +38,7 @@
#include "importjob.h"
#include "importjob_p.h"
#include <context.h>
#include <gpgme++/context.h>
using namespace GpgME;
using namespace QGpgME;

4
lang/qt/src/importjob.h
View File

@ -40,11 +40,7 @@
#include "abstractimportjob.h"
#include "qgpgme_export.h"
#ifdef BUILDING_QGPGME
# include <key.h>
#else
#include <gpgme++/key.h>
#endif
namespace GpgME
{

2
lang/qt/src/importjob_p.h
View File

@ -36,7 +36,7 @@
#include "job_p.h"
#include <key.h>
#include <gpgme++/key.h>
namespace QGpgME
{

4
lang/qt/src/job.h
View File

@ -41,11 +41,7 @@
#include <QString>
#include <QMap>
#ifdef BUILDING_QGPGME
# include "error.h"
#else
#include <gpgme++/error.h>
#endif
class QWidget;

4
lang/qt/src/keyformailboxjob.h
View File

@ -37,11 +37,7 @@
#include "job.h"
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
namespace GpgME
{

4
lang/qt/src/keylistjob.h
View File

@ -38,11 +38,7 @@
#include "job.h"
#include "qgpgme_export.h"
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
#include <QtCore/QStringList>

4
lang/qt/src/listallkeysjob.h
View File

@ -40,11 +40,7 @@
#include "job.h"
#include "qgpgme_export.h"
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
#include <vector>

6
lang/qt/src/multideletejob.cpp
View File

@ -38,9 +38,9 @@
#include "protocol.h"
#include "deletejob.h"
#include <key.h>
#include <context.h>
#include <data.h>
#include <gpgme++/key.h>
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <iterator>

8
lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp
View File

@ -41,10 +41,10 @@
#include <QDateTime>
#include "context.h"
#include "data.h"
#include "gpgaddexistingsubkeyeditinteractor.h"
#include "key.h"
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/gpgaddexistingsubkeyeditinteractor.h>
#include <gpgme++/key.h>
#include <gpg-error.h>

8
lang/qt/src/qgpgmeadduseridjob.cpp
View File

@ -40,10 +40,10 @@
#include "dataprovider.h"
#include "context.h"
#include "data.h"
#include "gpgadduserideditinteractor.h"
#include "key.h"
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/gpgadduserideditinteractor.h>
#include <gpgme++/key.h>
#include <cassert>
#include <memory>

4
lang/qt/src/qgpgmebackend.cpp
View File

@ -40,8 +40,8 @@
#include "qgpgmegpgcardjob.h"
#include "error.h"
#include "engineinfo.h"
#include <gpgme++/error.h>
#include <gpgme++/engineinfo.h>
#include "protocol_p.h"

4
lang/qt/src/qgpgmechangeexpiryjob.cpp
View File

@ -42,8 +42,8 @@
#include "changeexpiryjob_p.h"
#include "context.h"
#include "key.h"
#include <gpgme++/context.h>
#include <gpgme++/key.h>
#include <QDateTime>

8
lang/qt/src/qgpgmechangeownertrustjob.cpp
View File

@ -40,10 +40,10 @@
#include "dataprovider.h"
#include "context.h"
#include "data.h"
#include "gpgsetownertrusteditinteractor.h"
#include "key.h"
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/gpgsetownertrusteditinteractor.h>
#include <gpgme++/key.h>
#include <cassert>
#include <memory>

6
lang/qt/src/qgpgmechangepasswdjob.cpp
View File

@ -40,9 +40,9 @@
#include "dataprovider.h"
#include "context.h"
#include "data.h"
#include "key.h"
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/key.h>
#include <cassert>
#include <memory>

6
lang/qt/src/qgpgmedecryptjob.cpp
View File

@ -40,9 +40,9 @@
#include "dataprovider.h"
#include "context.h"
#include "decryptionresult.h"
#include "data.h"
#include <gpgme++/context.h>
#include <gpgme++/decryptionresult.h>
#include <gpgme++/data.h>
#include <QBuffer>

4
lang/qt/src/qgpgmedecryptjob.h
View File

@ -39,11 +39,7 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "decryptionresult.h"
#else
#include <gpgme++/decryptionresult.h>
#endif
namespace QGpgME
{

2
lang/qt/src/qgpgmedecryptverifyarchivejob.cpp
View File

@ -45,7 +45,7 @@
#include <QFile>
#include <data.h>
#include <gpgme++/data.h>
using namespace QGpgME;
using namespace GpgME;

4
lang/qt/src/qgpgmedecryptverifyarchivejob.h
View File

@ -38,8 +38,8 @@
#include "threadedjobmixin.h"
#include <decryptionresult.h>
#include <verificationresult.h>
#include <gpgme++/decryptionresult.h>
#include <gpgme++/verificationresult.h>
namespace QGpgME
{

8
lang/qt/src/qgpgmedecryptverifyjob.cpp
View File

@ -42,10 +42,10 @@
#include "decryptverifyjob_p.h"
#include "util.h"
#include <context.h>
#include <decryptionresult.h>
#include <verificationresult.h>
#include <data.h>
#include <gpgme++/context.h>
#include <gpgme++/decryptionresult.h>
#include <gpgme++/verificationresult.h>
#include <gpgme++/data.h>
#include <QDebug>
#include "qgpgme_debug.h"

8
lang/qt/src/qgpgmedecryptverifyjob.h
View File

@ -39,16 +39,8 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "decryptionresult.h"
#else
#include <gpgme++/decryptionresult.h>
#endif
#ifdef BUILDING_QGPGME
# include "verificationresult.h"
#else
#include <gpgme++/verificationresult.h>
#endif
namespace QGpgME
{

4
lang/qt/src/qgpgmedeletejob.cpp
View File

@ -38,8 +38,8 @@
#include "qgpgmedeletejob.h"
#include "context.h"
#include "key.h"
#include <gpgme++/context.h>
#include <gpgme++/key.h>
#include <cassert>

4
lang/qt/src/qgpgmedownloadjob.cpp
View File

@ -40,8 +40,8 @@
#include "dataprovider.h"
#include "context.h"
#include "data.h"
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <QStringList>

2
lang/qt/src/qgpgmeencryptarchivejob.cpp
View File

@ -48,7 +48,7 @@
#include <QFile>
#include <data.h>
#include <gpgme++/data.h>
using namespace QGpgME;
using namespace GpgME;

2
lang/qt/src/qgpgmeencryptarchivejob.h
View File

@ -38,7 +38,7 @@
#include "threadedjobmixin.h"
#include <encryptionresult.h>
#include <gpgme++/encryptionresult.h>
namespace QGpgME
{

6
lang/qt/src/qgpgmeencryptjob.cpp
View File

@ -44,9 +44,9 @@
#include "encryptjob_p.h"
#include "util.h"
#include <context.h>
#include <data.h>
#include <encryptionresult.h>
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/encryptionresult.h>
#include <QBuffer>
#include <QFileInfo>

8
lang/qt/src/qgpgmeencryptjob.h
View File

@ -39,16 +39,8 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "encryptionresult.h"
#else
#include <gpgme++/encryptionresult.h>
#endif
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
namespace QGpgME
{

6
lang/qt/src/qgpgmeexportjob.cpp
View File

@ -42,9 +42,9 @@
#include "dataprovider.h"
#include "context.h"
#include "data.h"
#include "key.h"
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/key.h>
#include <QStringList>

6
lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
View File

@ -40,9 +40,9 @@
#include "dataprovider.h"
#include "context.h"
#include "data.h"
#include "key.h"
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/key.h>
#include <cassert>

4
lang/qt/src/qgpgmeimportfromkeyserverjob.h
View File

@ -39,11 +39,7 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "importresult.h"
#else
#include <gpgme++/importresult.h>
#endif
namespace QGpgME
{

6
lang/qt/src/qgpgmeimportjob.cpp
View File

@ -44,9 +44,9 @@
#include "dataprovider.h"
#include <context.h>
#include <data.h>
#include <key.h>
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/key.h>
using namespace QGpgME;
using namespace GpgME;

4
lang/qt/src/qgpgmeimportjob.h
View File

@ -41,11 +41,7 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "importresult.h"
#else
#include <gpgme++/importresult.h>
#endif
namespace QGpgME
{

5
lang/qt/src/qgpgmekeyformailboxjob.h
View File

@ -39,13 +39,8 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "keylistresult.h"
# include "key.h"
#else
#include <gpgme++/keylistresult.h>
#include <gpgme++/key.h>
#endif
namespace QGpgME
{

4
lang/qt/src/qgpgmekeygenerationjob.cpp
View File

@ -40,8 +40,8 @@
#include "dataprovider.h"
#include "context.h"
#include "data.h"
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <cassert>

4
lang/qt/src/qgpgmekeygenerationjob.h
View File

@ -39,11 +39,7 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "keygenerationresult.h"
#else
#include <gpgme++/keygenerationresult.h>
#endif
namespace QGpgME
{

6
lang/qt/src/qgpgmekeylistjob.cpp
View File

@ -38,9 +38,9 @@
#include "qgpgmekeylistjob.h"
#include "key.h"
#include "context.h"
#include "keylistresult.h"
#include <gpgme++/key.h>
#include <gpgme++/context.h>
#include <gpgme++/keylistresult.h>
#include <gpg-error.h>
#include <QStringList>

8
lang/qt/src/qgpgmekeylistjob.h
View File

@ -39,16 +39,8 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "keylistresult.h"
#else
#include <gpgme++/keylistresult.h>
#endif
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
namespace QGpgME
{

10
lang/qt/src/qgpgmelistallkeysjob.cpp
View File

@ -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 <gpgme++/key.h>
#include <gpgme++/context.h>
#include <gpgme++/engineinfo.h>
#include <gpgme++/global.h>
#include <gpgme++/keylistresult.h>
#include "qgpgme_debug.h"
#include <gpg-error.h>

8
lang/qt/src/qgpgmelistallkeysjob.h
View File

@ -39,16 +39,8 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "keylistresult.h"
#else
#include <gpgme++/keylistresult.h>
#endif
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
namespace QGpgME
{

4
lang/qt/src/qgpgmenewcryptoconfig.cpp
View File

@ -45,8 +45,8 @@
#include <QDir>
#include <QList>
#include "global.h"
#include "error.h"
#include <gpgme++/global.h>
#include <gpgme++/error.h>
#include "debug.h"
#include <sstream>

5
lang/qt/src/qgpgmenewcryptoconfig.h
View File

@ -42,12 +42,7 @@
#include <QStringList>
#include <QVariant>
#ifdef BUILDING_QGPGME
# include "configuration.h"
#else
#include <gpgme++/configuration.h>
#endif
#include <vector>
#include <utility>

5
lang/qt/src/qgpgmequickjob.cpp
View File

@ -37,8 +37,9 @@
#include "qgpgmequickjob.h"
#include "context.h"
#include "key.h"
#include <gpgme++/context.h>
#include <gpgme++/key.h>
#include "util.h"
using namespace QGpgME;

4
lang/qt/src/qgpgmereceivekeysjob.h
View File

@ -38,11 +38,7 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "importresult.h"
#else
#include <gpgme++/importresult.h>
#endif
namespace QGpgME
{

4
lang/qt/src/qgpgmerefreshsmimekeysjob.cpp
View File

@ -44,8 +44,8 @@
#include <QDebug>
#include "qgpgme_debug.h"
#include "context.h"
#include <key.h>
#include <gpgme++/context.h>
#include <gpgme++/key.h>
#include <QByteArray>
#include <QMetaObject>

7
lang/qt/src/qgpgmerefreshsmimekeysjob.h
View File

@ -36,11 +36,8 @@
#define __QGPGME_QGPGMEREFRESHSMIMEKEYSJOB_H__
#include "refreshkeysjob.h"
#ifdef BUILDING_QGPGME
# include "context.h"
#else
#include "gpgme++/context.h"
#endif
#include <gpgme++/context.h>
#include <QStringList>
#include <QProcess>

8
lang/qt/src/qgpgmerevokekeyjob.cpp
View File

@ -39,10 +39,10 @@
#include "dataprovider.h"
#include <context.h>
#include <data.h>
#include <gpgrevokekeyeditinteractor.h>
#include <key.h>
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/gpgrevokekeyeditinteractor.h>
#include <gpgme++/key.h>
#include <gpg-error.h>

2
lang/qt/src/qgpgmesetprimaryuseridjob.cpp
View File

@ -39,7 +39,7 @@
#include "util.h"
#include <engineinfo.h>
#include <gpgme++/engineinfo.h>
using namespace QGpgME;
using namespace GpgME;

2
lang/qt/src/qgpgmesignarchivejob.cpp
View File

@ -48,7 +48,7 @@
#include <QFile>
#include <data.h>
#include <gpgme++/data.h>
using namespace QGpgME;
using namespace GpgME;

2
lang/qt/src/qgpgmesignarchivejob.h
View File

@ -38,7 +38,7 @@
#include "threadedjobmixin.h"
#include <signingresult.h>
#include <gpgme++/signingresult.h>
namespace QGpgME
{

2
lang/qt/src/qgpgmesignencryptarchivejob.cpp
View File

@ -48,7 +48,7 @@
#include <QFile>
#include <data.h>
#include <gpgme++/data.h>
using namespace QGpgME;
using namespace GpgME;

4
lang/qt/src/qgpgmesignencryptarchivejob.h
View File

@ -38,8 +38,8 @@
#include "threadedjobmixin.h"
#include <encryptionresult.h>
#include <signingresult.h>
#include <gpgme++/encryptionresult.h>
#include <gpgme++/signingresult.h>
namespace QGpgME
{

8
lang/qt/src/qgpgmesignencryptjob.cpp
View File

@ -44,10 +44,10 @@
#include "signencryptjob_p.h"
#include "util.h"
#include <context.h>
#include <data.h>
#include <exception.h>
#include <key.h>
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/exception.h>
#include <gpgme++/key.h>
#include <QBuffer>
#include <QFileInfo>

12
lang/qt/src/qgpgmesignencryptjob.h
View File

@ -39,21 +39,9 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "signingresult.h"
#else
#include <gpgme++/signingresult.h>
#endif
#ifdef BUILDING_QGPGME
# include "encryptionresult.h"
#else
#include <gpgme++/encryptionresult.h>
#endif
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
#include <utility>

6
lang/qt/src/qgpgmesignjob.cpp
View File

@ -42,9 +42,9 @@
#include "signjob_p.h"
#include "util.h"
#include <context.h>
#include <data.h>
#include <signingresult.h>
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/signingresult.h>
#include <QBuffer>
#include <QFile>

8
lang/qt/src/qgpgmesignjob.h
View File

@ -39,16 +39,8 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "signingresult.h"
#else
#include <gpgme++/signingresult.h>
#endif
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
namespace QGpgME
{

6
lang/qt/src/qgpgmesignkeyjob.cpp
View File

@ -43,9 +43,9 @@
#include "dataprovider.h"
#include "context.h"
#include "data.h"
#include "gpgsignkeyeditinteractor.h"
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/gpgsignkeyeditinteractor.h>
#include "qgpgme_debug.h"

6
lang/qt/src/qgpgmetofupolicyjob.cpp
View File

@ -35,9 +35,9 @@
#include "qgpgmetofupolicyjob.h"
#include "context.h"
#include "key.h"
#include "tofuinfo.h"
#include <gpgme++/context.h>
#include <gpgme++/key.h>
#include <gpgme++/tofuinfo.h>
using namespace QGpgME;

6
lang/qt/src/qgpgmeverifydetachedjob.cpp
View File

@ -44,9 +44,9 @@
#include <QFile>
#include <context.h>
#include <data.h>
#include <verificationresult.h>
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/verificationresult.h>
#include <cassert>

4
lang/qt/src/qgpgmeverifydetachedjob.h
View File

@ -39,11 +39,7 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "verificationresult.h"
#else
#include <gpgme++/verificationresult.h>
#endif
namespace QGpgME
{

6
lang/qt/src/qgpgmeverifyopaquejob.cpp
View File

@ -42,9 +42,9 @@
#include "util.h"
#include "verifyopaquejob_p.h"
#include <context.h>
#include <data.h>
#include <verificationresult.h>
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/verificationresult.h>
#include <QBuffer>
#include <QFile>

4
lang/qt/src/qgpgmeverifyopaquejob.h
View File

@ -39,11 +39,7 @@
#include "threadedjobmixin.h"
#ifdef BUILDING_QGPGME
# include "verificationresult.h"
#else
#include <gpgme++/verificationresult.h>
#endif
namespace QGpgME
{

6
lang/qt/src/qgpgmewkdlookupjob.cpp
View File

@ -39,9 +39,9 @@
#include "qgpgme_debug.h"
#include <context.h>
#include <data.h>
#include <defaultassuantransaction.h>
#include <gpgme++/context.h>
#include <gpgme++/data.h>
#include <gpgme++/defaultassuantransaction.h>
#include <gpg-error.h>

2
lang/qt/src/qgpgmewkdrefreshjob.cpp
View File

@ -42,7 +42,7 @@
#include "qgpgmekeylistjob.h"
#include "wkdrefreshjob_p.h"
#include <context.h>
#include <gpgme++/context.h>
#include <memory>

2
lang/qt/src/qgpgmewkdrefreshjob.h
View File

@ -37,7 +37,7 @@
#include "threadedjobmixin.h"
#include "wkdrefreshjob.h"
#include <importresult.h>
#include <gpgme++/importresult.h>
namespace QGpgME
{

5
lang/qt/src/qgpgmewkspublishjob.cpp
View File

@ -35,8 +35,9 @@
#include "qgpgmewkspublishjob.h"
#include "context.h"
#include "key.h"
#include <gpgme++/context.h>
#include <gpgme++/key.h>
#include "util.h"
#include <QFileInfo>

4
lang/qt/src/quickjob.h
View File

@ -39,11 +39,7 @@
#include <QDateTime>
#ifdef BUILDING_QGPGME
# include "key.h"
#else
#include <gpgme++/key.h>
#endif
class QString;

2
lang/qt/src/signarchivejob.cpp
View File

@ -38,7 +38,7 @@
#include "signarchivejob.h"
#include "signarchivejob_p.h"
#include <engineinfo.h>
#include <gpgme++/engineinfo.h>
using namespace QGpgME;

4
lang/qt/src/signarchivejob.h
View File

@ -36,11 +36,7 @@
#include "job.h"
#ifdef BUILDING_QGPGME
# include "context.h"
#else
#include <gpgme++/context.h>
#endif
namespace GpgME
{

2
lang/qt/src/signencryptarchivejob.cpp
View File

@ -38,7 +38,7 @@
#include "signencryptarchivejob.h"
#include "signencryptarchivejob_p.h"
#include <engineinfo.h>
#include <gpgme++/engineinfo.h>
using namespace QGpgME;

4
lang/qt/src/signencryptarchivejob.h
View File

@ -36,11 +36,7 @@
#include "job.h"
#ifdef BUILDING_QGPGME
# include "context.h"
#else
#include <gpgme++/context.h>
#endif
namespace GpgME
{

5
lang/qt/src/signencryptjob.h
View File

@ -40,13 +40,8 @@
#include "job.h"
#include "qgpgme_export.h"
#ifdef BUILDING_QGPGME
# include "global.h"
# include "context.h"
#else
#include <gpgme++/global.h>
#include <gpgme++/context.h>
#endif
#include <memory>
#include <vector>

2
lang/qt/src/signencryptjob_p.h
View File

@ -36,7 +36,7 @@
#include "job_p.h"
#include <key.h>
#include <gpgme++/key.h>
namespace QGpgME
{

5
lang/qt/src/signjob.h
View File

@ -37,12 +37,7 @@
#include "job.h"
#ifdef BUILDING_QGPGME
# include "global.h"
#else
#include <gpgme++/global.h>
#endif
#include <vector>
#include <memory>

2
lang/qt/src/signjob_p.h
View File

@ -36,7 +36,7 @@
#include "job_p.h"
#include <key.h>
#include <gpgme++/key.h>
namespace QGpgME
{

2
lang/qt/src/threadedjobmixin.cpp
View File

@ -40,7 +40,7 @@
#include "dataprovider.h"
#include "data.h"
#include <gpgme++/data.h>
#include <QString>
#include <QStringList>

5
lang/qt/src/threadedjobmixin.h
View File

@ -41,13 +41,8 @@
#include <QString>
#include <QIODevice>
#ifdef BUILDING_QGPGME
# include "context.h"
# include "interfaces/progressprovider.h"
#else
#include <gpgme++/context.h>
#include <gpgme++/interfaces/progressprovider.h>
#endif
#include "job.h"

4
lang/qt/src/tofupolicyjob.h
View File

@ -35,11 +35,7 @@
#include "qgpgme_export.h"
#ifdef BUILDING_QGPGME
# include "tofuinfo.h"
#else
#include <gpgme++/tofuinfo.h>
#endif
namespace GpgME
{

2
lang/qt/src/util.cpp
View File

@ -44,7 +44,7 @@
#include <QFileInfo>
#include <QRandomGenerator>
#include <key.h>
#include <gpgme++/key.h>
#include <algorithm>
#include <functional>

2
lang/qt/src/wkdlookupresult.cpp
View File

@ -37,7 +37,7 @@
#include "wkdlookupresult.h"
#include <data.h>
#include <gpgme++/data.h>
using namespace QGpgME;
using namespace GpgME;

4
lang/qt/src/wkdlookupresult.h
View File

@ -36,11 +36,7 @@
#include "qgpgme_export.h"
#ifdef BUILDING_QGPGME
# include <result.h>
#else
#include <gpgme++/result.h>
#endif
#include <memory>

2
lang/qt/src/wkdrefreshjob_p.h
View File

@ -36,7 +36,7 @@
#include "job_p.h"
#include <key.h>
#include <gpgme++/key.h>
namespace QGpgME
{

4
lang/qt/tests/Makefile.am
View File

@ -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 \

6
lang/qt/tests/run-decryptverifyarchivejob.cpp
View File

@ -41,9 +41,9 @@
#include <QCoreApplication>
#include <QDebug>
#include <context.h>
#include <decryptionresult.h>
#include <verificationresult.h>
#include <gpgme++/context.h>
#include <gpgme++/decryptionresult.h>
#include <gpgme++/verificationresult.h>
#include <iostream>

6
lang/qt/tests/run-decryptverifyjob.cpp
View File

@ -43,9 +43,9 @@
#include <QFile>
#include <QTimer>
#include <context.h>
#include <decryptionresult.h>
#include <verificationresult.h>
#include <gpgme++/context.h>
#include <gpgme++/decryptionresult.h>
#include <gpgme++/verificationresult.h>
#include <iostream>

6
lang/qt/tests/run-encryptarchivejob.cpp
View File

@ -46,9 +46,9 @@
#include <QFileInfo>
#include <QTimer>
#include <context.h>
#include <encryptionresult.h>
#include <signingresult.h>
#include <gpgme++/context.h>
#include <gpgme++/encryptionresult.h>
#include <gpgme++/signingresult.h>
#include <iostream>

Some files were not shown because too many files have changed in this diff Show More