fixup! WIP: Port to serd1

11 files changed, 15 insertions, 15 deletions

diff --git a/test/bad_syntax.lv2/test_bad_syntax.c b/test/bad_syntax.lv2/test_bad_syntax.c
index 3922df0..19376ed 100644
--- a/test/bad_syntax.lv2/test_bad_syntax.c
+++ b/test/bad_syntax.lv2/test_bad_syntax.c
@@ -25,7 +25,7 @@ main(int argc, char** argv)
   // Load test plugin bundle
   char*     abs_bundle = lilv_path_absolute(bundle_path);
   SerdNode* bundle =
-    serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string());
 
   lilv_world_load_bundle(world, bundle);
   free(abs_bundle);
diff --git a/test/failed_instantiation.lv2/test_failed_instantiation.c b/test/failed_instantiation.lv2/test_failed_instantiation.c
index 64e7a80..b28d4e2 100644
--- a/test/failed_instantiation.lv2/test_failed_instantiation.c
+++ b/test/failed_instantiation.lv2/test_failed_instantiation.c
@@ -25,7 +25,7 @@ main(int argc, char** argv)
   // Load test plugin bundle
   char*     abs_bundle = lilv_path_absolute(bundle_path);
   SerdNode* bundle =
-    serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string());
 
   lilv_world_load_bundle(world, bundle);
   free(abs_bundle);
diff --git a/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c b/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
index 5f7329f..194d3b4 100644
--- a/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
+++ b/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c
@@ -25,7 +25,7 @@ main(int argc, char** argv)
   // Load test plugin bundle
   char*     abs_bundle = lilv_path_absolute(bundle_path);
   SerdNode* bundle =
-    serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string());
 
   lilv_world_load_bundle(world, bundle);
   free(abs_bundle);
diff --git a/test/lib_descriptor.lv2/test_lib_descriptor.c b/test/lib_descriptor.lv2/test_lib_descriptor.c
index 3909feb..781243a 100644
--- a/test/lib_descriptor.lv2/test_lib_descriptor.c
+++ b/test/lib_descriptor.lv2/test_lib_descriptor.c
@@ -25,7 +25,7 @@ main(int argc, char** argv)
   // Load test plugin bundle
   char*     abs_bundle = lilv_path_absolute(bundle_path);
   SerdNode* bundle =
-    serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string());
 
   lilv_world_load_bundle(world, bundle);
   free(abs_bundle);
diff --git a/test/lilv_test_utils.c b/test/lilv_test_utils.c
index 563da20..bb5622b 100644
--- a/test/lilv_test_utils.c
+++ b/test/lilv_test_utils.c
@@ -95,7 +95,7 @@ create_bundle(LilvTestEnv* env,
   }
 
   SerdNode* s = serd_new_file_uri(
-    NULL, SERD_STRING(env->test_bundle_path), SERD_EMPTY_STRING());
+    NULL, serd_string(env->test_bundle_path), serd_empty_string());
 
   env->test_bundle_uri = lilv_new_uri(env->world, serd_node_string(s));
   env->test_manifest_path =
diff --git a/test/missing_descriptor.lv2/test_missing_descriptor.c b/test/missing_descriptor.lv2/test_missing_descriptor.c
index d811d8f..2a630d7 100644
--- a/test/missing_descriptor.lv2/test_missing_descriptor.c
+++ b/test/missing_descriptor.lv2/test_missing_descriptor.c
@@ -25,7 +25,7 @@ main(int argc, char** argv)
   // Load test plugin bundle
   char*     abs_bundle = lilv_path_absolute(bundle_path);
   SerdNode* bundle =
-    serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string());
 
   lilv_world_load_bundle(world, bundle);
   free(abs_bundle);
diff --git a/test/missing_name.lv2/test_missing_name.c b/test/missing_name.lv2/test_missing_name.c
index ef00cc1..29b732b 100644
--- a/test/missing_name.lv2/test_missing_name.c
+++ b/test/missing_name.lv2/test_missing_name.c
@@ -25,7 +25,7 @@ main(int argc, char** argv)
   // Load test plugin bundle
   char*     abs_bundle = lilv_path_absolute(bundle_path);
   SerdNode* bundle =
