ivigenerator: Move all templates into a separate 'templates' folder

Currently all builtin templates are hardcoded in generate.py and
the templates are next to the generate.py, including a rather ugly
'template_' prefix in the folder name and yaml file.
To make this more clean, all templates are moved into a 'templates'
folder and renamed to remove the prefix.

The templates are also not hardcoded anymore in generate.py and instead
the 'templates' folder is scanned for them. This also makes it possible
for the user to install their own templates into the same folder and
make them behave like builtin templates.

Change-Id: I27d581df8f4850db6918c5b350ce41c4a35175f4
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

67 files changed, 92 insertions, 87 deletions

diff --git a/src/tools/ivigenerator/generate.py b/src/tools/ivigenerator/generate.py
index db05e0d..8f06566 100755
--- a/src/tools/ivigenerator/generate.py
+++ b/src/tools/ivigenerator/generate.py
@@ -41,6 +41,7 @@
 
 import re
 import os
+import fnmatch
 import click
 import logging.config
 import yaml
@@ -63,8 +64,8 @@ here = Path(__file__).dirname()
 log = logging.getLogger(__file__)
 
 currentQFaceSrcFile = ''
-
-IVI_DEFAULT_TEMPLATES = ['frontend', 'qmlplugin', 'backend_simulator', 'backend_qtro', 'server_qtro', 'server_qtro_simulator', 'test']
+builtinTemplatesPath = Path(here / 'templates')
+builtinTemplates = [os.path.splitext(f)[0] for f in os.listdir(builtinTemplatesPath) if fnmatch.fnmatch(f, '*.yaml')]
 
 def generate(tplconfig, moduleConfig, annotations, imports, src, dst):
     log.debug('run {0} {1}'.format(src, dst))
@@ -88,7 +89,7 @@ def generate(tplconfig, moduleConfig, annotations, imports, src, dst):
             print('no such annotation file: {0}'.format(annotations_file))
             exit(1)
         FileSystem.merge_annotations(system, Path(annotations_file))
-    generator = Generator(search_path=[tplconfig, here])
+    generator = Generator(search_path=[tplconfig, builtinTemplatesPath])
     generator.env.keep_trailing_newline = True
 
     register_global_functions(generator)
@@ -164,20 +165,20 @@ def generate(tplconfig, moduleConfig, annotations, imports, src, dst):
 
 
 def run(format, moduleConfig, annotations, imports, src, dst):
-    if format in IVI_DEFAULT_TEMPLATES:
-        tplConfig = 'templates_{0}'.format(format)
-        generate(here / tplConfig, moduleConfig, annotations, imports, src, dst)
-    else:
-        if os.path.exists(format):
-            generate(format, moduleConfig, annotations, imports, src, dst)
-        else:
-            print('Format "{0}" is invalid. Should be one of {1} or an existing template folder'.format(format, IVI_DEFAULT_TEMPLATES))
-            exit(1)
+    templatePath = format
+    if format in builtinTemplates:
+        templatePath = builtinTemplatesPath / format
 
+    if os.path.exists(templatePath):
+        generate(templatePath, moduleConfig, annotations, imports, src, dst)
+    else:
+        print('Invalid Format: {0}. It either needs to be one of the builtin formats or an existing '
+            'template folder. The following builtin formats are available: {1}'.format(format, builtinTemplates))
+        exit(1)
 
 @click.command()
 @click.option('--reload/--no-reload', default=False, help='Specifies whether the generator should keep track of the changes in the IDL file and update output on the fly (--no-reload by default).')
