Mercurial > projects > qtd
changeset 52:09a0f1d048f2
update parser to that from jambi 4.5, attemt to fix building with gcc 4.4
line wrap: on
line diff
--- a/generator/parser/ast.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/ast.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/ast.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/ast.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/binder.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/binder.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/binder.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/binder.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/class_compiler.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/class_compiler.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/class_compiler.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/class_compiler.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/codemodel.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/codemodel.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/codemodel.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/codemodel.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/codemodel_finder.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/codemodel_finder.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/codemodel_finder.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/codemodel_finder.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/codemodel_fwd.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/codemodel_fwd.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/codemodel_pointer.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/codemodel_pointer.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2006 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/compiler_utils.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/compiler_utils.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/compiler_utils.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/compiler_utils.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/control.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/control.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/control.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/control.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/declarator_compiler.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/declarator_compiler.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/declarator_compiler.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/declarator_compiler.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/default_visitor.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/default_visitor.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/default_visitor.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/default_visitor.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/dumptree.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/dumptree.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/dumptree.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/dumptree.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/include/stdarg.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/include/stdarg.h Mon May 18 15:23:28 2009 +0000 @@ -1,37 +1,38 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/lexer.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/lexer.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/lexer.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/lexer.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/list.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/list.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/list.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/list.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/name_compiler.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/name_compiler.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/name_compiler.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/name_compiler.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/parser.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/parser.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/parser.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/parser.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp-allocator.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp-allocator.h Mon May 18 15:23:28 2009 +0000 @@ -1,37 +1,38 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/builtin-macros.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/builtin-macros.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,37 +1,38 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp-cctype.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-cctype.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp-engine-bits.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-engine-bits.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -43,6 +44,8 @@ #ifndef PP_ENGINE_BITS_H #define PP_ENGINE_BITS_H +#include <cstdio> + namespace rpp { inline std::string pp::fix_file_path(std::string const &filename) const @@ -215,7 +218,9 @@ case 7: if (__directive[0] == 'i' && !strcmp (__directive, "include")) - return PP_INCLUDE; + return PP_INCLUDE; + else if (__directive[0] == 'w' && !strcmp(__directive, "warning")) + return PP_WARNING; break; case 12:
--- a/generator/parser/rpp/pp-engine.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-engine.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -166,7 +167,8 @@ PP_IFNDEF, PP_UNDEF, PP_PRAGMA, - PP_ERROR + PP_ERROR, + PP_WARNING }; public:
--- a/generator/parser/rpp/pp-environment.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-environment.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp-fwd.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-fwd.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp-internal.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-internal.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -44,6 +45,7 @@ #define PP_INTERNAL_H #include <algorithm> +#include <cstdio> namespace rpp {
--- a/generator/parser/rpp/pp-iterator.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-iterator.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp-macro-expander.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-macro-expander.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp-macro.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-macro.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp-main.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-main.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp-scanner.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-scanner.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp-string.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-string.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp-symbol.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp-symbol.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/pp.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/pp.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/preprocessor.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/preprocessor.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Harald Fernengel <harry@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rpp/preprocessor.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rpp/preprocessor.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright 2005 Harald Fernengel <harry@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/rxx_allocator.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/rxx_allocator.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/smallobject.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/smallobject.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/smallobject.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/smallobject.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/symbol.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/symbol.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/tokens.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/tokens.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/tokens.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/tokens.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/type_compiler.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/type_compiler.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/type_compiler.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/type_compiler.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/visitor.cpp Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/visitor.cpp Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/generator/parser/visitor.h Mon May 18 14:25:52 2009 +0000 +++ b/generator/parser/visitor.h Mon May 18 15:23:28 2009 +0000 @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 1992-2008 Nokia. All rights reserved. +** Copyright (C) 1992-2009 Nokia. All rights reserved. ** Copyright (C) 2002-2005 Roberto Raggi <roberto@kdevelop.org> ** ** This file is part of Qt Jambi. ** -** * Commercial Usage -* Licensees holding valid Qt Commercial licenses may use this file in -* accordance with the Qt Commercial License Agreement provided with the -* Software or, alternatively, in accordance with the terms contained in -* a written agreement between you and Nokia. -* -* -* GNU General Public License Usage -* Alternatively, this file may be used under the terms of the GNU -* General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -* http://www.fsf.org/licensing/licenses/info/GPLv2.html and -* http://www.gnu.org/copyleft/gpl.html. In addition, as a special -* exception, Nokia gives you certain additional rights. These rights -* are described in the Nokia Qt GPL Exception version 1.2, included in -* the file GPL_EXCEPTION.txt in this package. -* -* Qt for Windows(R) Licensees -* As a special exception, Nokia, as the sole copyright holder for Qt -* Designer, grants users of the Qt/Eclipse Integration plug-in the -* right for the Qt/Eclipse Integration to link to functionality -* provided by Qt Designer and its related libraries. -* -* -* If you are unsure which license is appropriate for your use, please -* contact the sales department at qt-sales@nokia.com. +** Commercial Usage +Licensees holding valid Qt Commercial licenses may use this file in +accordance with the Qt Commercial License Agreement provided with the +Software or, alternatively, in accordance with the terms contained in +a written agreement between you and Nokia. + +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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- a/tools/duic/d/dwritedeclaration.cpp Mon May 18 14:25:52 2009 +0000 +++ b/tools/duic/d/dwritedeclaration.cpp Mon May 18 15:23:28 2009 +0000 @@ -205,7 +205,7 @@ // qtd m_output << "struct " << className << " {\n" << " mixin " << m_option.prefix << className << ";\n" - << "}\n"; + << "}\n\n"; // --- if (m_option.generateNamespace && !m_option.prefix.isEmpty()) {
--- a/tools/duic/tests/ui_mainwindow.d Mon May 18 14:25:52 2009 +0000 +++ b/tools/duic/tests/ui_mainwindow.d Mon May 18 15:23:28 2009 +0000 @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading ui file 'mainwindow.ui' ** -** Created: Mon May 18 06:21:12 2009 +** Created: Mon May 18 06:38:11 2009 ** by: QtD User Interface Compiler version 4.5.0 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! @@ -208,5 +208,6 @@ struct MainWindow { mixin Ui_MainWindow; } + mixin QT_END_NAMESPACE;