From 3103a34da28838fb5226c543a31844977010a3cf Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Wed, 10 Jun 2020 18:44:32 +0200
Subject: [PATCH] templates: fix plugin namespace of params

---
 templates/plugin_impl_cpp/call.j2 | 4 ++--
 templates/plugin_impl_h/call.j2   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/plugin_impl_cpp/call.j2 b/templates/plugin_impl_cpp/call.j2
index e4e685c7aa..90dc109266 100644
--- a/templates/plugin_impl_cpp/call.j2
+++ b/templates/plugin_impl_cpp/call.j2
@@ -1,5 +1,5 @@
 {% if is_async %}
-void {{ plugin_name.upper_camel_case }}Impl::{{ name.lower_snake_case }}_async({% for param in params %}{{ param.type_info.name }} {{ param.name.lower_snake_case }}, {% endfor %}const {{ plugin_name.upper_camel_case }}::ResultCallback callback)
+void {{ plugin_name.upper_camel_case }}Impl::{{ name.lower_snake_case }}_async({% for param in params %}{% if not param.type_info.is_primitive %}{{ plugin_name.upper_camel_case }}::{% endif %}{{ param.type_info.name }} {{ param.name.lower_snake_case }}, {% endfor %}const {{ plugin_name.upper_camel_case }}::ResultCallback callback)
 {
     {% for param in params %}
     UNUSED({{ param.name.lower_snake_case }});
@@ -9,7 +9,7 @@ void {{ plugin_name.upper_camel_case }}Impl::{{ name.lower_snake_case }}_async({
 {% endif %}
 
 {% if is_sync %}
-{% if has_result %}{{ plugin_name.upper_camel_case }}::Result{% else %}void{% endif %} {{ plugin_name.upper_camel_case }}Impl::{{ name.lower_snake_case }}({% for param in params %}{{ param.type_info.name }} {{ param.name.lower_snake_case }}{{ ", " if not loop.last }}{% endfor %})
+{% if has_result %}{{ plugin_name.upper_camel_case }}::Result{% else %}void{% endif %} {{ plugin_name.upper_camel_case }}Impl::{{ name.lower_snake_case }}({% for param in params %}{% if not param.type_info.is_primitive %}{{ plugin_name.upper_camel_case }}::{% endif %}{{ param.type_info.name }} {{ param.name.lower_snake_case }}{{ ", " if not loop.last }}{% endfor %})
 {
     {% for param in params %}
     UNUSED({{ param.name.lower_snake_case }});
diff --git a/templates/plugin_impl_h/call.j2 b/templates/plugin_impl_h/call.j2
index dc2e34686c..965907cbc3 100644
--- a/templates/plugin_impl_h/call.j2
+++ b/templates/plugin_impl_h/call.j2
@@ -1,7 +1,7 @@
 {% if is_async %}
-void {{ name.lower_snake_case }}_async({% for param in params %}{{ param.type_info.name }} {{ param.name.lower_snake_case }}, {% endfor %}const {{ plugin_name.upper_camel_case }}::ResultCallback callback);
+void {{ name.lower_snake_case }}_async({% for param in params %}{% if not param.type_info.is_primitive %}{{ plugin_name.upper_camel_case }}::{% endif %}{{ param.type_info.name }} {{ param.name.lower_snake_case }}, {% endfor %}const {{ plugin_name.upper_camel_case }}::ResultCallback callback);
 {% endif %}
 
 {% if is_sync %}
-{% if has_result %}{{ plugin_name.upper_camel_case }}::Result{% else %}void{% endif %} {{ name.lower_snake_case }}({% for param in params %}{{ param.type_info.name }} {{ param.name.lower_snake_case }}{{ ", " if not loop.last }}{% endfor %});
+{% if has_result %}{{ plugin_name.upper_camel_case }}::Result{% else %}void{% endif %} {{ name.lower_snake_case }}({% for param in params %}{% if not param.type_info.is_primitive %}{{ plugin_name.upper_camel_case }}::{% endif %}{{ param.type_info.name }} {{ param.name.lower_snake_case }}{{ ", " if not loop.last }}{% endfor %});
 {% endif %}