Moved auto generated and preserved warnings into macro library

18 files changed, 48 insertions, 68 deletions

diff --git a/qface/builtin/qtcpp/templates/CMakeLists.txt b/qface/builtin/qtcpp/templates/CMakeLists.txt
index bb7fdb9..b2f7334 100644
--- a/qface/builtin/qtcpp/templates/CMakeLists.txt
+++ b/qface/builtin/qtcpp/templates/CMakeLists.txt
@@ -1,3 +1,5 @@
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated() }}
 {% set module_name = module.name.lower().replace(".", "_") %}
 {% set module_path = module.name_parts|join('/') %}
 
diff --git a/qface/builtin/qtcpp/templates/generated/abstractinterface.cpp b/qface/builtin/qtcpp/templates/generated/abstractinterface.cpp
index 4ef52c9..ecf1467 100644
--- a/qface/builtin/qtcpp/templates/generated/abstractinterface.cpp
+++ b/qface/builtin/qtcpp/templates/generated/abstractinterface.cpp
@@ -1,10 +1,7 @@
 {# Copyright (c) Pelagicore AB 2016 #}
 {% import "qtcpp.j2" as cpp %}
 {% set class = 'QmlAbstract{0}'.format(interface) %}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
+{{ cpp.autogenerated() }}
 
 #include "{{class|lower}}.h"
 
diff --git a/qface/builtin/qtcpp/templates/generated/abstractinterface.h b/qface/builtin/qtcpp/templates/generated/abstractinterface.h
index e4706cf..d5a4f24 100644
--- a/qface/builtin/qtcpp/templates/generated/abstractinterface.h
+++ b/qface/builtin/qtcpp/templates/generated/abstractinterface.h
@@ -1,11 +1,7 @@
 {# Copyright (c) Pelagicore AB 2016 #}
 {% import "qtcpp.j2" as cpp %}
 {% set class = 'QmlAbstract{0}'.format(interface) %}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
-
+{{ cpp.autogenerated() }}
 
 #pragma once
 
diff --git a/qface/builtin/qtcpp/templates/generated/generated.pri b/qface/builtin/qtcpp/templates/generated/generated.pri
index ac176db..701cdae 100644
--- a/qface/builtin/qtcpp/templates/generated/generated.pri
+++ b/qface/builtin/qtcpp/templates/generated/generated.pri
@@ -1,8 +1,6 @@
 {# Copyright (c) Pelagicore AB 2016 #}
-#############################################################################
-## This is an auto-generated file.
-## Do not edit! All changes made to it will be lost.
-#############################################################################
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated(prefix="##") }}
 
 QT += qml quick
 CONFIG += c++11
diff --git a/qface/builtin/qtcpp/templates/generated/module.cpp b/qface/builtin/qtcpp/templates/generated/module.cpp
index 46aeec7..d7b9833 100644
--- a/qface/builtin/qtcpp/templates/generated/module.cpp
+++ b/qface/builtin/qtcpp/templates/generated/module.cpp
@@ -1,8 +1,6 @@
 {# Copyright (c) Pelagicore AB 2016 #}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated() }}
 {% set class = 'Qml{0}Module'.format(module.module_name) %}
 
 
diff --git a/qface/builtin/qtcpp/templates/generated/module.h b/qface/builtin/qtcpp/templates/generated/module.h
index 85d5422..44e12f3 100644
--- a/qface/builtin/qtcpp/templates/generated/module.h
+++ b/qface/builtin/qtcpp/templates/generated/module.h
@@ -1,9 +1,6 @@
 {# Copyright (c) Pelagicore AB 2016 #}
 {% import "qtcpp.j2" as cpp %}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
+{{ cpp.autogenerated() }}
 {% set class = '{0}Module'.format(module.module_name) %}
 
 #pragma once
diff --git a/qface/builtin/qtcpp/templates/generated/struct.cpp b/qface/builtin/qtcpp/templates/generated/struct.cpp
index c8a2f03..7b97130 100644
--- a/qface/builtin/qtcpp/templates/generated/struct.cpp
+++ b/qface/builtin/qtcpp/templates/generated/struct.cpp
@@ -1,10 +1,8 @@
 {# Copyright (c) Pelagicore AB 2016 #}
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated() }}
 {% set class = 'Qml{0}'.format(struct) %}
 {% set ampersand = joiner(" &&") %}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
 
 #include "{{class|lower}}.h"
 #include <QtQml>
diff --git a/qface/builtin/qtcpp/templates/generated/struct.h b/qface/builtin/qtcpp/templates/generated/struct.h
index 54c8715..e9a0399 100644
--- a/qface/builtin/qtcpp/templates/generated/struct.h
+++ b/qface/builtin/qtcpp/templates/generated/struct.h
@@ -1,9 +1,7 @@
 {# Copyright (c) Pelagicore AB 2016 #}
 {% set class = 'Qml{0}'.format(struct) %}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated() }}
 
 #pragma once
 
diff --git a/qface/builtin/qtcpp/templates/generated/structmodel.cpp b/qface/builtin/qtcpp/templates/generated/structmodel.cpp
index 58cc871..4657d6f 100644
--- a/qface/builtin/qtcpp/templates/generated/structmodel.cpp
+++ b/qface/builtin/qtcpp/templates/generated/structmodel.cpp
@@ -1,9 +1,7 @@
 {# Copyright (c) Pelagicore AB 2016 #}
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated() }}
 {% set class = 'Qml{0}Model'.format(struct) %}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
 
 #include "{{class|lower}}.h"
 
