diff options
| author | Ingo Klöcker <[email protected]> | 2024-05-24 08:30:15 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2024-05-24 08:51:32 +0000 |
| commit | 6aa359b1e8d468d4f2f9145666ab6d916f453244 (patch) | |
| tree | 3e712adaf615513a498cb58388805c4085614b97 | |
| parent | Merge branch 'ikloecker/t7118-revkeys' (diff) | |
| download | gpgme-6aa359b1e8d468d4f2f9145666ab6d916f453244.tar.gz gpgme-6aa359b1e8d468d4f2f9145666ab6d916f453244.zip | |
cpp: Fix includes in public headers
* lang/cpp/src/defaultassuantransaction.h,
lang/cpp/src/gpgadduserideditinteractor.h,
lang/cpp/src/gpgagentgetinfoassuantransaction.h,
lang/cpp/src/gpggencardkeyinteractor.h,
lang/cpp/src/gpgsetexpirytimeeditinteractor.h,
lang/cpp/src/gpgsetownertrusteditinteractor.h,
lang/cpp/src/gpgsignkeyeditinteractor.h,
lang/cpp/src/interfaces/assuantransaction.h,
lang/cpp/src/interfaces/dataprovider.h,
lang/cpp/src/interfaces/statusconsumer.h,
lang/cpp/src/scdgetinfoassuantransaction.h,
lang/cpp/src/statusconsumerassuantransaction.h,
lang/cpp/src/trustitem.h: Use #include "foo.h" instead of
#include <foo.h> for own headers.
--
This fixes the build for projects that include the headers (as intended)
with #include <gpgme++/...> and that don't add the gpgme++ subdirectory
to the list of include paths for the compiler.
GnuPG-bug-id: 7110
| -rw-r--r-- | lang/cpp/src/defaultassuantransaction.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/gpgadduserideditinteractor.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/gpgagentgetinfoassuantransaction.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/gpggencardkeyinteractor.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/gpgsetexpirytimeeditinteractor.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/gpgsetownertrusteditinteractor.h | 4 | ||||
| -rw-r--r-- | lang/cpp/src/gpgsignkeyeditinteractor.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/interfaces/assuantransaction.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/interfaces/dataprovider.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/interfaces/statusconsumer.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/scdgetinfoassuantransaction.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/statusconsumerassuantransaction.h | 2 | ||||
| -rw-r--r-- | lang/cpp/src/trustitem.h | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/lang/cpp/src/defaultassuantransaction.h b/lang/cpp/src/defaultassuantransaction.h index 5462f5f2..a7cac3c1 100644 --- a/lang/cpp/src/defaultassuantransaction.h +++ b/lang/cpp/src/defaultassuantransaction.h @@ -25,7 +25,7 @@ #ifndef __GPGMEPP_DEFAULTASSUANTRANSACTION_H__ #define __GPGMEPP_DEFAULTASSUANTRANSACTION_H__ -#include <interfaces/assuantransaction.h> +#include "interfaces/assuantransaction.h" #include <string> #include <vector> diff --git a/lang/cpp/src/gpgadduserideditinteractor.h b/lang/cpp/src/gpgadduserideditinteractor.h index 9d06f994..68db32f2 100644 --- a/lang/cpp/src/gpgadduserideditinteractor.h +++ b/lang/cpp/src/gpgadduserideditinteractor.h @@ -25,7 +25,7 @@ #ifndef __GPGMEPP_GPGADDUSERIDEDITINTERACTOR_H__ #define __GPGMEPP_GPGADDUSERIDEDITINTERACTOR_H__ -#include <editinteractor.h> +#include "editinteractor.h" #include <string> diff --git a/lang/cpp/src/gpgagentgetinfoassuantransaction.h b/lang/cpp/src/gpgagentgetinfoassuantransaction.h index bbb5776b..b7178e42 100644 --- a/lang/cpp/src/gpgagentgetinfoassuantransaction.h +++ b/lang/cpp/src/gpgagentgetinfoassuantransaction.h @@ -25,7 +25,7 @@ #ifndef __GPGMEPP_GPGAGENTGETINFOASSUANTRANSACTION_H__ #define __GPGMEPP_GPGAGENTGETINFOASSUANTRANSACTION_H__ -#include <interfaces/assuantransaction.h> +#include "interfaces/assuantransaction.h" #include <string> #include <vector> diff --git a/lang/cpp/src/gpggencardkeyinteractor.h b/lang/cpp/src/gpggencardkeyinteractor.h index 09a73b6a..25cfa6b1 100644 --- a/lang/cpp/src/gpggencardkeyinteractor.h +++ b/lang/cpp/src/gpggencardkeyinteractor.h @@ -24,7 +24,7 @@ #ifndef __GPGMEPP_GPGGENCARDKEYEDITINTERACTOR_H__ #define __GPGMEPP_GPGGENCARDKEYEDITINTERACTOR_H__ -#include <editinteractor.h> +#include "editinteractor.h" #include <string> #include <memory> diff --git a/lang/cpp/src/gpgsetexpirytimeeditinteractor.h b/lang/cpp/src/gpgsetexpirytimeeditinteractor.h index 6c96b214..c7221bad 100644 --- a/lang/cpp/src/gpgsetexpirytimeeditinteractor.h +++ b/lang/cpp/src/gpgsetexpirytimeeditinteractor.h @@ -25,7 +25,7 @@ #ifndef __GPGMEPP_GPGSETEXPIRYTIMEEDITINTERACTOR_H__ #define __GPGMEPP_GPGSETEXPIRYTIMEEDITINTERACTOR_H__ -#include <editinteractor.h> +#include "editinteractor.h" #include <string> diff --git a/lang/cpp/src/gpgsetownertrusteditinteractor.h b/lang/cpp/src/gpgsetownertrusteditinteractor.h index b7f920be..a1ddb1ba 100644 --- a/lang/cpp/src/gpgsetownertrusteditinteractor.h +++ b/lang/cpp/src/gpgsetownertrusteditinteractor.h @@ -25,8 +25,8 @@ #ifndef __GPGMEPP_GPGSETOWNERTRUSTEDITINTERACTOR_H__ #define __GPGMEPP_GPGSETOWNERTRUSTEDITINTERACTOR_H__ -#include <editinteractor.h> -#include <key.h> +#include "editinteractor.h" +#include "key.h" #include <string> diff --git a/lang/cpp/src/gpgsignkeyeditinteractor.h b/lang/cpp/src/gpgsignkeyeditinteractor.h index 889ed567..8b8a2b52 100644 --- a/lang/cpp/src/gpgsignkeyeditinteractor.h +++ b/lang/cpp/src/gpgsignkeyeditinteractor.h @@ -25,7 +25,7 @@ #ifndef __GPGMEPP_GPGSIGNKEYEDITINTERACTOR_H__ #define __GPGMEPP_GPGSIGNKEYEDITINTERACTOR_H__ -#include <editinteractor.h> +#include "editinteractor.h" #include <string> #include <vector> diff --git a/lang/cpp/src/interfaces/assuantransaction.h b/lang/cpp/src/interfaces/assuantransaction.h index 0d0dcccb..35682f55 100644 --- a/lang/cpp/src/interfaces/assuantransaction.h +++ b/lang/cpp/src/interfaces/assuantransaction.h @@ -26,7 +26,7 @@ #ifndef __GPGMEPP_INTERFACES_ASSUANTRANSACTION_H__ #define __GPGMEPP_INTERFACES_ASSUANTRANSACTION_H__ -#include "gpgmepp_export.h" +#include "../gpgmepp_export.h" #include <stddef.h> diff --git a/lang/cpp/src/interfaces/dataprovider.h b/lang/cpp/src/interfaces/dataprovider.h index c8f387d6..22dc459b 100644 --- a/lang/cpp/src/interfaces/dataprovider.h +++ b/lang/cpp/src/interfaces/dataprovider.h @@ -27,7 +27,7 @@ #include <sys/types.h> -#include "gpgmepp_export.h" +#include "../gpgmepp_export.h" #include <gpg-error.h> diff --git a/lang/cpp/src/interfaces/statusconsumer.h b/lang/cpp/src/interfaces/statusconsumer.h index a819fccf..65e7ea4a 100644 --- a/lang/cpp/src/interfaces/statusconsumer.h +++ b/lang/cpp/src/interfaces/statusconsumer.h @@ -24,7 +24,7 @@ #ifndef __GPGMEPP_INTERFACES_STATUSCONSUMER_H__ #define __GPGMEPP_INTERFACES_STATUSCONSUMER_H__ -#include "gpgmepp_export.h" +#include "../gpgmepp_export.h" namespace GpgME { diff --git a/lang/cpp/src/scdgetinfoassuantransaction.h b/lang/cpp/src/scdgetinfoassuantransaction.h index 621725e4..d1ff0987 100644 --- a/lang/cpp/src/scdgetinfoassuantransaction.h +++ b/lang/cpp/src/scdgetinfoassuantransaction.h @@ -25,7 +25,7 @@ #ifndef __GPGMEPP_SCDGETINFOASSUANTRANSACTION_H__ #define __GPGMEPP_SCDGETINFOASSUANTRANSACTION_H__ -#include <interfaces/assuantransaction.h> +#include "interfaces/assuantransaction.h" #include <string> #include <vector> diff --git a/lang/cpp/src/statusconsumerassuantransaction.h b/lang/cpp/src/statusconsumerassuantransaction.h index 9501b0ee..0724069d 100644 --- a/lang/cpp/src/statusconsumerassuantransaction.h +++ b/lang/cpp/src/statusconsumerassuantransaction.h @@ -24,7 +24,7 @@ #ifndef __GPGMEPP_STATUSCONSUMERASSUANTRANSACTION_H__ #define __GPGMEPP_STATUSCONSUMERASSUANTRANSACTION_H__ -#include <interfaces/assuantransaction.h> +#include "interfaces/assuantransaction.h" namespace GpgME { diff --git a/lang/cpp/src/trustitem.h b/lang/cpp/src/trustitem.h index d31dc0b7..a951bdf9 100644 --- a/lang/cpp/src/trustitem.h +++ b/lang/cpp/src/trustitem.h @@ -27,7 +27,7 @@ #define __GPGMEPP_TRUSTITEM_H__ #include "gpgmefw.h" -#include <key.h> +#include "key.h" #include "gpgmepp_export.h" #include <algorithm> |