# HG changeset patch
# User Chad Peckham <chad.peckham@nokia.com>
# Date 1271372356 18000
# Node ID 10a0a5ba7be112c7e58a07932458250eadabba03
# Parent  f41fa762c65f8451d6690b92319049fa75411cd8
Fix for bug 10878

diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/main.cpp
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/main.cpp	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/main.cpp	Thu Apr 15 17:59:16 2010 -0500
@@ -1,32 +1,11 @@
-/****************************************************************************
-**
-** Trolltech hereby grants a license to use the Qt/Eclipse Integration
-** plug-in (the software contained herein), in binary form, solely for the
-** purpose of creating code to be used with Trolltech's Qt software.
-**
-** Qt Designer is licensed under the terms of the GNU General Public
-** License versions 2.0 and 3.0 ("GPL License"). Trolltech offers users the
-** right to use certain no GPL licensed software under the terms of its GPL
-** Exception version 1.2 (http://trolltech.com/products/qt/gplexception).
-**
-** THIS SOFTWARE IS PROVIDED BY TROLLTECH AND ITS CONTRIBUTORS (IF ANY) "AS
-** IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-** TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-** PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** Since we now have the GPL exception I think that the "special exception
-** is no longer needed. The license text proposed above (other than the
-** special exception portion of it) is the BSD license and we have added
-** the BSD license as a permissible license under the exception.
-**
-****************************************************************************/
+/*
+============================================================================
+ Name		: $(baseName).cpp
+ Author	  : $(author)
+ Copyright   : $(copyright)
+ Description : Main Console Application
+============================================================================
+*/
 
 #include <QtCore>
 #include <QCoreApplication>
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.properties
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.properties	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.properties	Thu Apr 15 17:59:16 2010 -0500
@@ -11,3 +11,7 @@
 Release UIDs are provided by Symbian.
 basics.label=Basic Settings
 basics.desc=Basic properties of a project
+basics.author.label=Author:
+basics.author.desc=Name of the author
+basics.copyright.label=Copyright notice:
+basics.copyright.desc=Your copyright notice
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.xml
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.xml	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.xml	Thu Apr 15 17:59:16 2010 -0500
@@ -17,6 +17,20 @@
 				persist="true">
 				<description>%uid3.desc</description>
 		</uidField>
+		<textField 
+				id="author"
+				label="%basics.author.label"
+				persist="true">
+				<description>%basics.author.desc</description>
+		</textField>
+		<textField 
+				id="copyright"
+				label="%basics.copyright.label"
+				multiline="true"
+				default="Your copyright notice"
+				persist="true">
+				<description>%basics.copyright.desc</description>
+		</textField>
 	</wizardPage>
 
 	<process class="com.nokia.carbide.cpp.project.core.processes.NewProject"
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.cpp
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.cpp	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.cpp	Thu Apr 15 17:59:16 2010 -0500
@@ -1,32 +1,11 @@
-/****************************************************************************
-**
-** Trolltech hereby grants a license to use the Qt/Eclipse Integration
-** plug-in (the software contained herein), in binary form, solely for the
-** purpose of creating code to be used with Trolltech's Qt software.
-**
-** Qt Designer is licensed under the terms of the GNU General Public
-** License versions 2.0 and 3.0 ("GPL License"). Trolltech offers users the
-** right to use certain no GPL licensed software under the terms of its GPL
-** Exception version 1.2 (http://trolltech.com/products/qt/gplexception).
-**
-** THIS SOFTWARE IS PROVIDED BY TROLLTECH AND ITS CONTRIBUTORS (IF ANY) "AS
-** IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-** TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-** PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** Since we now have the GPL exception I think that the "special exception
-** is no longer needed. The license text proposed above (other than the
-** special exception portion of it) is the BSD license and we have added
-** the BSD license as a permissible license under the exception.
-**
-****************************************************************************/
+/*
+============================================================================
+ Name		: $(baseName).cpp
+ Author	  : $(author)
+ Copyright   : $(copyright)
+ Description : Class Implementation
+============================================================================
+*/
 
 #include "$(className).h"
 
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.h
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.h	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.h	Thu Apr 15 17:59:16 2010 -0500
@@ -1,32 +1,11 @@
-/****************************************************************************
-**
-** Trolltech hereby grants a license to use the Qt/Eclipse Integration
-** plug-in (the software contained herein), in binary form, solely for the
-** purpose of creating code to be used with Trolltech's Qt software.
-**
-** Qt Designer is licensed under the terms of the GNU General Public
-** License versions 2.0 and 3.0 ("GPL License"). Trolltech offers users the
-** right to use certain no GPL licensed software under the terms of its GPL
-** Exception version 1.2 (http://trolltech.com/products/qt/gplexception).
-**
-** THIS SOFTWARE IS PROVIDED BY TROLLTECH AND ITS CONTRIBUTORS (IF ANY) "AS
-** IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-** TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-** PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** Since we now have the GPL exception I think that the "special exception
-** is no longer needed. The license text proposed above (other than the
-** special exception portion of it) is the BSD license and we have added
-** the BSD license as a permissible license under the exception.
-**
-****************************************************************************/
+/*
+============================================================================
+ Name		: $(baseName).cpp
+ Author	  : $(author)
+ Copyright   : $(copyright)
+ Description : Declares Class
+============================================================================
+*/
 
 #ifndef $(className$upper)_H
 #define $(className$upper)_H
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/main.cpp
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/main.cpp	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/main.cpp	Thu Apr 15 17:59:16 2010 -0500
@@ -1,32 +1,11 @@
-/****************************************************************************
-**
-** Trolltech hereby grants a license to use the Qt/Eclipse Integration
-** plug-in (the software contained herein), in binary form, solely for the
-** purpose of creating code to be used with Trolltech's Qt software.
-**
-** Qt Designer is licensed under the terms of the GNU General Public
-** License versions 2.0 and 3.0 ("GPL License"). Trolltech offers users the
-** right to use certain no GPL licensed software under the terms of its GPL
-** Exception version 1.2 (http://trolltech.com/products/qt/gplexception).
-**
-** THIS SOFTWARE IS PROVIDED BY TROLLTECH AND ITS CONTRIBUTORS (IF ANY) "AS
-** IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-** TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-** PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** Since we now have the GPL exception I think that the "special exception
-** is no longer needed. The license text proposed above (other than the
-** special exception portion of it) is the BSD license and we have added
-** the BSD license as a permissible license under the exception.
-**
-****************************************************************************/
+/*
+============================================================================
+ Name		: $(baseName).cpp
+ Author	  : $(author)
+ Copyright   : $(copyright)
+ Description : Main GUI Application
+============================================================================
+*/
 
 #include "$(className).h"
 
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.properties
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.properties	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.properties	Thu Apr 15 17:59:16 2010 -0500
@@ -12,3 +12,7 @@
 basics.desc=Basic properties of a project
 className.label=Class Name:
 className.desc=The name of the class to generate