diff --git a/qface/builtin/qtcpp/templates/generated/structmodel.h b/qface/builtin/qtcpp/templates/generated/structmodel.h
index ab02b25..8d84e5a 100644
--- a/qface/builtin/qtcpp/templates/generated/structmodel.h
+++ b/qface/builtin/qtcpp/templates/generated/structmodel.h
@@ -1,9 +1,7 @@
 {# Copyright (c) Pelagicore AB 2016 #}
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated() }}
 {% set class = 'Qml{0}Model'.format(struct) %}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
 
 #pragma once
 
@@ -26,10 +24,10 @@ public:
     void remove(int row);
     void reset(const QList<Qml{{struct}}> data);
     void clear();
-public: // from QAbstractListModel    
+public: // from QAbstractListModel
     virtual int rowCount(const QModelIndex &parent) const;
     virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual QHash<int, QByteArray> roleNames() const;    
+    virtual QHash<int, QByteArray> roleNames() const;
 Q_SIGNALS:
    void countChanged(int count);
 private:
diff --git a/qface/builtin/qtcpp/templates/generated/variantmodel.cpp b/qface/builtin/qtcpp/templates/generated/variantmodel.cpp
index 6e197f4..7e83a97 100644
--- a/qface/builtin/qtcpp/templates/generated/variantmodel.cpp
+++ b/qface/builtin/qtcpp/templates/generated/variantmodel.cpp
@@ -1,9 +1,7 @@
 {# Copyright (c) Pelagicore AB 2016 #}
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated() }}
 {% set class = 'QmlVariantModel' %}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
 
 #include "{{class|lower}}.h"
 
diff --git a/qface/builtin/qtcpp/templates/generated/variantmodel.h b/qface/builtin/qtcpp/templates/generated/variantmodel.h
index 3f1bbd3..97cec4f 100644
--- a/qface/builtin/qtcpp/templates/generated/variantmodel.h
+++ b/qface/builtin/qtcpp/templates/generated/variantmodel.h
@@ -1,9 +1,7 @@
 {# Copyright (c) Pelagicore AB 2016 #}
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated() }}
 {% set class = 'QmlVariantModel' %}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
 
 #pragma once
 
