From 29a0fc05c1c0d31adc3787feb4d79bcc0af930f8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 2 Jun 2011 12:48:59 +0200 Subject: "fix" license headers our policy and even more its implementation is mildly braindead ... --- tools/linguist/shared/ioutils.cpp | 37 +++++++++++++++++++----------- tools/linguist/shared/ioutils.h | 37 +++++++++++++++++++----------- tools/linguist/shared/profileevaluator.cpp | 37 +++++++++++++++++++----------- tools/linguist/shared/profileevaluator.h | 37 +++++++++++++++++++----------- tools/linguist/shared/profileparser.cpp | 37 +++++++++++++++++++----------- tools/linguist/shared/profileparser.h | 37 +++++++++++++++++++----------- tools/linguist/shared/proitems.cpp | 37 +++++++++++++++++++----------- tools/linguist/shared/proitems.h | 37 +++++++++++++++++++----------- tools/linguist/shared/proparser_global.h | 37 +++++++++++++++++++----------- 9 files changed, 207 insertions(+), 126 deletions(-) diff --git a/tools/linguist/shared/ioutils.cpp b/tools/linguist/shared/ioutils.cpp index fbee8fc..9658cf6 100644 --- a/tools/linguist/shared/ioutils.cpp +++ b/tools/linguist/shared/ioutils.cpp @@ -1,34 +1,43 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) ** +** This file is part of the Qt Linguist of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage -** ** 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: +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage +** 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. ** +** Other Usage ** Alternatively, this file may be used in accordance with the terms and ** conditions contained in a signed written agreement between you and Nokia. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -**************************************************************************/ +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #include "ioutils.h" diff --git a/tools/linguist/shared/ioutils.h b/tools/linguist/shared/ioutils.h index d04ddc7..e013aef 100644 --- a/tools/linguist/shared/ioutils.h +++ b/tools/linguist/shared/ioutils.h @@ -1,34 +1,43 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) ** +** This file is part of the Qt Linguist of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage -** ** 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: +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage +** 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. ** +** Other Usage ** Alternatively, this file may be used in accordance with the terms and ** conditions contained in a signed written agreement between you and Nokia. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -**************************************************************************/ +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #ifndef IOUTILS_H #define IOUTILS_H diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index f3b4c3d..0539efa 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -1,34 +1,43 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) ** +** This file is part of the Qt Linguist of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage -** ** 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: +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage +** 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. ** +** Other Usage ** Alternatively, this file may be used in accordance with the terms and ** conditions contained in a signed written agreement between you and Nokia. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -**************************************************************************/ +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #include "profileevaluator.h" diff --git a/tools/linguist/shared/profileevaluator.h b/tools/linguist/shared/profileevaluator.h index 003042b..b3086bf 100644 --- a/tools/linguist/shared/profileevaluator.h +++ b/tools/linguist/shared/profileevaluator.h @@ -1,34 +1,43 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) ** +** This file is part of the Qt Linguist of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage -** ** 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: +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage +** 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. ** +** Other Usage ** Alternatively, this file may be used in accordance with the terms and ** conditions contained in a signed written agreement between you and Nokia. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -**************************************************************************/ +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #ifndef PROFILEEVALUATOR_H #define PROFILEEVALUATOR_H diff --git a/tools/linguist/shared/profileparser.cpp b/tools/linguist/shared/profileparser.cpp index a541ab3..5ba33fc 100644 --- a/tools/linguist/shared/profileparser.cpp +++ b/tools/linguist/shared/profileparser.cpp @@ -1,34 +1,43 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) ** +** This file is part of the Qt Linguist of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage -** ** 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: +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage +** 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. ** +** Other Usage ** Alternatively, this file may be used in accordance with the terms and ** conditions contained in a signed written agreement between you and Nokia. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -**************************************************************************/ +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #include "profileparser.h" diff --git a/tools/linguist/shared/profileparser.h b/tools/linguist/shared/profileparser.h index 3f4593a..643e339 100644 --- a/tools/linguist/shared/profileparser.h +++ b/tools/linguist/shared/profileparser.h @@ -1,34 +1,43 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) ** +** This file is part of the Qt Linguist of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage -** ** 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: +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage +** 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. ** +** Other Usage ** Alternatively, this file may be used in accordance with the terms and ** conditions contained in a signed written agreement between you and Nokia. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -**************************************************************************/ +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #ifndef PROFILEPARSER_H #define PROFILEPARSER_H diff --git a/tools/linguist/shared/proitems.cpp b/tools/linguist/shared/proitems.cpp index 0b65126..103a788 100644 --- a/tools/linguist/shared/proitems.cpp +++ b/tools/linguist/shared/proitems.cpp @@ -1,34 +1,43 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) ** +** This file is part of the Qt Linguist of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage -** ** 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: +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage +** 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. ** +** Other Usage ** Alternatively, this file may be used in accordance with the terms and ** conditions contained in a signed written agreement between you and Nokia. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -**************************************************************************/ +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #include "proitems.h" diff --git a/tools/linguist/shared/proitems.h b/tools/linguist/shared/proitems.h index 4967b27..a687410 100644 --- a/tools/linguist/shared/proitems.h +++ b/tools/linguist/shared/proitems.h @@ -1,34 +1,43 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) ** +** This file is part of the Qt Linguist of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage -** ** 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: +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage +** 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. ** +** Other Usage ** Alternatively, this file may be used in accordance with the terms and ** conditions contained in a signed written agreement between you and Nokia. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -**************************************************************************/ +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #ifndef PROITEMS_H #define PROITEMS_H diff --git a/tools/linguist/shared/proparser_global.h b/tools/linguist/shared/proparser_global.h index dd3114b..2b0b6db 100644 --- a/tools/linguist/shared/proparser_global.h +++ b/tools/linguist/shared/proparser_global.h @@ -1,34 +1,43 @@ -/************************************************************************** +/**************************************************************************** ** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) ** +** This file is part of the Qt Linguist of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:LGPL$ ** GNU Lesser General Public License Usage -** ** 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: +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** Other Usage +** 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. ** +** Other Usage ** Alternatively, this file may be used in accordance with the terms and ** conditions contained in a signed written agreement between you and Nokia. ** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. ** -**************************************************************************/ +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #ifndef PROPARSER_GLOBAL_H #define PROPARSER_GLOBAL_H -- cgit v0.12