From ec3e053611c5a7c1ffe5f0e308610a54b6d4cd92 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 24 Nov 2024 13:31:55 -0500 Subject: Use angle brackets for library includes and clean up include paths --- src/collections.c | 6 +++--- src/instance.c | 6 +++--- src/lib.c | 8 ++++---- src/lilv_internal.h | 15 ++++++--------- src/node.c | 12 ++++++------ src/plugin.c | 15 +++++++-------- src/pluginclass.c | 6 +++--- src/port.c | 13 ++++++------- src/query.c | 6 +++--- src/scalepoint.c | 2 +- src/state.c | 33 ++++++++++++++++----------------- src/ui.c | 4 ++-- src/util.c | 12 ++++++------ src/world.c | 19 +++++++++---------- 14 files changed, 75 insertions(+), 82 deletions(-) (limited to 'src') diff --git a/src/collections.c b/src/collections.c index 508f69c..6d143a7 100644 --- a/src/collections.c +++ b/src/collections.c @@ -3,9 +3,9 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "sord/sord.h" -#include "zix/tree.h" +#include +#include +#include #include #include diff --git a/src/instance.c b/src/instance.c index 379fe24..335984b 100644 --- a/src/instance.c +++ b/src/instance.c @@ -3,9 +3,9 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "lv2/core/lv2.h" -#include "serd/serd.h" +#include +#include +#include #include #include diff --git a/src/lib.c b/src/lib.c index 5f7a456..fcb6f6d 100644 --- a/src/lib.c +++ b/src/lib.c @@ -3,10 +3,10 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "lv2/core/lv2.h" -#include "serd/serd.h" -#include "zix/tree.h" +#include +#include +#include +#include #ifndef _WIN32 # include diff --git a/src/lilv_internal.h b/src/lilv_internal.h index f1bca25..22e3998 100644 --- a/src/lilv_internal.h +++ b/src/lilv_internal.h @@ -10,11 +10,11 @@ extern "C" { #include "lilv_config.h" // IWYU pragma: keep -#include "lilv/lilv.h" -#include "lv2/core/lv2.h" -#include "serd/serd.h" -#include "sord/sord.h" -#include "zix/tree.h" +#include +#include +#include +#include +#include #include #include @@ -40,7 +40,7 @@ dlerror(void) #endif #ifdef LILV_DYN_MANIFEST -# include "lv2/dynmanifest/dynmanifest.h" +# include #endif /* @@ -391,9 +391,6 @@ lilv_strdup(const char* str); char* lilv_get_lang(void); -char* -lilv_expand(const char* path); - char* lilv_get_latest_copy(const char* path, const char* copy_path); diff --git a/src/node.c b/src/node.c index 13c0e77..42c2b56 100644 --- a/src/node.c +++ b/src/node.c @@ -3,12 +3,12 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "serd/serd.h" -#include "sord/sord.h" -#include "zix/allocator.h" -#include "zix/filesystem.h" -#include "zix/path.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/plugin.c b/src/plugin.c index bd31920..abb6b31 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -3,16 +3,15 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "serd/serd.h" -#include "sord/sord.h" -#include "zix/tree.h" - -#include "lv2/core/lv2.h" -#include "lv2/ui/ui.h" +#include +#include +#include +#include +#include +#include #ifdef LILV_DYN_MANIFEST -# include "lv2/dynmanifest/dynmanifest.h" +# include #endif #include diff --git a/src/pluginclass.c b/src/pluginclass.c index 18109f3..fceae2c 100644 --- a/src/pluginclass.c +++ b/src/pluginclass.c @@ -3,9 +3,9 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "sord/sord.h" -#include "zix/tree.h" +#include +#include +#include #include #include diff --git a/src/port.c b/src/port.c index 8b3a482..4ad5d70 100644 --- a/src/port.c +++ b/src/port.c @@ -3,13 +3,12 @@ #include "lilv_internal.h" -#include "lv2/atom/atom.h" -#include "lv2/core/lv2.h" -#include "lv2/event/event.h" - -#include "lilv/lilv.h" -#include "sord/sord.h" -#include "zix/tree.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/query.c b/src/query.c index 3dd8eca..6781fc6 100644 --- a/src/query.c +++ b/src/query.c @@ -3,9 +3,9 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "sord/sord.h" -#include "zix/tree.h" +#include +#include +#include #include #include diff --git a/src/scalepoint.c b/src/scalepoint.c index 60cc905..f1dc763 100644 --- a/src/scalepoint.c +++ b/src/scalepoint.c @@ -3,7 +3,7 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" +#include #include diff --git a/src/state.c b/src/state.c index 35cdb15..b05d455 100644 --- a/src/state.c +++ b/src/state.c @@ -3,23 +3,22 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "serd/serd.h" -#include "sord/sord.h" -#include "sratom/sratom.h" -#include "zix/allocator.h" -#include "zix/filesystem.h" -#include "zix/path.h" -#include "zix/status.h" -#include "zix/string_view.h" -#include "zix/tree.h" - -#include "lv2/atom/atom.h" -#include "lv2/atom/forge.h" -#include "lv2/core/lv2.h" -#include "lv2/presets/presets.h" -#include "lv2/state/state.h" -#include "lv2/urid/urid.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ui.c b/src/ui.c index 2be49ec..9e97091 100644 --- a/src/ui.c +++ b/src/ui.c @@ -3,8 +3,8 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "zix/tree.h" +#include +#include #include #include diff --git a/src/util.c b/src/util.c index 278f0de..2693600 100644 --- a/src/util.c +++ b/src/util.c @@ -3,12 +3,12 @@ #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "serd/serd.h" -#include "zix/allocator.h" -#include "zix/filesystem.h" -#include "zix/path.h" -#include "zix/string_view.h" +#include +#include +#include +#include +#include +#include #include diff --git a/src/world.c b/src/world.c index 1dfae9c..970643d 100644 --- a/src/world.c +++ b/src/world.c @@ -4,18 +4,17 @@ #include "lilv_config.h" // IWYU pragma: keep #include "lilv_internal.h" -#include "lilv/lilv.h" -#include "serd/serd.h" -#include "sord/sord.h" -#include "zix/environment.h" -#include "zix/filesystem.h" -#include "zix/tree.h" - -#include "lv2/core/lv2.h" -#include "lv2/presets/presets.h" +#include +#include +#include +#include +#include +#include +#include +#include #ifdef LILV_DYN_MANIFEST -# include "lv2/dynmanifest/dynmanifest.h" +# include #endif #include -- cgit v1.2.1