diff options
author | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-05-28 11:06:14 (GMT) |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-11 04:08:21 (GMT) |
commit | c504d5b8047483e87fd1cfad2c2824353310c5da (patch) | |
tree | a189602d4677210a05b0fe24c72c4c5c94cbe1b7 /tools | |
parent | 5a466fc74a67e6c28722c9e0d26fcf876c7a0e9b (diff) | |
download | Qt-c504d5b8047483e87fd1cfad2c2824353310c5da.zip Qt-c504d5b8047483e87fd1cfad2c2824353310c5da.tar.gz Qt-c504d5b8047483e87fd1cfad2c2824353310c5da.tar.bz2 |
Fixed copyright and contact headers
Removed deprecated "all rights reserved" strings
Changed contact details to qt-project.org/legal
Used the following command:
find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E
'.*Copyright.*Nokia.*|.*Contact.*' {} \; | tee
>(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{
s/(^[ \t:#*;/"\\-]*)([a-z ]*)(Copyright.*Nokia.*)/
\1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I
}}') >(xargs sed -i -r '1,50 s/(^[ \t:#*;/"\\-]*)
(.*info@qt\.nokia\.com.*|.*INSERT EMAIL ADDRESS.*
|.*qt-info@nokia\.com.*|.*qt-label1@nokia\.com.*
|.*http:\/\/qt\.nokia\.com\/contact.*|.*qt-sales@nokia\.com.*
|.*http:\/\/www\.qt-project\.org\/.*)/
\1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs
sed -i -r '1,50{/(^[ \t:#*;/"\\-]*)(all rights reserved.*)/Id}')
Change-Id: Ic57037fd897a54440e4bad0939ee2bf9f1dfcd5d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'tools')
34 files changed, 34 insertions, 34 deletions
diff --git a/tools/assistant/lib/fulltextsearch/qanalyzer.cpp b/tools/assistant/lib/fulltextsearch/qanalyzer.cpp index 1bd67d1..4aaacf0 100644 --- a/tools/assistant/lib/fulltextsearch/qanalyzer.cpp +++ b/tools/assistant/lib/fulltextsearch/qanalyzer.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qanalyzer_p.h b/tools/assistant/lib/fulltextsearch/qanalyzer_p.h index c5c50a7..af883ff 100644 --- a/tools/assistant/lib/fulltextsearch/qanalyzer_p.h +++ b/tools/assistant/lib/fulltextsearch/qanalyzer_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qclucene-config_p.h b/tools/assistant/lib/fulltextsearch/qclucene-config_p.h index 4b098bc..c90eebc 100644 --- a/tools/assistant/lib/fulltextsearch/qclucene-config_p.h +++ b/tools/assistant/lib/fulltextsearch/qclucene-config_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h index 337f3ea..4939510 100644 --- a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h +++ b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qdocument.cpp b/tools/assistant/lib/fulltextsearch/qdocument.cpp index 87ce943..845aef6 100644 --- a/tools/assistant/lib/fulltextsearch/qdocument.cpp +++ b/tools/assistant/lib/fulltextsearch/qdocument.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qdocument_p.h b/tools/assistant/lib/fulltextsearch/qdocument_p.h index 3691aa7..4aac0ee 100644 --- a/tools/assistant/lib/fulltextsearch/qdocument_p.h +++ b/tools/assistant/lib/fulltextsearch/qdocument_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qfield.cpp b/tools/assistant/lib/fulltextsearch/qfield.cpp index b62cdc7..c68319e 100644 --- a/tools/assistant/lib/fulltextsearch/qfield.cpp +++ b/tools/assistant/lib/fulltextsearch/qfield.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qfield_p.h b/tools/assistant/lib/fulltextsearch/qfield_p.h index 29208de..559a92e 100644 --- a/tools/assistant/lib/fulltextsearch/qfield_p.h +++ b/tools/assistant/lib/fulltextsearch/qfield_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qfilter.cpp b/tools/assistant/lib/fulltextsearch/qfilter.cpp index f54b637..33fc9ef 100644 --- a/tools/assistant/lib/fulltextsearch/qfilter.cpp +++ b/tools/assistant/lib/fulltextsearch/qfilter.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qfilter_p.h b/tools/assistant/lib/fulltextsearch/qfilter_p.h index fa8aebf..6ac01e7 100644 --- a/tools/assistant/lib/fulltextsearch/qfilter_p.h +++ b/tools/assistant/lib/fulltextsearch/qfilter_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qhits.cpp b/tools/assistant/lib/fulltextsearch/qhits.cpp index 52fb948..38cdf71 100644 --- a/tools/assistant/lib/fulltextsearch/qhits.cpp +++ b/tools/assistant/lib/fulltextsearch/qhits.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qhits_p.h b/tools/assistant/lib/fulltextsearch/qhits_p.h index 2164a64..f8d7a67 100644 --- a/tools/assistant/lib/fulltextsearch/qhits_p.h +++ b/tools/assistant/lib/fulltextsearch/qhits_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qindexreader.cpp b/tools/assistant/lib/fulltextsearch/qindexreader.cpp index 60fe10d..2014961 100644 --- a/tools/assistant/lib/fulltextsearch/qindexreader.cpp +++ b/tools/assistant/lib/fulltextsearch/qindexreader.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qindexreader_p.h b/tools/assistant/lib/fulltextsearch/qindexreader_p.h index 5d2a81b..d2c0bd7 100644 --- a/tools/assistant/lib/fulltextsearch/qindexreader_p.h +++ b/tools/assistant/lib/fulltextsearch/qindexreader_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qindexwriter.cpp b/tools/assistant/lib/fulltextsearch/qindexwriter.cpp index d07ee47..5127ffd 100644 --- a/tools/assistant/lib/fulltextsearch/qindexwriter.cpp +++ b/tools/assistant/lib/fulltextsearch/qindexwriter.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qindexwriter_p.h b/tools/assistant/lib/fulltextsearch/qindexwriter_p.h index 39c52c7..cf4a0f9 100644 --- a/tools/assistant/lib/fulltextsearch/qindexwriter_p.h +++ b/tools/assistant/lib/fulltextsearch/qindexwriter_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qquery.cpp b/tools/assistant/lib/fulltextsearch/qquery.cpp index 350868c..9f205f5 100644 --- a/tools/assistant/lib/fulltextsearch/qquery.cpp +++ b/tools/assistant/lib/fulltextsearch/qquery.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qquery_p.h b/tools/assistant/lib/fulltextsearch/qquery_p.h index f6ebb26..924098d 100644 --- a/tools/assistant/lib/fulltextsearch/qquery_p.h +++ b/tools/assistant/lib/fulltextsearch/qquery_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qqueryparser.cpp b/tools/assistant/lib/fulltextsearch/qqueryparser.cpp index 2b93484..e3eb0c7 100644 --- a/tools/assistant/lib/fulltextsearch/qqueryparser.cpp +++ b/tools/assistant/lib/fulltextsearch/qqueryparser.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qqueryparser_p.h b/tools/assistant/lib/fulltextsearch/qqueryparser_p.h index 7d68bb2..d108f3b 100644 --- a/tools/assistant/lib/fulltextsearch/qqueryparser_p.h +++ b/tools/assistant/lib/fulltextsearch/qqueryparser_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qreader.cpp b/tools/assistant/lib/fulltextsearch/qreader.cpp index 9b17afe..f63ef04 100644 --- a/tools/assistant/lib/fulltextsearch/qreader.cpp +++ b/tools/assistant/lib/fulltextsearch/qreader.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qreader_p.h b/tools/assistant/lib/fulltextsearch/qreader_p.h index b81dc42..60ed333 100644 --- a/tools/assistant/lib/fulltextsearch/qreader_p.h +++ b/tools/assistant/lib/fulltextsearch/qreader_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qsearchable.cpp b/tools/assistant/lib/fulltextsearch/qsearchable.cpp index 368e48c..7ff3b63 100644 --- a/tools/assistant/lib/fulltextsearch/qsearchable.cpp +++ b/tools/assistant/lib/fulltextsearch/qsearchable.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qsearchable_p.h b/tools/assistant/lib/fulltextsearch/qsearchable_p.h index b2f2750..e836d37 100644 --- a/tools/assistant/lib/fulltextsearch/qsearchable_p.h +++ b/tools/assistant/lib/fulltextsearch/qsearchable_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qsort.cpp b/tools/assistant/lib/fulltextsearch/qsort.cpp index fcb4383..5371bcb 100644 --- a/tools/assistant/lib/fulltextsearch/qsort.cpp +++ b/tools/assistant/lib/fulltextsearch/qsort.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qsort_p.h b/tools/assistant/lib/fulltextsearch/qsort_p.h index 1870701..03c005b 100644 --- a/tools/assistant/lib/fulltextsearch/qsort_p.h +++ b/tools/assistant/lib/fulltextsearch/qsort_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qterm.cpp b/tools/assistant/lib/fulltextsearch/qterm.cpp index 2a5c980..5ff89b9 100644 --- a/tools/assistant/lib/fulltextsearch/qterm.cpp +++ b/tools/assistant/lib/fulltextsearch/qterm.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qterm_p.h b/tools/assistant/lib/fulltextsearch/qterm_p.h index a783ba9..44e5d36 100644 --- a/tools/assistant/lib/fulltextsearch/qterm_p.h +++ b/tools/assistant/lib/fulltextsearch/qterm_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qtoken.cpp b/tools/assistant/lib/fulltextsearch/qtoken.cpp index 18c2311..d65ffd9 100644 --- a/tools/assistant/lib/fulltextsearch/qtoken.cpp +++ b/tools/assistant/lib/fulltextsearch/qtoken.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qtoken_p.h b/tools/assistant/lib/fulltextsearch/qtoken_p.h index 8dfd091..bf0e1b3 100644 --- a/tools/assistant/lib/fulltextsearch/qtoken_p.h +++ b/tools/assistant/lib/fulltextsearch/qtoken_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qtokenizer.cpp b/tools/assistant/lib/fulltextsearch/qtokenizer.cpp index 32eab93..6a9f177 100644 --- a/tools/assistant/lib/fulltextsearch/qtokenizer.cpp +++ b/tools/assistant/lib/fulltextsearch/qtokenizer.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qtokenizer_p.h b/tools/assistant/lib/fulltextsearch/qtokenizer_p.h index bf44ce6..9c052cf 100644 --- a/tools/assistant/lib/fulltextsearch/qtokenizer_p.h +++ b/tools/assistant/lib/fulltextsearch/qtokenizer_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qtokenstream.cpp b/tools/assistant/lib/fulltextsearch/qtokenstream.cpp index bcceb9a..f28879a 100644 --- a/tools/assistant/lib/fulltextsearch/qtokenstream.cpp +++ b/tools/assistant/lib/fulltextsearch/qtokenstream.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 diff --git a/tools/assistant/lib/fulltextsearch/qtokenstream_p.h b/tools/assistant/lib/fulltextsearch/qtokenstream_p.h index 8f07901..b5217cd 100644 --- a/tools/assistant/lib/fulltextsearch/qtokenstream_p.h +++ b/tools/assistant/lib/fulltextsearch/qtokenstream_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** ** Portion Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. + ** ** 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 |