summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Bocklage-Ryannel <juergen.bocklage-ryannel@pelagicore.com>2017-02-03 10:11:50 +0100
committerJuergen Bocklage-Ryannel <juergen.bocklage-ryannel@pelagicore.com>2017-02-03 10:11:50 +0100
commitb2f8a3ff91936726251abf77ab0da2712b6218e5 (patch)
treec9723cb99bb025c0751b0807ba0c852c51d88631
parentfccdb3979739a310a30ab087be83641df8ed311f (diff)
downloadqtivi-qface-b2f8a3ff91936726251abf77ab0da2712b6218e5.tar.gz
Added support for signals to the qtcpp and qtqml generators. Was mostly missing since the beginning.
-rw-r--r--qface/builtin/qtcpp/templates/abstractinterface.h3
-rw-r--r--qface/builtin/qtqml/templates/AbstractInterface.qml6
2 files changed, 6 insertions, 3 deletions
diff --git a/qface/builtin/qtcpp/templates/abstractinterface.h b/qface/builtin/qtcpp/templates/abstractinterface.h
index c004f29..09a21a6 100644
--- a/qface/builtin/qtcpp/templates/abstractinterface.h
+++ b/qface/builtin/qtcpp/templates/abstractinterface.h
@@ -39,6 +39,9 @@ public:
{% endfor %}
Q_SIGNALS:
+{% for signal in interface.signals %}
+ void {{signal}}({{signal.parameters|map('parameterType')|join(', ')}});
+{% endfor %}
{% for property in interface.properties %}
void {{property}}Changed();
{% endfor %}
diff --git a/qface/builtin/qtqml/templates/AbstractInterface.qml b/qface/builtin/qtqml/templates/AbstractInterface.qml
index 95134e4..b28d6b7 100644
--- a/qface/builtin/qtqml/templates/AbstractInterface.qml
+++ b/qface/builtin/qtqml/templates/AbstractInterface.qml
@@ -15,9 +15,9 @@ QtObject {
property var {{operation}} : function({{operation.parameters|join(', ')}}) {}
{% endfor %}
-{% for event in interface.events %}
- signal {{event}}(
- {%- for parameter in event.parameters %}
+{% for signal in interface.signals %}
+ signal {{signal}}(
+ {%- for parameter in signal.parameters %}
{{- parameter.type|propertyType }} {{ parameter.name -}}
{% if not loop.last %}, {% endif %}
{% endfor -%}