summaryrefslogtreecommitdiff
path: root/share/qtcreator/templates/wizards
diff options
context:
space:
mode:
Diffstat (limited to 'share/qtcreator/templates/wizards')
-rw-r--r--share/qtcreator/templates/wizards/classes/cpp/file.cpp10
-rw-r--r--share/qtcreator/templates/wizards/classes/cpp/file.h10
-rw-r--r--share/qtcreator/templates/wizards/files/cppheader/file.h2
-rw-r--r--share/qtcreator/templates/wizards/files/cppsource/file.cpp2
-rw-r--r--share/qtcreator/templates/wizards/files/qrc/file.qrc1
5 files changed, 8 insertions, 17 deletions
diff --git a/share/qtcreator/templates/wizards/classes/cpp/file.cpp b/share/qtcreator/templates/wizards/classes/cpp/file.cpp
index 7d4833dcd0..85b45fe432 100644
--- a/share/qtcreator/templates/wizards/classes/cpp/file.cpp
+++ b/share/qtcreator/templates/wizards/classes/cpp/file.cpp
@@ -1,17 +1,14 @@
-%{Cpp:LicenseTemplate}
-
+%{Cpp:LicenseTemplate}\
#include "%{HdrFileName}"
-
%{JS: Cpp.openNamespaces('%{Class}')}
@if '%{IncludeQSharedData}'
-
class %{CN}Data : public QSharedData
{
public:
};
-@endif
+@endif
@if '%{Base}' === 'QObject'
%{CN}::%{CN}(QObject *parent) : QObject(parent)%{JS: ('%{SharedDataInit}') ? ', %{SharedDataInit}' : ''}
@elsif '%{Base}' === 'QWidget' || '%{Base}' === 'QMainWindow'
@@ -41,5 +38,4 @@ public:
{
}
-
-%{JS: Cpp.closeNamespaces('%{Class}')}
+%{JS: Cpp.closeNamespaces('%{Class}')}\
diff --git a/share/qtcreator/templates/wizards/classes/cpp/file.h b/share/qtcreator/templates/wizards/classes/cpp/file.h
index 261d91a299..91c2533b99 100644
--- a/share/qtcreator/templates/wizards/classes/cpp/file.h
+++ b/share/qtcreator/templates/wizards/classes/cpp/file.h
@@ -1,4 +1,4 @@
-%{Cpp:LicenseTemplate}
+%{Cpp:LicenseTemplate}\
#ifndef %{GUARD}
#define %{GUARD}
@@ -12,10 +12,8 @@
( '%{IncludeQMainWindow}' ) ? 'QtWidgets/%{IncludeQMainWindow}' : '',
( '%{IncludeQDeclarativeItem}' ) ? 'QtQuick1/%{IncludeQDeclarativeItem}' : '',
( '%{IncludeQQuickItem}' ) ? 'QtDeclarative/%{IncludeQQuickItem}' : '',
- ( '%{IncludeQSharedData}' ) ? 'QtCore/QSharedDataPointer' : '' ])}
-
+ ( '%{IncludeQSharedData}' ) ? 'QtCore/QSharedDataPointer' : '' ])}\
%{JS: Cpp.openNamespaces('%{Class}')}
-
@if '%{IncludeQSharedData}'
class %{CN}Data;
@@ -54,7 +52,5 @@ private:
QSharedDataPointer<%{CN}Data> data;
@endif
};
-
%{JS: Cpp.closeNamespaces('%{Class}')}
-
-#endif // %{GUARD}
+#endif // %{GUARD}\
diff --git a/share/qtcreator/templates/wizards/files/cppheader/file.h b/share/qtcreator/templates/wizards/files/cppheader/file.h
index c8861f8c52..d77576943e 100644
--- a/share/qtcreator/templates/wizards/files/cppheader/file.h
+++ b/share/qtcreator/templates/wizards/files/cppheader/file.h
@@ -1,4 +1,4 @@
-%{Cpp:LicenseTemplate}
+%{Cpp:LicenseTemplate}\
#ifndef %{JS: Cpp.headerGuard('%{FileName}')}
#define %{JS: Cpp.headerGuard('%{FileName}')}
diff --git a/share/qtcreator/templates/wizards/files/cppsource/file.cpp b/share/qtcreator/templates/wizards/files/cppsource/file.cpp
index d6b739152f..b6e652a44a 100644
--- a/share/qtcreator/templates/wizards/files/cppsource/file.cpp
+++ b/share/qtcreator/templates/wizards/files/cppsource/file.cpp
@@ -1 +1 @@
-%{Cpp:LicenseTemplate}
+%{Cpp:LicenseTemplate}\
diff --git a/share/qtcreator/templates/wizards/files/qrc/file.qrc b/share/qtcreator/templates/wizards/files/qrc/file.qrc
index 807350da3b..7646d2b36c 100644
--- a/share/qtcreator/templates/wizards/files/qrc/file.qrc
+++ b/share/qtcreator/templates/wizards/files/qrc/file.qrc
@@ -1,2 +1 @@
<RCC/>
-