removed the viewmodel aspects of the qtqml generator. Still readonly properties are not supported yet. - later

5 files changed, 11 insertions, 32 deletions

diff --git a/qface/builtin/qtqml/qtqml.py b/qface/builtin/qtqml/qtqml.py
index 224b4c2..47e780b 100644
--- a/qface/builtin/qtqml/qtqml.py
+++ b/qface/builtin/qtqml/qtqml.py
@@ -46,7 +46,6 @@ def run(src, dst):
             })
             generator.write('private/Abstract{{interface}}.qml', 'AbstractInterface.qml', ctx)
             generator.write('{{interface}}.qml', 'Interface.qml', ctx, preserve=True)
-            generator.write('private/{{interface}}Provider.qml', 'InterfaceProvider.qml', ctx)
 
 
 @click.command()
diff --git a/qface/builtin/qtqml/templates/AbstractInterface.qml b/qface/builtin/qtqml/templates/AbstractInterface.qml
index d36aa5a..2b394f3 100644
--- a/qface/builtin/qtqml/templates/AbstractInterface.qml
+++ b/qface/builtin/qtqml/templates/AbstractInterface.qml
@@ -8,13 +8,21 @@ QtObject {
     id: root
     {% for property in interface.properties %}
     {{property.comment}}
-    readonly property {{property|propertyType}} {{property}} : _provider.{{property}}
+    property {{property|propertyType}} {{property}} : {{property|defaultValue}}
     {% endfor %}
 
     {% for operation in interface.operations %}
     {{operation.comment}}
-    readonly property var {{operation}} : _provider.{{operation}}
+    property var {{operation}} : function({{operation.parameters|join(', ')}}) {}
+    {% endfor %}
+
+    {% for event in interface.events %}
+    signal {{event}}(
+        {%- for parameter in event.parameters %}
+            {{- parameter.type|propertyType }} {{ parameter.name -}}
+            {% if not loop.last %}, {% endif %}
+        {% endfor -%}
+    )
     {% endfor %}
 
-    property {{interface}}Provider _provider: {{interface}}Provider {}
 }
diff --git a/qface/builtin/qtqml/templates/Interface.qml b/qface/builtin/qtqml/templates/Interface.qml
index dae8810..2dc9d5f 100644
--- a/qface/builtin/qtqml/templates/Interface.qml
+++ b/qface/builtin/qtqml/templates/Interface.qml
@@ -4,8 +4,4 @@ import "private"
 
 Abstract{{interface}} {
     id: root
-
-    _provider : {{interface}}Provider {
-        // Add your code here        
-    }
 }
diff --git a/qface/builtin/qtqml/templates/InterfaceProvider.qml b/qface/builtin/qtqml/templates/InterfaceProvider.qml
deleted file mode 100644
index bbcaaf5..0000000
--- a/qface/builtin/qtqml/templates/InterfaceProvider.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import QtQml 2.2
-import QtQml.Models 2.2
-
-import "."
-
-QtObject {
-    {% for property in interface.properties %}
-    property {{property|propertyType}} {{property}} : {{property|defaultValue}}
-    {% endfor %}
-
-    {% for operation in interface.operations %}
-    property var {{operation}} : function({{operation.parameters|join(', ')}}) {}
-    {% endfor %}
-
-    {% for event in interface.events %}
-    signal {{event}}(
-        {%- for parameter in event.parameters %}
-            {{- parameter.type|propertyType }} {{ parameter.name -}}
-            {% if not loop.last %}, {% endif %}
-        {% endfor -%}
-    )
-    {% endfor %}
-}
diff --git a/qface/builtin/qtqml/templates/private_qmldir b/qface/builtin/qtqml/templates/private_qmldir
index 5cd42a6..152af67 100644
--- a/qface/builtin/qtqml/templates/private_qmldir
+++ b/qface/builtin/qtqml/templates/private_qmldir
@@ -1,5 +1,4 @@
 {{module_name}}Module 1.0 {{module_name}}Module.js
 {% for interface in module.interfaces %}
 Abstract{{interface}} 1.0 Abstract{{interface}}.qml
-{{interface}}Provider 1.0 {{interface}}Provider.qml
 {% endfor %}