-    serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string());
 
   lilv_world_load_bundle(world, bundle);
   free(abs_bundle);
diff --git a/test/missing_plugin.lv2/test_missing_plugin.c b/test/missing_plugin.lv2/test_missing_plugin.c
index a50f7cc..2cdd1b8 100644
--- a/test/missing_plugin.lv2/test_missing_plugin.c
+++ b/test/missing_plugin.lv2/test_missing_plugin.c
@@ -25,7 +25,7 @@ main(int argc, char** argv)
   // Load test plugin bundle
   char*     abs_bundle = lilv_path_absolute(bundle_path);
   SerdNode* bundle =
-    serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string());
 
   lilv_world_load_bundle(world, bundle);
   free(abs_bundle);
diff --git a/test/missing_port.lv2/test_missing_port.c b/test/missing_port.lv2/test_missing_port.c
index fcb5435..ae0055d 100644
--- a/test/missing_port.lv2/test_missing_port.c
+++ b/test/missing_port.lv2/test_missing_port.c
@@ -24,9 +24,9 @@ main(int argc, char** argv)
 
   // Load test plugin bundle
   char* const          abs_bundle      = lilv_path_absolute(bundle_path);
-  const SerdStringView abs_bundle_view = SERD_STRING(abs_bundle);
+  const SerdStringView abs_bundle_view = serd_string(abs_bundle);
   SerdNode*            bundle =
-    serd_new_file_uri(NULL, abs_bundle_view, SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, abs_bundle_view, serd_empty_string());
 
   lilv_world_load_bundle(world, bundle);
   free(abs_bundle);
diff --git a/test/missing_port_name.lv2/test_missing_port_name.c b/test/missing_port_name.lv2/test_missing_port_name.c
index 2832077..8e9c392 100644
--- a/test/missing_port_name.lv2/test_missing_port_name.c
+++ b/test/missing_port_name.lv2/test_missing_port_name.c
@@ -25,7 +25,7 @@ main(int argc, char** argv)
   // Load test plugin bundle
   char*     abs_bundle = lilv_path_absolute(bundle_path);
   SerdNode* bundle =
-    serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string());
 
   lilv_world_load_bundle(world, bundle);
   free(abs_bundle);
diff --git a/test/test_state.c b/test/test_state.c
index 2951b61..636d637 100644
--- a/test/test_state.c
+++ b/test/test_state.c
@@ -248,7 +248,7 @@ load_test_plugin(const TestContext* const ctx)
   LilvWorld* world      = ctx->env->world;
   char*      abs_bundle = lilv_path_absolute(LILV_TEST_BUNDLE);
   SerdNode*  bundle =
-    serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string());
 
   LilvNode* bundle_uri = lilv_new_uri(world, serd_node_string(bundle));
   LilvNode* plugin_uri = lilv_new_uri(world, TEST_PLUGIN_URI);
@@ -550,9 +550,9 @@ count_statements(const char* path)
   size_t n_statements = 0;
 
   SerdWorld* const     world     = serd_world_new(NULL);
-  const SerdStringView path_view = SERD_STRING(path);
+  const SerdStringView path_view = serd_string(path);
   SerdNode* const      base =
-    serd_new_file_uri(NULL, path_view, SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, path_view, serd_empty_string());
 
   SerdEnv* const  env  = serd_env_new(world, serd_node_string_view(base));
   SerdSink* const sink = serd_sink_new(world, &n_statements, count_func, NULL);
@@ -919,7 +919,7 @@ test_world_round_trip(void)
   // Load state bundle into world
 
   SerdNode* bundle_uri =
-    serd_new_file_uri(NULL, SERD_STRING(bundle_path), SERD_EMPTY_STRING());
+    serd_new_file_uri(NULL, serd_string(bundle_path), serd_empty_string());
 
   LilvNode* const bundle_node =
     lilv_new_uri(world, serd_node_string(bundle_uri));