doctool: Move signal/vfunc templates to extend function.tmpl

3 files changed, 5 insertions, 23 deletions

diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl
index 4472ec5f..94036986 100644
--- a/giscanner/doctemplates/C/function.tmpl
+++ b/giscanner/doctemplates/C/function.tmpl
@@ -9,7 +9,7 @@
       <api:returns>
         <api:type>${formatter.format_type(node.retval.type) | x}</api:type>
       </api:returns>
-      <api:name>${node.symbol}</api:name>
+      <api:name>${formatter.format_function_name(node)}</api:name>
 % for arg in node.all_parameters:
 % if arg.type.ctype == '<varargs>':
       <api:varargs/>
@@ -24,13 +24,13 @@
 </%block>
 <%block name="synopsis">
 <synopsis><code mime="text/x-csrc">
-${node.retval.type.ctype} ${node.symbol} (\
+${node.retval.type.ctype} ${formatter.format_function_name(node)} (\
 % if len(node.all_parameters) == 0:
 void\
 % else:
 % for arg, ix in zip(node.all_parameters, range(len(node.all_parameters))):
 % if ix != 0:
-${' ' * (len(formatter.format_type(node.retval.type)) + len(node.symbol) + 3)}\
+${' ' * (len(formatter.format_type(node.retval.type)) + len(formatter.format_function_name(node)) + 3)}\
 % endif
 % if arg.type.ctype == '<varargs>':
 ...\
diff --git a/giscanner/doctemplates/C/signal.tmpl b/giscanner/doctemplates/C/signal.tmpl
index e3eb0511..20e28e18 100644
--- a/giscanner/doctemplates/C/signal.tmpl
+++ b/giscanner/doctemplates/C/signal.tmpl
@@ -1,4 +1,4 @@
-<%inherit file="/base.tmpl"/>
+<%inherit file="./function.tmpl"/>
 <%block name="info">
     <link type="guide" xref="${namespace.name}.${node.parent.name}" group="property"/>
     <title type="link" role="topic">${node.name}</title>
diff --git a/giscanner/doctemplates/C/vfunc.tmpl b/giscanner/doctemplates/C/vfunc.tmpl
index 902b8864..85427de8 100644
--- a/giscanner/doctemplates/C/vfunc.tmpl
+++ b/giscanner/doctemplates/C/vfunc.tmpl
@@ -1,22 +1,4 @@
-<%inherit file="/base.tmpl"/>
+<%inherit file="./function.tmpl"/>
 <%block name="info">
     <link type="guide" xref="${namespace.name}.${node.parent.name}" group="vfunc"/>
 </%block>
-<%block name="synopsis">
-<synopsis><code mime="text/x-csrc">
-</code></synopsis>
-</%block>
-<%block name="details">
-% if node.parameters or node.retval:
-<dl>
-% for arg, ix in zip(node.parameters, range(len(node.parameters))):
-<dt><p>${arg.argname} :</p></dt>
-<dd>${formatter.format(node, arg.doc)}</dd>
-% endfor
-% if node.retval:
-<dt><p>Returns :</p></dt>
-<dd>${formatter.format(node, node.retval.doc)}</dd>
-% endif
-</dl>
-% endif
-</%block>