+basics.author.label=Author:
+basics.author.desc=Name of the author
+basics.copyright.label=Copyright notice:
+basics.copyright.desc=Your copyright notice
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml	Thu Apr 15 17:59:16 2010 -0500
@@ -24,6 +24,20 @@
 				persist="true">
 				<description>%uid3.desc</description>
 		</uidField>
+		<textField 
+				id="author"
+				label="%basics.author.label"
+				persist="true">
+				<description>%basics.author.desc</description>
+		</textField>
+		<textField 
+				id="copyright"
+				label="%basics.copyright.label"
+				multiline="true"
+				default="Your copyright notice"
+				persist="true">
+				<description>%basics.copyright.desc</description>
+		</textField>
 	</wizardPage>
 
 	<process class="com.nokia.carbide.templatewizard.processes.CreateTemplateVariable"
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.properties
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.properties	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.properties	Thu Apr 15 17:59:16 2010 -0500
@@ -12,3 +12,7 @@
 basics.desc=Basic properties of a project
 className.label=Class Name:
 className.desc=The name of the class to generate
+basics.author.label=Author:
+basics.author.desc=Name of the author
+basics.copyright.label=Copyright notice:
+basics.copyright.desc=Your copyright notice
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml	Thu Apr 15 17:59:16 2010 -0500
@@ -24,6 +24,20 @@
 				persist="true">
 				<description>%uid3.desc</description>
 		</uidField>
+		<textField 
+				id="author"
+				label="%basics.author.label"
+				persist="true">
+				<description>%basics.author.desc</description>
+		</textField>
+		<textField 
+				id="copyright"
+				label="%basics.copyright.label"
+				multiline="true"
+				default="Your copyright notice"
+				persist="true">
+				<description>%basics.copyright.desc</description>
+		</textField>
 	</wizardPage>
 
 	<process class="com.nokia.carbide.templatewizard.processes.CreateTemplateVariable"
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.properties
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.properties	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.properties	Thu Apr 15 17:59:16 2010 -0500
@@ -12,3 +12,7 @@
 basics.desc=Basic properties of a project
 className.label=Class Name:
 className.desc=The name of the class to generate
+basics.author.label=Author:
+basics.author.desc=Name of the author
+basics.copyright.label=Copyright notice:
+basics.copyright.desc=Your copyright notice
diff -r f41fa762c65f -r 10a0a5ba7be1 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml	Thu Apr 15 15:52:51 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml	Thu Apr 15 17:59:16 2010 -0500
@@ -24,6 +24,20 @@
 				persist="true">
 				<description>%uid3.desc</description>
 		</uidField>
+		<textField 
+				id="author"
+				label="%basics.author.label"
+				persist="true">
+				<description>%basics.author.desc</description>
+		</textField>
+		<textField 
+				id="copyright"
+				label="%basics.copyright.label"
+				multiline="true"
+				default="Your copyright notice"
+				persist="true">
+				<description>%basics.copyright.desc</description>
+		</textField>
 	</wizardPage>
 
 	<process class="com.nokia.carbide.templatewizard.processes.CreateTemplateVariable"