Update license headers to allow inclusion into other applications at any license

62 files changed, 547 insertions, 803 deletions

diff --git a/weather/src/addcitytool.cpp b/weather/src/addcitytool.cpp
index 219d92a..bdc8f47 100644
--- a/weather/src/addcitytool.cpp
+++ b/weather/src/addcitytool.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "addcitytool.h"
 #include "settings.h"
 #include "forecastprovider.h"
diff --git a/weather/src/addcitytool.h b/weather/src/addcitytool.h
index f0f6b1f..7aa43fb 100644
--- a/weather/src/addcitytool.h
+++ b/weather/src/addcitytool.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef ADDCITYTOOL_H
 #define ADDCITYTOOL_H
 
diff --git a/weather/src/bootmanager.cpp b/weather/src/bootmanager.cpp
index ac41a8f..09af5ba 100644
--- a/weather/src/bootmanager.cpp
+++ b/weather/src/bootmanager.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "bootmanager.h"
 #include "settings.h"
 #include "forecastprovider.h"
diff --git a/weather/src/bootmanager.h b/weather/src/bootmanager.h
index 4fc4969..61a40db 100644
--- a/weather/src/bootmanager.h
+++ b/weather/src/bootmanager.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef BOOTMANAGER_H
 #define BOOTMANAGER_H
 
diff --git a/weather/src/carroussel.h b/weather/src/carroussel.h
index 983cbc8..72c50d6 100644
--- a/weather/src/carroussel.h
+++ b/weather/src/carroussel.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/citycarroussel.cpp b/weather/src/citycarroussel.cpp
index 3f2d5a3..e30b65a 100644
--- a/weather/src/citycarroussel.cpp
+++ b/weather/src/citycarroussel.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/citycarroussel.h b/weather/src/citycarroussel.h
index 8bea25b..2c5013d 100644
--- a/weather/src/citycarroussel.h
+++ b/weather/src/citycarroussel.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/cityinfodisplay.cpp b/weather/src/cityinfodisplay.cpp
index 570ef8a..09aa7cd 100644
--- a/weather/src/cityinfodisplay.cpp
+++ b/weather/src/cityinfodisplay.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/cityinfodisplay.h b/weather/src/cityinfodisplay.h
index 6b6dc3b..dcd3e44 100644
--- a/weather/src/cityinfodisplay.h
+++ b/weather/src/cityinfodisplay.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/citylist.cpp b/weather/src/citylist.cpp
index d3ac7fd..aa2bb59 100644
--- a/weather/src/citylist.cpp
+++ b/weather/src/citylist.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "citylist.h"
 #include "settings.h"
 #include "pixmaploader.h"
diff --git a/weather/src/citylist.h b/weather/src/citylist.h
index 3d93806..1838400 100644
--- a/weather/src/citylist.h
+++ b/weather/src/citylist.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef CITYLIST_H
 #define CITYLIST_H
 
diff --git a/weather/src/citymanager.cpp b/weather/src/citymanager.cpp
index 665c3b7..ddf7d78 100644
--- a/weather/src/citymanager.cpp
+++ b/weather/src/citymanager.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/citymanager.h b/weather/src/citymanager.h
index 3b80393..63fe559 100644
--- a/weather/src/citymanager.h
+++ b/weather/src/citymanager.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/contentlist.cpp b/weather/src/contentlist.cpp
index 8b054aa..e5a7bed 100644
--- a/weather/src/contentlist.cpp
+++ b/weather/src/contentlist.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/contentlist.h b/weather/src/contentlist.h
index 8f37c7f..9ec1268 100644
--- a/weather/src/contentlist.h
+++ b/weather/src/contentlist.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/demoforecastsource.cpp b/weather/src/demoforecastsource.cpp
index 292b6ea..7fd209f 100644
--- a/weather/src/demoforecastsource.cpp
+++ b/weather/src/demoforecastsource.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "demoforecastsource.h"
 #include "forecast.h"
 
