diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2014-10-31 16:18:52 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2014-11-03 15:38:47 +0100 |
| commit | d2eb04267652fa75d867c2ebd1914cd378a18923 (patch) | |
| tree | 64091498c0f9c8fa64bc3eb1dcac934c9a4d5498 /share | |
| parent | 553ac29f337ad0b9919c9e440adb5e4178531269 (diff) | |
| download | qt-creator-d2eb04267652fa75d867c2ebd1914cd378a18923.tar.gz | |
JsonWizard: Remove empty lines
Task-number: QTCREATORBUG-13289
Change-Id: I2c8d1fc4e2cfcb940e76a6988d35e80703548668
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'share')
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/> - |