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

22 files changed, 138 insertions, 504 deletions

diff --git a/shoplist/src/contentlist.cpp b/shoplist/src/contentlist.cpp
index 378fc5e..e4778ea 100644
--- a/shoplist/src/contentlist.cpp
+++ b/shoplist/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/shoplist/src/contentlist.h b/shoplist/src/contentlist.h
index 2f2bce8..b46f804 100644
--- a/shoplist/src/contentlist.h
+++ b/shoplist/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/shoplist/src/designinformation.cpp b/shoplist/src/designinformation.cpp
index 7ce5bce..18e27dc 100644
--- a/shoplist/src/designinformation.cpp
+++ b/shoplist/src/designinformation.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/shoplist/src/designinformation.h b/shoplist/src/designinformation.h
index af39ca0..febf37d 100644
--- a/shoplist/src/designinformation.h
+++ b/shoplist/src/designinformation.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/shoplist/src/gesturebox.cpp b/shoplist/src/gesturebox.cpp
index 45acc06..f008f7b 100644
--- a/shoplist/src/gesturebox.cpp
+++ b/shoplist/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/shoplist/src/gesturebox.h b/shoplist/src/gesturebox.h
index a754105..af9d384 100644
--- a/shoplist/src/gesturebox.h
+++ b/shoplist/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/shoplist/src/gesturebox_p.h b/shoplist/src/gesturebox_p.h
index 0daa89e..6841a7c 100644
--- a/shoplist/src/gesturebox_p.h
+++ b/shoplist/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/shoplist/src/listshadow.cpp b/shoplist/src/listshadow.cpp
index 88cfb83..983756b 100644
--- a/shoplist/src/listshadow.cpp
+++ b/shoplist/src/listshadow.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/shoplist/src/listshadow.h b/shoplist/src/listshadow.h
index b5fa078..c71945c 100644
--- a/shoplist/src/listshadow.h
+++ b/shoplist/src/listshadow.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/shoplist/src/main.cpp b/shoplist/src/main.cpp
index 87a6761..8695cbe 100644
--- a/shoplist/src/main.cpp
+++ b/shoplist/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/shoplist/src/maincontainer.cpp b/shoplist/src/maincontainer.cpp
index 3658f0f..8576669 100644
--- a/shoplist/src/maincontainer.cpp
+++ b/shoplist/src/maincontainer.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/shoplist/src/maincontainer.h b/shoplist/src/maincontainer.h
index dd48690..cce76ae 100644
--- a/shoplist/src/maincontainer.h
+++ b/shoplist/src/maincontainer.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/shoplist/src/popup.cpp b/shoplist/src/popup.cpp
index 6d49d45..9c7c583 100644
--- a/shoplist/src/popup.cpp
+++ b/shoplist/src/popup.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/shoplist/src/popup.h b/shoplist/src/popup.h
index 65a2cb5..5fde026 100644
--- a/shoplist/src/popup.h
+++ b/shoplist/src/popup.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/shoplist/src/scrollbar.cpp b/shoplist/src/scrollbar.cpp
index a6b19cc..3f0affe 100644
--- a/shoplist/src/scrollbar.cpp
+++ b/shoplist/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/shoplist/src/scrollbar.h b/shoplist/src/scrollbar.h
index dd9f9bd..12ae6da 100644
--- a/shoplist/src/scrollbar.h
+++ b/shoplist/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/shoplist/src/shoppinglist.cpp b/shoplist/src/shoppinglist.cpp
index f80dc00..3d3b740 100644
--- a/shoplist/src/shoppinglist.cpp
+++ b/shoplist/src/shoppinglist.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/shoplist/src/shoppinglist.h b/shoplist/src/shoppinglist.h
index e05138b..a99d5dc 100644
--- a/shoplist/src/shoppinglist.h
+++ b/shoplist/src/shoppinglist.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 SHOPPINGLIST_H
 #define SHOPPINGLIST_H
 
diff --git a/shoplist/src/shoppinglistcategoryui.cpp b/shoplist/src/shoppinglistcategoryui.cpp
index 0344099..60d91b5 100644
--- a/shoplist/src/shoppinglistcategoryui.cpp
+++ b/shoplist/src/shoppinglistcategoryui.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/shoplist/src/shoppinglistcategoryui.h b/shoplist/src/shoppinglistcategoryui.h
index 07e383e..b40a7a5 100644
--- a/shoplist/src/shoppinglistcategoryui.h
+++ b/shoplist/src/shoppinglistcategoryui.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/shoplist/src/shoppinglistview.cpp b/shoplist/src/shoppinglistview.cpp
index da316d1..c87f681 100644
--- a/shoplist/src/shoppinglistview.cpp
+++ b/shoplist/src/shoppinglistview.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/shoplist/src/shoppinglistview.h b/shoplist/src/shoppinglistview.h
index 5e95911..3794cc4 100644
--- a/shoplist/src/shoppinglistview.h
+++ b/shoplist/src/shoppinglistview.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.
 **
 ****************************************************************************/