diff --git a/weather/src/demoforecastsource.h b/weather/src/demoforecastsource.h
index dbfd715..e258d86 100644
--- a/weather/src/demoforecastsource.h
+++ b/weather/src/demoforecastsource.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef DEMOFORECASTSOURCE_H
 #define DEMOFORECASTSOURCE_H
 
diff --git a/weather/src/fakecontentscreen.cpp b/weather/src/fakecontentscreen.cpp
index 493df9c..59af0f7 100644
--- a/weather/src/fakecontentscreen.cpp
+++ b/weather/src/fakecontentscreen.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "fakecontentscreen.h"
 #include "pixmaploader.h"
 #include "settings.h"
diff --git a/weather/src/fakecontentscreen.h b/weather/src/fakecontentscreen.h
index 09c788a..f276754 100644
--- a/weather/src/fakecontentscreen.h
+++ b/weather/src/fakecontentscreen.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef FAKECONTENTSCREEN_H
 #define FAKECONTENTSCREEN_H
 
diff --git a/weather/src/forecast.h b/weather/src/forecast.h
index f6fb6a8..b28f195 100644
--- a/weather/src/forecast.h
+++ b/weather/src/forecast.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/forecastdata.cpp b/weather/src/forecastdata.cpp
index 45e2567..b2dc79c 100644
--- a/weather/src/forecastdata.cpp
+++ b/weather/src/forecastdata.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "forecastdata.h"
 
 struct ConditionTypeData
diff --git a/weather/src/forecastdata.h b/weather/src/forecastdata.h
index bf5b9cd..6263b94 100644
--- a/weather/src/forecastdata.h
+++ b/weather/src/forecastdata.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef FORECASTDATA_H
 #define FORECASTDATA_H
 
diff --git a/weather/src/forecasthungitem.cpp b/weather/src/forecasthungitem.cpp
index 428b83c..089192f 100644
--- a/weather/src/forecasthungitem.cpp
+++ b/weather/src/forecasthungitem.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/forecasthungitem.h b/weather/src/forecasthungitem.h
index bb86552..4d60ab3 100644
--- a/weather/src/forecasthungitem.h
+++ b/weather/src/forecasthungitem.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/forecastprovider.cpp b/weather/src/forecastprovider.cpp
index 5bda3fe..e666a98 100644
--- a/weather/src/forecastprovider.cpp
+++ b/weather/src/forecastprovider.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "forecastprovider.h"
 #include <QTime>
 #include <QTimer>
diff --git a/weather/src/forecastprovider.h b/weather/src/forecastprovider.h
index fcb75dd..df2ebfa 100644
--- a/weather/src/forecastprovider.h
+++ b/weather/src/forecastprovider.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef FORECASTPROVIDER_H
 #define FORECASTPROVIDER_H
 
diff --git a/weather/src/forecastrain.cpp b/weather/src/forecastrain.cpp
index 81f3175..bfb09b5 100644
--- a/weather/src/forecastrain.cpp
+++ b/weather/src/forecastrain.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/forecastrain.h b/weather/src/forecastrain.h
index 91b5aaf..007e0a0 100644
--- a/weather/src/forecastrain.h
+++ b/weather/src/forecastrain.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/forecastsnow.cpp b/weather/src/forecastsnow.cpp
index d342c1e..856c46f 100644
--- a/weather/src/forecastsnow.cpp
+++ b/weather/src/forecastsnow.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/forecastsnow.h b/weather/src/forecastsnow.h
index 809b232..ca0ebe4 100644
--- a/weather/src/forecastsnow.h
+++ b/weather/src/forecastsnow.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/forecastsource.h b/weather/src/forecastsource.h
index 8c7cfbe..56d7d06 100644
--- a/weather/src/forecastsource.h
+++ b/weather/src/forecastsource.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef FORECASTSOURCE_H
 #define FORECASTSOURCE_H
 