diff --git a/qface/builtin/qtcpp/templates/interface.cpp b/qface/builtin/qtcpp/templates/interface.cpp
index bbd705a..01263bc 100644
--- a/qface/builtin/qtcpp/templates/interface.cpp
+++ b/qface/builtin/qtcpp/templates/interface.cpp
@@ -1,10 +1,7 @@
 {# Copyright (c) Pelagicore AB 2016 #}
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.preserved() }}
 {% set class = '{0}'.format(interface) %}
-/*
- * This is a preserved file.
- * Changes will not be overriden by the generator.
- * To reset the file you need to delete it first.
- */
 
 #include "{{class|lower}}.h"
 
diff --git a/qface/builtin/qtcpp/templates/interface.h b/qface/builtin/qtcpp/templates/interface.h
index 4a1448b..06953fe 100644
--- a/qface/builtin/qtcpp/templates/interface.h
+++ b/qface/builtin/qtcpp/templates/interface.h
@@ -1,10 +1,7 @@
 {# Copyright (c) Pelagicore AB 2016 #}
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.preserved() }}
 {% set class = '{0}'.format(interface) %}
-/*
- * This is a preserved file.
- * Changes will not be overriden by the generator.
- * To reset the file you need to delete it first.
- */
 
 #pragma once
 
diff --git a/qface/builtin/qtcpp/templates/plugin.cpp b/qface/builtin/qtcpp/templates/plugin.cpp
index c7821ae..91a3de5 100644
--- a/qface/builtin/qtcpp/templates/plugin.cpp
+++ b/qface/builtin/qtcpp/templates/plugin.cpp
@@ -1,9 +1,7 @@
 {# Copyright (c) Pelagicore AB 2016 #}
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated()}}
 {% set module_name = 'Qml{0}Module'.format(module.module_name) %}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
 
 #include "plugin.h"
 
diff --git a/qface/builtin/qtcpp/templates/plugin.h b/qface/builtin/qtcpp/templates/plugin.h
index 1952c35..50e0602 100644
--- a/qface/builtin/qtcpp/templates/plugin.h
+++ b/qface/builtin/qtcpp/templates/plugin.h
@@ -1,8 +1,6 @@
 {# Copyright (c) Pelagicore AB 2016 #}
-/****************************************************************************
-** This is an auto-generated file.
-** Do not edit! All changes made to it will be lost.
-****************************************************************************/
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.autogenerated() }}
 
 #pragma once
 
diff --git a/qface/builtin/qtcpp/templates/plugin.pro b/qface/builtin/qtcpp/templates/plugin.pro
index 4984015..a8fcb90 100644
--- a/qface/builtin/qtcpp/templates/plugin.pro
+++ b/qface/builtin/qtcpp/templates/plugin.pro
@@ -1,7 +1,6 @@
 {# Copyright (c) Pelagicore AB 2016 #}
-
-## This is a preserved file and can be edited.
-## All changes will not be override.
+{% import "qtcpp.j2" as cpp %}
+{{ cpp.preserved(prefix="##")}}
 
 TEMPLATE = lib
 QT += qml quick
diff --git a/qface/builtin/qtcpp/templates/qtcpp.j2 b/qface/builtin/qtcpp/templates/qtcpp.j2
index 3eb574a..81b7d7a 100644
--- a/qface/builtin/qtcpp/templates/qtcpp.j2
+++ b/qface/builtin/qtcpp/templates/qtcpp.j2
@@ -83,3 +83,18 @@ void {{class}}::set{{property|upperfirst}}({{ property|parameterType }})
     virtual {{operation|returnType}} {{operation}}({{operation|parameters}});
 {% endmacro %}
 
+{% macro autogenerated(prefix="//") %}
+
+{{prefix}} This is an auto-generated file.
+{{prefix}} Do not edit! All changes made to it will be lost.
+
+{% endmacro %}
+
+{% macro preserved(prefix="//") %}
+
+{{prefix}} This is a preserved file.
+{{prefix}} Changes will not be overriden by the generator.
+{{prefix}} To reset the file you need to delete it first.
+
+{% endmacro %}
+