diff options
author | Juergen Bocklage-Ryannel <jbocklage-ryannel@luxoft.com> | 2017-07-20 11:27:22 +0200 |
---|---|---|
committer | Juergen Bocklage-Ryannel <jbocklage-ryannel@luxoft.com> | 2017-07-20 11:27:22 +0200 |
commit | b1182e104fc0ada4b07f2e0ca9e8c8d36837727e (patch) | |
tree | 49c418903b3019418c6be07d2c6e0cfce161a476 | |
parent | 90e310715aa282542a8a4d39b1c7ac63043e4ae1 (diff) | |
download | qtivi-qface-b1182e104fc0ada4b07f2e0ca9e8c8d36837727e.tar.gz |
update signal macro to allow to add postfix, e.g. for
property signal naming
-rw-r--r-- | qface/templates/qface/qtcpp.j2 | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/qface/templates/qface/qtcpp.j2 b/qface/templates/qface/qtcpp.j2 index 81b7d7a..bf7824f 100644 --- a/qface/templates/qface/qtcpp.j2 +++ b/qface/templates/qface/qtcpp.j2 @@ -20,14 +20,10 @@ virtual void set{{property|upperfirst}}({{ property|parameterType }}); virtual {{property|returnType}} {{property}}() const; {%- endmacro %} -{% macro signal_decl(symbol) -%} -{% if symbol.is_property %} -void {{symbol}}Changed({{symbol|parameters}}); -{% else %} -void {{symbol}}({{symbol|parameters}}); -{%- endif %} - +{% macro signal_decl(symbol, postfix="") -%} +void {{symbol}}{{postfix}}({{symbol|parameters}}); {%- endmacro %} + {% macro property_member_decl(property) %} {{property|returnType}} m_{{property}}; {%- endmacro %} @@ -44,11 +40,10 @@ void {{symbol}}({{symbol|parameters}}); void {{class}}::set{{property|upperfirst}}({{ property|parameterType }}) { - if(m_{{property}} == {{property}}) { - return; + if (m_{{property}} != {{property}}) { + m_{{property}} = {{property}}; + emit {{property}}Changed({{property}}); } - m_{{property}} = {{property}}; - emit {{property}}Changed(); } {%- endmacro %} |