summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2013-02-15 08:16:16 -0500
committerJasper St. Pierre <jstpierre@mecheye.net>2013-02-15 08:18:51 -0500
commit6727ebea5bcd2d823fb05c0df67efff4e77436ea (patch)
tree68874143eba74c431252c9a1d7062d6a9f4a615c
parent34f697e552c648efa1f0f6350cdbc80cd346a1e4 (diff)
downloadgobject-introspection-6727ebea5bcd2d823fb05c0df67efff4e77436ea.tar.gz
doctool: Don't put curly braces around the construct props if there are none
-rw-r--r--giscanner/doctemplates/Gjs/class.tmpl8
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page3
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page3
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page3
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page3
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page3
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page3
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page3
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page3
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page3
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page3
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page3
12 files changed, 17 insertions, 24 deletions
diff --git a/giscanner/doctemplates/Gjs/class.tmpl b/giscanner/doctemplates/Gjs/class.tmpl
index 5882d9fa..457361c7 100644
--- a/giscanner/doctemplates/Gjs/class.tmpl
+++ b/giscanner/doctemplates/Gjs/class.tmpl
@@ -3,12 +3,16 @@
<synopsis><code>
const ${namespace.name} = imports.gi.${namespace.name};
-let ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}({
+let ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\
+% if len(node.properties) > 0:
+{
% for ix, property_ in enumerate(node.properties):
% if property_.construct or property_.construct_only or property_.writable:
<link xref='${namespace.name}.${node.name}-${property_.name}'>${property_.name.replace('-', '_')}</link>: value,
% endif
% endfor
-});
+}\
+% endif
+);
</code></synopsis>
</%block>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page
index 1220e811..747301b8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let foo_buffer = Regress.FooBuffer({
-});
+let foo_buffer = Regress.FooBuffer();
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page
index 8e182705..556fe990 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let foo_interface = Regress.FooInterface({
-});
+let foo_interface = Regress.FooInterface();
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page
index b007600f..deba4902 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let foo_other_object = Regress.FooOtherObject({
-});
+let foo_other_object = Regress.FooOtherObject();
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page
index de032148..03f6888d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let foo_sub_interface = Regress.FooSubInterface({
-});
+let foo_sub_interface = Regress.FooSubInterface();
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page
index 244f994d..fa90c907 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let foo_subobject = Regress.FooSubobject({
-});
+let foo_subobject = Regress.FooSubobject();
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page
index 1d78cd77..4aaa02d2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let test_floating = Regress.TestFloating({
-});
+let test_floating = Regress.TestFloating();
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page
index 73312d2c..9b06769f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let test_fundamental_object = Regress.TestFundamentalObject({
-});
+let test_fundamental_object = Regress.TestFundamentalObject();
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page
index 93d6152c..19d0c4b6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let test_fundamental_sub_object = Regress.TestFundamentalSubObject({
-});
+let test_fundamental_sub_object = Regress.TestFundamentalSubObject();
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page
index d7ac0c5a..f3efc9d8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let test_inherit_drawable = Regress.TestInheritDrawable({
-});
+let test_inherit_drawable = Regress.TestInheritDrawable();
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page
index de64aad9..a91a5d1d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let test_interface = Regress.TestInterface({
-});
+let test_interface = Regress.TestInterface();
</code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page
index 9e0566e1..5aaae32e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page
@@ -15,8 +15,7 @@
<synopsis><code>
const Regress = imports.gi.Regress;
-let test_sub_obj = Regress.TestSubObj({
-});
+let test_sub_obj = Regress.TestSubObj();
</code></synopsis>