diff --git a/weather/src/forecaststars.cpp b/weather/src/forecaststars.cpp
index 97379dc..d95dc49 100644
--- a/weather/src/forecaststars.cpp
+++ b/weather/src/forecaststars.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/forecaststars.h b/weather/src/forecaststars.h
index 23a135c..4c4e228 100644
--- a/weather/src/forecaststars.h
+++ b/weather/src/forecaststars.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/forecastview.cpp b/weather/src/forecastview.cpp
index f7a0d6b..7c29b04 100644
--- a/weather/src/forecastview.cpp
+++ b/weather/src/forecastview.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/forecastview.h b/weather/src/forecastview.h
index 4378a59..ae3d331 100644
--- a/weather/src/forecastview.h
+++ b/weather/src/forecastview.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/gesturebox.cpp b/weather/src/gesturebox.cpp
index cd348bf..6e3e44e 100644
--- a/weather/src/gesturebox.cpp
+++ b/weather/src/gesturebox.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/gesturebox.h b/weather/src/gesturebox.h
index a754105..af9d384 100644
--- a/weather/src/gesturebox.h
+++ b/weather/src/gesturebox.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/gesturebox_p.h b/weather/src/gesturebox_p.h
index 0daa89e..6841a7c 100644
--- a/weather/src/gesturebox_p.h
+++ b/weather/src/gesturebox_p.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/loading.cpp b/weather/src/loading.cpp
index 02750f9..5745bec 100644
--- a/weather/src/loading.cpp
+++ b/weather/src/loading.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "loading.h"
 #include "pixmaploader.h"
 
diff --git a/weather/src/loading.h b/weather/src/loading.h
index 2735b28..2334a45 100644
--- a/weather/src/loading.h
+++ b/weather/src/loading.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef LOADING_H
 #define LOADING_H
 
diff --git a/weather/src/main.cpp b/weather/src/main.cpp
index b2681a9..badfcdc 100644
--- a/weather/src/main.cpp
+++ b/weather/src/main.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/mainview.cpp b/weather/src/mainview.cpp
index 5f9b5d3..c18a2f3 100644
--- a/weather/src/mainview.cpp
+++ b/weather/src/mainview.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/mainview.h b/weather/src/mainview.h
index fc54837..d7ea00f 100644
--- a/weather/src/mainview.h
+++ b/weather/src/mainview.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/networkforecastsource.cpp b/weather/src/networkforecastsource.cpp
index 98456c8..fbbd2df 100644
--- a/weather/src/networkforecastsource.cpp
+++ b/weather/src/networkforecastsource.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "networkforecastsource.h"
 #include "yahooweatherresponse.h"
 #include "xoapweatherresponse.h"
diff --git a/weather/src/networkforecastsource.h b/weather/src/networkforecastsource.h
index 49f26c5..247c989 100644
--- a/weather/src/networkforecastsource.h
+++ b/weather/src/networkforecastsource.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef NETWORKFORECASTSOURCE_H
 #define NETWORKFORECASTSOURCE_H
 
diff --git a/weather/src/painttextitem.cpp b/weather/src/painttextitem.cpp
index 7356815..586899d 100644
--- a/weather/src/painttextitem.cpp
+++ b/weather/src/painttextitem.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "painttextitem.h"
 #include <QPainter>
 #include <QDebug>
diff --git a/weather/src/painttextitem.h b/weather/src/painttextitem.h
index 9811226..98f15ae 100644
--- a/weather/src/painttextitem.h
+++ b/weather/src/painttextitem.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef PAINTTEXTITEM_H
 #define PAINTTEXTITEM_H
 
diff --git a/weather/src/pixmapbutton.cpp b/weather/src/pixmapbutton.cpp
index 6ec8be5..7495e91 100644
--- a/weather/src/pixmapbutton.cpp
+++ b/weather/src/pixmapbutton.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "pixmapbutton.h"
 
 // PixmapButton
diff --git a/weather/src/pixmapbutton.h b/weather/src/pixmapbutton.h
index 60c95a3..07ba42f 100644
--- a/weather/src/pixmapbutton.h
+++ b/weather/src/pixmapbutton.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef PIXMAPBUTTON_H
 #define PIXMAPBUTTON_H
 