-@click.option('--format', '-f', multiple=False, help='The format the autogenerator should use for the generation. This can either be one of the builtin formats or a path to a template folder. Builtin formats are: \n' + '\n'.join(IVI_DEFAULT_TEMPLATES))
+@click.option('--format', '-f', multiple=False, help='The format the autogenerator should use for the generation. This can either be one of the builtin formats or a path to a template folder. Builtin formats are: \n' + '\n'.join(builtinTemplates))
 @click.option('--module', default=False, help='The name of the Qt module the autogenerator is generating. This is automatically used by the qmake integration and passed directly to the qface templates.')
 @click.option('--force', is_flag=True, default=False, help='Always write all output files')
 @click.option('--annotations', '-A', multiple=True, default=False, help=
diff --git a/src/tools/ivigenerator/ivigenerator.pro b/src/tools/ivigenerator/ivigenerator.pro
index 00a71a1..1ffd7bf 100644
--- a/src/tools/ivigenerator/ivigenerator.pro
+++ b/src/tools/ivigenerator/ivigenerator.pro
@@ -12,86 +12,93 @@ QT_FOR_CONFIG += ivicore
 CONFIG -= debug_and_release
 
 common.files += \
-    common/generated_comment.cpp.tpl \
-    common/qtivi_macros.j2 \
-    common/simulation.qmltypes.tpl \
-    common/plugins.qmltypes.tpl \
-    common/qmldir.tpl \
-    common/interface.rep.tpl \
-    common/simulation_data.json.tpl \
-    common/simulation.qrc.tpl \
-    common/module_simulation.qml.tpl \
-    common/backend_simulation.cpp.tpl \
-    common/backend_simulation.h.tpl \
-    common/backend_simulation.qml.tpl \
-    common/pagingmodel_simulation.h.tpl \
-    common/pagingmodel_simulation.cpp.tpl
-common.path = $$[QT_HOST_BINS]/ivigenerator/common
+    templates/common/generated_comment.cpp.tpl \
+    templates/common/qtivi_macros.j2 \
+    templates/common/simulation.qmltypes.tpl \
+    templates/common/plugins.qmltypes.tpl \
+    templates/common/qmldir.tpl \
+    templates/common/interface.rep.tpl \
+    templates/common/simulation_data.json.tpl \
+    templates/common/simulation.qrc.tpl \
+    templates/common/module_simulation.qml.tpl \
+    templates/common/backend_simulation.cpp.tpl \
+    templates/common/backend_simulation.h.tpl \
+    templates/common/backend_simulation.qml.tpl \
+    templates/common/pagingmodel_simulation.h.tpl \
+    templates/common/pagingmodel_simulation.cpp.tpl
+common.path = $$[QT_HOST_BINS]/ivigenerator/templates/common
 
 templates_frontend.files +=  \
-    templates_frontend/backendinterface.cpp.tpl \
-    templates_frontend/backendinterface.h.tpl \
-    templates_frontend/global.h.tpl \
-    templates_frontend/interface.cpp.tpl \
-    templates_frontend/interface.h.tpl \
-    templates_frontend/interface_p.h.tpl \
-    templates_frontend/module.cpp.tpl \
-    templates_frontend/module.h.tpl \
-    templates_frontend/module_qml_enum.qdocinc.tpl \
-    templates_frontend/module.pri.tpl \
-    templates_frontend/modulefactory.cpp.tpl \
-    templates_frontend/modulefactory.h.tpl \
-    templates_frontend/struct.cpp.tpl \
-    templates_frontend/struct.h.tpl
-templates_frontend.path = $$[QT_HOST_BINS]/ivigenerator/templates_frontend
+    templates/frontend/backendinterface.cpp.tpl \
+    templates/frontend/backendinterface.h.tpl \
+    templates/frontend/global.h.tpl \
+    templates/frontend/interface.cpp.tpl \
+    templates/frontend/interface.h.tpl \
+    templates/frontend/interface_p.h.tpl \
+    templates/frontend/module.cpp.tpl \
+    templates/frontend/module.h.tpl \
+    templates/frontend/module_qml_enum.qdocinc.tpl \
+    templates/frontend/module.pri.tpl \
+    templates/frontend/modulefactory.cpp.tpl \
+    templates/frontend/modulefactory.h.tpl \
+    templates/frontend/struct.cpp.tpl \
+    templates/frontend/struct.h.tpl
+templates_frontend.path = $$[QT_HOST_BINS]/ivigenerator/templates/frontend
 
 templates_qmlplugin.files +=  \
-    templates_qmlplugin/module.pri.tpl \
-    templates_qmlplugin/plugin.cpp.tpl \
-    templates_qmlplugin/qmldir_plugin.tpl
-templates_qmlplugin.path = $$[QT_HOST_BINS]/ivigenerator/templates_qmlplugin
+    templates/qmlplugin/module.pri.tpl \
+    templates/qmlplugin/plugin.cpp.tpl \
+    templates/qmlplugin/qmldir_plugin.tpl
+templates_qmlplugin.path = $$[QT_HOST_BINS]/ivigenerator/templates/qmlplugin
 
 templates_backend_simulator.files += \
-    templates_backend_simulator/plugin.cpp.tpl \
-    templates_backend_simulator/plugin.h.tpl \
-    templates_backend_simulator/plugin.json \
-    templates_backend_simulator/plugin.pri.tpl \
-    templates_backend_simulator/plugin.pro
-templates_backend_simulator.path = $$[QT_HOST_BINS]/ivigenerator/templates_backend_simulator
+    templates/backend_simulator/plugin.cpp.tpl \
+    templates/backend_simulator/plugin.h.tpl \
+    templates/backend_simulator/plugin.json \
+    templates/backend_simulator/plugin.pri.tpl \
+    templates/backend_simulator/plugin.pro
+templates_backend_simulator.path = $$[QT_HOST_BINS]/ivigenerator/templates/backend_simulator
 
 templates_backend_qtro.files += \
-    templates_backend_qtro/backend.cpp.tpl \
-    templates_backend_qtro/backend.h.tpl \
-    templates_backend_qtro/pagingmodel.h.tpl \
-    templates_backend_qtro/pagingmodel.cpp.tpl \
-    templates_backend_qtro/plugin.cpp.tpl \
-    templates_backend_qtro/plugin.h.tpl \
-    templates_backend_qtro/plugin.json \
-    templates_backend_qtro/plugin.pri.tpl
-templates_backend_qtro.path = $$[QT_HOST_BINS]/ivigenerator/templates_backend_qtro
+    templates/backend_qtro/backend.cpp.tpl \
+    templates/backend_qtro/backend.h.tpl \
+    templates/backend_qtro/pagingmodel.h.tpl \
+    templates/backend_qtro/pagingmodel.cpp.tpl \
+    templates/backend_qtro/plugin.cpp.tpl \
+    templates/backend_qtro/plugin.h.tpl \
+    templates/backend_qtro/plugin.json \
+    templates/backend_qtro/plugin.pri.tpl
+templates_backend_qtro.path = $$[QT_HOST_BINS]/ivigenerator/templates/backend_qtro
 
 templates_server_qtro.files += \
-    templates_server_qtro/core.cpp.tpl \
-    templates_server_qtro/core.h.tpl \
-    templates_server_qtro/server.pri.tpl
-templates_server_qtro.path = $$[QT_HOST_BINS]/ivigenerator/templates_server_qtro
+    templates/server_qtro/core.cpp.tpl \
+    templates/server_qtro/core.h.tpl \
+    templates/server_qtro/server.pri.tpl
+templates_server_qtro.path = $$[QT_HOST_BINS]/ivigenerator/templates/server_qtro
 
 templates_server_qtro_simulator.files += \
-    templates_server_qtro_simulator/core.cpp.tpl \
-    templates_server_qtro_simulator/core.h.tpl \
-    templates_server_qtro_simulator/adapter.cpp.tpl \
-    templates_server_qtro_simulator/adapter.h.tpl \
-    templates_server_qtro_simulator/main.cpp.tpl \
-    templates_server_qtro_simulator/server.pri.tpl
-templates_server_qtro_simulator.path = $$[QT_HOST_BINS]/ivigenerator/templates_server_qtro_simulator
+    templates/server_qtro_simulator/core.cpp.tpl \
+    templates/server_qtro_simulator/core.h.tpl \
+    templates/server_qtro_simulator/adapter.cpp.tpl \
+    templates/server_qtro_simulator/adapter.h.tpl \
+    templates/server_qtro_simulator/main.cpp.tpl \
+    templates/server_qtro_simulator/server.pri.tpl
+templates_server_qtro_simulator.path = $$[QT_HOST_BINS]/ivigenerator/templates/server_qtro_simulator
 
 templates_test.files += \
-    templates_test/tst_test.h.tpl \
-    templates_test/tst_test.cpp.tpl \
-    templates_test/module.pri.tpl \
-    templates_test/main.cpp.tpl \
-    templates_test/pagingmodel.h.tpl
-templates_test.path = $$[QT_HOST_BINS]/ivigenerator/templates_test
+    templates/test/tst_test.h.tpl \
+    templates/test/tst_test.cpp.tpl \
+    templates/test/module.pri.tpl \
+    templates/test/main.cpp.tpl \
+    templates/test/pagingmodel.h.tpl
+templates_test.path = $$[QT_HOST_BINS]/ivigenerator/templates/test
+
+templates_yaml.files += \
+    templates/frontend.yaml \
+    templates/qmlplugin.yaml \
+    templates/backend_simulator.yaml \
+    templates/test.yaml
+templates_yaml.path = $$[QT_HOST_BINS]/ivigenerator/templates
 
 generator_module.files += \
     generator/global_functions.py \
@@ -101,17 +108,13 @@ generator_module.path = $$[QT_HOST_BINS]/ivigenerator/generator
 
 generator.files += \
     generate.py \
-    $$OUT_PWD/.config \
-    templates_frontend.yaml \
-    templates_qmlplugin.yaml \
-    templates_backend_simulator.yaml \
-    templates_test.yaml
+    $$OUT_PWD/.config
 generator.path = $$[QT_HOST_BINS]/ivigenerator
 
 qtConfig(remoteobjects) {
-    generator.files += templates_backend_qtro.yaml \
-                       templates_server_qtro.yaml \
-                       templates_server_qtro_simulator.yaml \
+    templates_yaml.files += templates/backend_qtro.yaml \
+                       templates/server_qtro.yaml \
+                       templates/server_qtro_simulator.yaml \
 
     INSTALLS += templates_backend_qtro \
                 templates_server_qtro \
@@ -121,6 +124,7 @@ qtConfig(remoteobjects) {
 
 INSTALLS += generator \
     generator_module \
+    templates_yaml \
     common \
     templates_frontend \
     templates_qmlplugin \
diff --git a/src/tools/ivigenerator/templates_backend_qtro.yaml b/src/tools/ivigenerator/templates/backend_qtro.yaml
index c0acde6..c0acde6 100644
--- a/src/tools/ivigenerator/templates_backend_qtro.yaml
+++ b/src/tools/ivigenerator/templates/backend_qtro.yaml
diff --git a/src/tools/ivigenerator/templates_backend_qtro/backend.cpp.tpl b/src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl
index 5a46282..5a46282 100644
--- a/src/tools/ivigenerator/templates_backend_qtro/backend.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_backend_qtro/backend.h.tpl b/src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl
index 74ee93e..74ee93e 100644
--- a/src/tools/ivigenerator/templates_backend_qtro/backend.h.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl
diff --git a/src/tools/ivigenerator/templates_backend_qtro/pagingmodel.cpp.tpl b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl
index b9e7558..b9e7558 100644
--- a/src/tools/ivigenerator/templates_backend_qtro/pagingmodel.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_backend_qtro/pagingmodel.h.tpl b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.h.tpl
index 740298f..740298f 100644
--- a/src/tools/ivigenerator/templates_backend_qtro/pagingmodel.h.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.h.tpl
diff --git a/src/tools/ivigenerator/templates_backend_qtro/plugin.cpp.tpl b/src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl
index 2224ec8..2224ec8 100644
--- a/src/tools/ivigenerator/templates_backend_qtro/plugin.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/plugin.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_backend_qtro/plugin.h.tpl b/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl
index bc8ddc5..bc8ddc5 100644
--- a/src/tools/ivigenerator/templates_backend_qtro/plugin.h.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl
diff --git a/src/tools/ivigenerator/templates_backend_qtro/plugin.json b/src/tools/ivigenerator/templates/backend_qtro/plugin.json
index b205459..b205459 100644
--- a/src/tools/ivigenerator/templates_backend_qtro/plugin.json
+++ b/src/tools/ivigenerator/templates/backend_qtro/plugin.json
diff --git a/src/tools/ivigenerator/templates_backend_qtro/plugin.pri.tpl b/src/tools/ivigenerator/templates/backend_qtro/plugin.pri.tpl
index e1372da..e1372da 100644
--- a/src/tools/ivigenerator/templates_backend_qtro/plugin.pri.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/plugin.pri.tpl
diff --git a/src/tools/ivigenerator/templates_backend_simulator.yaml b/src/tools/ivigenerator/templates/backend_simulator.yaml
index 4c47848..4c47848 100644
--- a/src/tools/ivigenerator/templates_backend_simulator.yaml
+++ b/src/tools/ivigenerator/templates/backend_simulator.yaml
diff --git a/src/tools/ivigenerator/templates_backend_simulator/plugin.cpp.tpl b/src/tools/ivigenerator/templates/backend_simulator/plugin.cpp.tpl
index 710c504..710c504 100644
--- a/src/tools/ivigenerator/templates_backend_simulator/plugin.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_simulator/plugin.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_backend_simulator/plugin.h.tpl b/src/tools/ivigenerator/templates/backend_simulator/plugin.h.tpl
index dfb86b1..dfb86b1 100644
--- a/src/tools/ivigenerator/templates_backend_simulator/plugin.h.tpl
+++ b/src/tools/ivigenerator/templates/backend_simulator/plugin.h.tpl
diff --git a/src/tools/ivigenerator/templates_backend_simulator/plugin.json b/src/tools/ivigenerator/templates/backend_simulator/plugin.json
index 146b83a..146b83a 100644
--- a/src/tools/ivigenerator/templates_backend_simulator/plugin.json
+++ b/src/tools/ivigenerator/templates/backend_simulator/plugin.json
diff --git a/src/tools/ivigenerator/templates_backend_simulator/plugin.pri.tpl b/src/tools/ivigenerator/templates/backend_simulator/plugin.pri.tpl
index 2ad5932..2ad5932 100644
--- a/src/tools/ivigenerator/templates_backend_simulator/plugin.pri.tpl
+++ b/src/tools/ivigenerator/templates/backend_simulator/plugin.pri.tpl
diff --git a/src/tools/ivigenerator/templates_backend_simulator/plugin.pro b/src/tools/ivigenerator/templates/backend_simulator/plugin.pro
index dd96eb2..dd96eb2 100644
--- a/src/tools/ivigenerator/templates_backend_simulator/plugin.pro
+++ b/src/tools/ivigenerator/templates/backend_simulator/plugin.pro
diff --git a/src/tools/ivigenerator/common/backend_simulation.cpp.tpl b/src/tools/ivigenerator/templates/common/backend_simulation.cpp.tpl
index 9ee929e..9ee929e 100644
--- a/src/tools/ivigenerator/common/backend_simulation.cpp.tpl
+++ b/src/tools/ivigenerator/templates/common/backend_simulation.cpp.tpl
diff --git a/src/tools/ivigenerator/common/backend_simulation.h.tpl b/src/tools/ivigenerator/templates/common/backend_simulation.h.tpl
index 73dbd5c..73dbd5c 100644
--- a/src/tools/ivigenerator/common/backend_simulation.h.tpl
+++ b/src/tools/ivigenerator/templates/common/backend_simulation.h.tpl
diff --git a/src/tools/ivigenerator/common/backend_simulation.qml.tpl b/src/tools/ivigenerator/templates/common/backend_simulation.qml.tpl
index 2cbbd11..2cbbd11 100644
--- a/src/tools/ivigenerator/common/backend_simulation.qml.tpl
+++ b/src/tools/ivigenerator/templates/common/backend_simulation.qml.tpl
diff --git a/src/tools/ivigenerator/common/generated_comment.cpp.tpl b/src/tools/ivigenerator/templates/common/generated_comment.cpp.tpl
index 95878f2..95878f2 100644
--- a/src/tools/ivigenerator/common/generated_comment.cpp.tpl
+++ b/src/tools/ivigenerator/templates/common/generated_comment.cpp.tpl
diff --git a/src/tools/ivigenerator/common/interface.rep.tpl b/src/tools/ivigenerator/templates/common/interface.rep.tpl
index dd75f03..dd75f03 100644
--- a/src/tools/ivigenerator/common/interface.rep.tpl
+++ b/src/tools/ivigenerator/templates/common/interface.rep.tpl
diff --git a/src/tools/ivigenerator/common/module_simulation.qml.tpl b/src/tools/ivigenerator/templates/common/module_simulation.qml.tpl
index ff558d8..ff558d8 100644
--- a/src/tools/ivigenerator/common/module_simulation.qml.tpl
+++ b/src/tools/ivigenerator/templates/common/module_simulation.qml.tpl
diff --git a/src/tools/ivigenerator/common/pagingmodel_simulation.cpp.tpl b/src/tools/ivigenerator/templates/common/pagingmodel_simulation.cpp.tpl
index a6b222e..a6b222e 100644
--- a/src/tools/ivigenerator/common/pagingmodel_simulation.cpp.tpl
+++ b/src/tools/ivigenerator/templates/common/pagingmodel_simulation.cpp.tpl
diff --git a/src/tools/ivigenerator/common/pagingmodel_simulation.h.tpl b/src/tools/ivigenerator/templates/common/pagingmodel_simulation.h.tpl
index ace6a72..ace6a72 100644
--- a/src/tools/ivigenerator/common/pagingmodel_simulation.h.tpl
+++ b/src/tools/ivigenerator/templates/common/pagingmodel_simulation.h.tpl
diff --git a/src/tools/ivigenerator/common/plugins.qmltypes.tpl b/src/tools/ivigenerator/templates/common/plugins.qmltypes.tpl
index 5480e2e..5480e2e 100644
--- a/src/tools/ivigenerator/common/plugins.qmltypes.tpl
+++ b/src/tools/ivigenerator/templates/common/plugins.qmltypes.tpl
diff --git a/src/tools/ivigenerator/common/qmldir.tpl b/src/tools/ivigenerator/templates/common/qmldir.tpl
index 4ed2cd6..4ed2cd6 100644
--- a/src/tools/ivigenerator/common/qmldir.tpl
+++ b/src/tools/ivigenerator/templates/common/qmldir.tpl
diff --git a/src/tools/ivigenerator/common/qtivi_macros.j2 b/src/tools/ivigenerator/templates/common/qtivi_macros.j2
index be326b5..be326b5 100644
--- a/src/tools/ivigenerator/common/qtivi_macros.j2
+++ b/src/tools/ivigenerator/templates/common/qtivi_macros.j2
diff --git a/src/tools/ivigenerator/common/simulation.qmltypes.tpl b/src/tools/ivigenerator/templates/common/simulation.qmltypes.tpl
index 80173c8..80173c8 100644
--- a/src/tools/ivigenerator/common/simulation.qmltypes.tpl
+++ b/src/tools/ivigenerator/templates/common/simulation.qmltypes.tpl
diff --git a/src/tools/ivigenerator/common/simulation.qrc.tpl b/src/tools/ivigenerator/templates/common/simulation.qrc.tpl
index 151a7ec..151a7ec 100644
--- a/src/tools/ivigenerator/common/simulation.qrc.tpl
+++ b/src/tools/ivigenerator/templates/common/simulation.qrc.tpl
diff --git a/src/tools/ivigenerator/common/simulation_data.json.tpl b/src/tools/ivigenerator/templates/common/simulation_data.json.tpl
index 57cee12..57cee12 100644
--- a/src/tools/ivigenerator/common/simulation_data.json.tpl
+++ b/src/tools/ivigenerator/templates/common/simulation_data.json.tpl
diff --git a/src/tools/ivigenerator/templates_frontend.yaml b/src/tools/ivigenerator/templates/frontend.yaml
index c455e21..c455e21 100644
--- a/src/tools/ivigenerator/templates_frontend.yaml
+++ b/src/tools/ivigenerator/templates/frontend.yaml
diff --git a/src/tools/ivigenerator/templates_frontend/backendinterface.cpp.tpl b/src/tools/ivigenerator/templates/frontend/backendinterface.cpp.tpl
index b13be0a..b13be0a 100644
--- a/src/tools/ivigenerator/templates_frontend/backendinterface.cpp.tpl
+++ b/src/tools/ivigenerator/templates/frontend/backendinterface.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/backendinterface.h.tpl b/src/tools/ivigenerator/templates/frontend/backendinterface.h.tpl
index 2eb9b97..2eb9b97 100644
--- a/src/tools/ivigenerator/templates_frontend/backendinterface.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/backendinterface.h.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/global.h.tpl b/src/tools/ivigenerator/templates/frontend/global.h.tpl
index 7ebbf64..7ebbf64 100644
--- a/src/tools/ivigenerator/templates_frontend/global.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/global.h.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/interface.cpp.tpl b/src/tools/ivigenerator/templates/frontend/interface.cpp.tpl
index 40a9b3c..40a9b3c 100644
--- a/src/tools/ivigenerator/templates_frontend/interface.cpp.tpl
+++ b/src/tools/ivigenerator/templates/frontend/interface.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/interface.h.tpl b/src/tools/ivigenerator/templates/frontend/interface.h.tpl
index e1dc448..e1dc448 100644
--- a/src/tools/ivigenerator/templates_frontend/interface.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/interface.h.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/interface_p.h.tpl b/src/tools/ivigenerator/templates/frontend/interface_p.h.tpl
index 0a68644..0a68644 100644
--- a/src/tools/ivigenerator/templates_frontend/interface_p.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/interface_p.h.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/module.cpp.tpl b/src/tools/ivigenerator/templates/frontend/module.cpp.tpl
index 1e17757..1e17757 100644
--- a/src/tools/ivigenerator/templates_frontend/module.cpp.tpl
+++ b/src/tools/ivigenerator/templates/frontend/module.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/module.h.tpl b/src/tools/ivigenerator/templates/frontend/module.h.tpl
index a203e92..a203e92 100644
--- a/src/tools/ivigenerator/templates_frontend/module.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/module.h.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/module.pri.tpl b/src/tools/ivigenerator/templates/frontend/module.pri.tpl
index acd167f..acd167f 100644
--- a/src/tools/ivigenerator/templates_frontend/module.pri.tpl
+++ b/src/tools/ivigenerator/templates/frontend/module.pri.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/module_qml_enum.qdocinc.tpl b/src/tools/ivigenerator/templates/frontend/module_qml_enum.qdocinc.tpl
index 65e4f88..65e4f88 100644
--- a/src/tools/ivigenerator/templates_frontend/module_qml_enum.qdocinc.tpl
+++ b/src/tools/ivigenerator/templates/frontend/module_qml_enum.qdocinc.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/modulefactory.cpp.tpl b/src/tools/ivigenerator/templates/frontend/modulefactory.cpp.tpl
index dcffada..dcffada 100644
--- a/src/tools/ivigenerator/templates_frontend/modulefactory.cpp.tpl
+++ b/src/tools/ivigenerator/templates/frontend/modulefactory.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/modulefactory.h.tpl b/src/tools/ivigenerator/templates/frontend/modulefactory.h.tpl
index 306b728..306b728 100644
--- a/src/tools/ivigenerator/templates_frontend/modulefactory.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/modulefactory.h.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/struct.cpp.tpl b/src/tools/ivigenerator/templates/frontend/struct.cpp.tpl
index 7b4a57d..7b4a57d 100644
--- a/src/tools/ivigenerator/templates_frontend/struct.cpp.tpl
+++ b/src/tools/ivigenerator/templates/frontend/struct.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_frontend/struct.h.tpl b/src/tools/ivigenerator/templates/frontend/struct.h.tpl
index c9d4ea4..c9d4ea4 100644
--- a/src/tools/ivigenerator/templates_frontend/struct.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/struct.h.tpl
diff --git a/src/tools/ivigenerator/templates_qmlplugin.yaml b/src/tools/ivigenerator/templates/qmlplugin.yaml
index 136f3cd..136f3cd 100644
--- a/src/tools/ivigenerator/templates_qmlplugin.yaml
+++ b/src/tools/ivigenerator/templates/qmlplugin.yaml
diff --git a/src/tools/ivigenerator/templates_qmlplugin/module.pri.tpl b/src/tools/ivigenerator/templates/qmlplugin/module.pri.tpl
index 4bd7d05..4bd7d05 100644
--- a/src/tools/ivigenerator/templates_qmlplugin/module.pri.tpl
+++ b/src/tools/ivigenerator/templates/qmlplugin/module.pri.tpl
diff --git a/src/tools/ivigenerator/templates_qmlplugin/plugin.cpp.tpl b/src/tools/ivigenerator/templates/qmlplugin/plugin.cpp.tpl
index 0d5a492..0d5a492 100644
--- a/src/tools/ivigenerator/templates_qmlplugin/plugin.cpp.tpl
+++ b/src/tools/ivigenerator/templates/qmlplugin/plugin.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_qmlplugin/qmldir_plugin.tpl b/src/tools/ivigenerator/templates/qmlplugin/qmldir_plugin.tpl
index 3936fd6..3936fd6 100644
--- a/src/tools/ivigenerator/templates_qmlplugin/qmldir_plugin.tpl
+++ b/src/tools/ivigenerator/templates/qmlplugin/qmldir_plugin.tpl
diff --git a/src/tools/ivigenerator/templates_server_qtro.yaml b/src/tools/ivigenerator/templates/server_qtro.yaml
index 3dec840..3dec840 100644
--- a/src/tools/ivigenerator/templates_server_qtro.yaml
+++ b/src/tools/ivigenerator/templates/server_qtro.yaml
diff --git a/src/tools/ivigenerator/templates_server_qtro/core.cpp.tpl b/src/tools/ivigenerator/templates/server_qtro/core.cpp.tpl
index 1c3450a..1c3450a 100644
--- a/src/tools/ivigenerator/templates_server_qtro/core.cpp.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro/core.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_server_qtro/core.h.tpl b/src/tools/ivigenerator/templates/server_qtro/core.h.tpl
index cb81491..cb81491 100644
--- a/src/tools/ivigenerator/templates_server_qtro/core.h.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro/core.h.tpl
diff --git a/src/tools/ivigenerator/templates_server_qtro/server.pri.tpl b/src/tools/ivigenerator/templates/server_qtro/server.pri.tpl
index 230f897..230f897 100644
--- a/src/tools/ivigenerator/templates_server_qtro/server.pri.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro/server.pri.tpl
diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator.yaml b/src/tools/ivigenerator/templates/server_qtro_simulator.yaml
index 06bd8e9..06bd8e9 100644
--- a/src/tools/ivigenerator/templates_server_qtro_simulator.yaml
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator.yaml
diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.cpp.tpl b/src/tools/ivigenerator/templates/server_qtro_simulator/adapter.cpp.tpl
index e5e1d6b..e5e1d6b 100644
--- a/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.cpp.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator/adapter.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.h.tpl b/src/tools/ivigenerator/templates/server_qtro_simulator/adapter.h.tpl
index 1c20792..1c20792 100644
--- a/src/tools/ivigenerator/templates_server_qtro_simulator/adapter.h.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator/adapter.h.tpl
diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator/core.cpp.tpl b/src/tools/ivigenerator/templates/server_qtro_simulator/core.cpp.tpl
index a792bd8..a792bd8 100644
--- a/src/tools/ivigenerator/templates_server_qtro_simulator/core.cpp.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator/core.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator/core.h.tpl b/src/tools/ivigenerator/templates/server_qtro_simulator/core.h.tpl
index a16fff3..a16fff3 100644
--- a/src/tools/ivigenerator/templates_server_qtro_simulator/core.h.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator/core.h.tpl
diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator/main.cpp.tpl b/src/tools/ivigenerator/templates/server_qtro_simulator/main.cpp.tpl
index 8da233a..8da233a 100644
--- a/src/tools/ivigenerator/templates_server_qtro_simulator/main.cpp.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator/main.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_server_qtro_simulator/server.pri.tpl b/src/tools/ivigenerator/templates/server_qtro_simulator/server.pri.tpl
index 5e8b66a..5e8b66a 100644
--- a/src/tools/ivigenerator/templates_server_qtro_simulator/server.pri.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator/server.pri.tpl
diff --git a/src/tools/ivigenerator/templates_test.yaml b/src/tools/ivigenerator/templates/test.yaml
index f7b6b64..f7b6b64 100644
--- a/src/tools/ivigenerator/templates_test.yaml
+++ b/src/tools/ivigenerator/templates/test.yaml
diff --git a/src/tools/ivigenerator/templates_test/main.cpp.tpl b/src/tools/ivigenerator/templates/test/main.cpp.tpl
index 3a767b2..3a767b2 100644
--- a/src/tools/ivigenerator/templates_test/main.cpp.tpl
+++ b/src/tools/ivigenerator/templates/test/main.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_test/module.pri.tpl b/src/tools/ivigenerator/templates/test/module.pri.tpl
index d249ffc..d249ffc 100644
--- a/src/tools/ivigenerator/templates_test/module.pri.tpl
+++ b/src/tools/ivigenerator/templates/test/module.pri.tpl
diff --git a/src/tools/ivigenerator/templates_test/pagingmodel.h.tpl b/src/tools/ivigenerator/templates/test/pagingmodel.h.tpl
index 0e4bc11..0e4bc11 100644
--- a/src/tools/ivigenerator/templates_test/pagingmodel.h.tpl
+++ b/src/tools/ivigenerator/templates/test/pagingmodel.h.tpl
diff --git a/src/tools/ivigenerator/templates_test/tst_test.cpp.tpl b/src/tools/ivigenerator/templates/test/tst_test.cpp.tpl
index d8bd0ee..d8bd0ee 100644
--- a/src/tools/ivigenerator/templates_test/tst_test.cpp.tpl
+++ b/src/tools/ivigenerator/templates/test/tst_test.cpp.tpl
diff --git a/src/tools/ivigenerator/templates_test/tst_test.h.tpl b/src/tools/ivigenerator/templates/test/tst_test.h.tpl
index cfd145f..cfd145f 100644
--- a/src/tools/ivigenerator/templates_test/tst_test.h.tpl
+++ b/src/tools/ivigenerator/templates/test/tst_test.h.tpl