diff --git a/weather/src/pixmaploader.cpp b/weather/src/pixmaploader.cpp
index e60cef4..75a15b1 100644
--- a/weather/src/pixmaploader.cpp
+++ b/weather/src/pixmaploader.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "pixmaploader.h"
 #include "settings.h"
 #include <QMutexLocker>
diff --git a/weather/src/pixmaploader.h b/weather/src/pixmaploader.h
index f32bf64..e582da7 100644
--- a/weather/src/pixmaploader.h
+++ b/weather/src/pixmaploader.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef PIXMAPLOADER_H
 #define PIXMAPLOADER_H
 
diff --git a/weather/src/scrollbar.cpp b/weather/src/scrollbar.cpp
index 5fc1264..7957a63 100644
--- a/weather/src/scrollbar.cpp
+++ b/weather/src/scrollbar.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/scrollbar.h b/weather/src/scrollbar.h
index fb509d7..d46e458 100644
--- a/weather/src/scrollbar.h
+++ b/weather/src/scrollbar.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/settings.cpp b/weather/src/settings.cpp
index 32b3071..8613d8a 100644
--- a/weather/src/settings.cpp
+++ b/weather/src/settings.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/settings.h b/weather/src/settings.h
index 7556e72..dc94a0a 100644
--- a/weather/src/settings.h
+++ b/weather/src/settings.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/symbiannetwork.h b/weather/src/symbiannetwork.h
index 52cf45c..f8d551f 100644
--- a/weather/src/symbiannetwork.h
+++ b/weather/src/symbiannetwork.h
@@ -1,41 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
 **
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 #ifndef SYMBIAN_NETWORK_H
diff --git a/weather/src/titlebar.cpp b/weather/src/titlebar.cpp
index c38377a..dc159f5 100644
--- a/weather/src/titlebar.cpp
+++ b/weather/src/titlebar.cpp
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/titlebar.h b/weather/src/titlebar.h
index 4636a77..e27bc02 100644
--- a/weather/src/titlebar.h
+++ b/weather/src/titlebar.h
@@ -1,31 +1,13 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: openBossa - INdT (renato.chencarek@openbossa.org)
+** Contact: qt-info@nokia.com
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** the openBossa stream from INdT (renato.chencarek@openbossa.org).
-** $QT_END_LICENSE$
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
 **
 ****************************************************************************/
 
diff --git a/weather/src/xoapweatherresponse.cpp b/weather/src/xoapweatherresponse.cpp
index 5804bc9..0c3d724 100644
--- a/weather/src/xoapweatherresponse.cpp
+++ b/weather/src/xoapweatherresponse.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "xoapweatherresponse.h"
 
 #include <QDebug>
diff --git a/weather/src/xoapweatherresponse.h b/weather/src/xoapweatherresponse.h
index 1fd13cd..30ed523 100644
--- a/weather/src/xoapweatherresponse.h
+++ b/weather/src/xoapweatherresponse.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef XOAPWEATHERRESPONSE_H
 #define XOAPWEATHERRESPONSE_H
 
diff --git a/weather/src/yahooweatherresponse.cpp b/weather/src/yahooweatherresponse.cpp
index 652d2c8..54a3e11 100644
--- a/weather/src/yahooweatherresponse.cpp
+++ b/weather/src/yahooweatherresponse.cpp
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #include "yahooweatherresponse.h"
 #include <QDebug>
 
diff --git a/weather/src/yahooweatherresponse.h b/weather/src/yahooweatherresponse.h
index ac9d20e..96e058c 100644
--- a/weather/src/yahooweatherresponse.h
+++ b/weather/src/yahooweatherresponse.h
@@ -1,3 +1,15 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: qt-info@nokia.com
+**
+** This software, including documentation, is protected by copyright
+** controlled by Nokia Corporation.  You may use this software in
+** accordance with the terms and conditions contained in the Qt Phone
+** Demo License Agreement.
+**
+****************************************************************************/
 #ifndef YAHOOWEATHERRESPONSE_H
 #define YAHOOWEATHERRESPONSE_H