From cfe10226261e96e7adbd5abb6120081552dffa6f Mon Sep 17 00:00:00 2001 From: Teemu Kaukoranta Date: Mon, 27 May 2013 12:07:42 +0300 Subject: Replaced Nokia copyrights and contact details Replaced Nokia copyrights with correct Digia copyrights. Text in front of copyright is now retained: ** File is part of Foo, Copyright Nokia... -> ** File is part of Foo, Copyright Digia... Replaced Nokia contact details with Digia's. Removing "All Rights Reserved" no longer leaves an empty line. 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}') Command now finds command details that point to qt-project.org and changes them to qt-project.org/legal Also no longer wrongly replaces code snippet "copyright = ..". Need to fix these case-by-case later. Change-Id: I627e378a0fa5dfb0224444dd8f08e0712df6eb0f Reviewed-by: Sergio Ahumada --- src/mimetypes/qmimedatabase.cpp | 2 +- src/mimetypes/qmimedatabase.h | 2 +- src/mimetypes/qmimedatabase_p.h | 2 +- src/mimetypes/qmimeglobpattern.cpp | 2 +- src/mimetypes/qmimeglobpattern_p.h | 2 +- src/mimetypes/qmimemagicrule.cpp | 2 +- src/mimetypes/qmimemagicrule_p.h | 2 +- src/mimetypes/qmimemagicrulematcher.cpp | 2 +- src/mimetypes/qmimemagicrulematcher_p.h | 2 +- src/mimetypes/qmimeprovider.cpp | 2 +- src/mimetypes/qmimeprovider_p.h | 2 +- src/mimetypes/qmimetype.cpp | 2 +- src/mimetypes/qmimetype.h | 2 +- src/mimetypes/qmimetype_p.h | 2 +- src/mimetypes/qmimetypeparser.cpp | 2 +- src/mimetypes/qmimetypeparser_p.h | 2 +- .../auto/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp | 2 +- tests/auto/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp | 2 +- tests/auto/qmimedatabase/tst_qmimedatabase.cpp | 2 +- tests/auto/qmimedatabase/tst_qmimedatabase.h | 2 +- tests/auto/qmimetype/tst_qmimetype.cpp | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/mimetypes/qmimedatabase.cpp b/src/mimetypes/qmimedatabase.cpp index 960fc7c..d8d379d 100644 --- a/src/mimetypes/qmimedatabase.cpp +++ b/src/mimetypes/qmimedatabase.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimedatabase.h b/src/mimetypes/qmimedatabase.h index 13932ac..51485d1 100644 --- a/src/mimetypes/qmimedatabase.h +++ b/src/mimetypes/qmimedatabase.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimedatabase_p.h b/src/mimetypes/qmimedatabase_p.h index e178470..78bb6c2 100644 --- a/src/mimetypes/qmimedatabase_p.h +++ b/src/mimetypes/qmimedatabase_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimeglobpattern.cpp b/src/mimetypes/qmimeglobpattern.cpp index 4c29bd0..2cefa74 100644 --- a/src/mimetypes/qmimeglobpattern.cpp +++ b/src/mimetypes/qmimeglobpattern.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimeglobpattern_p.h b/src/mimetypes/qmimeglobpattern_p.h index e983282..ca22aa9 100644 --- a/src/mimetypes/qmimeglobpattern_p.h +++ b/src/mimetypes/qmimeglobpattern_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimemagicrule.cpp b/src/mimetypes/qmimemagicrule.cpp index 30b607f..b4facb4 100644 --- a/src/mimetypes/qmimemagicrule.cpp +++ b/src/mimetypes/qmimemagicrule.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimemagicrule_p.h b/src/mimetypes/qmimemagicrule_p.h index ca84d08..c252440 100644 --- a/src/mimetypes/qmimemagicrule_p.h +++ b/src/mimetypes/qmimemagicrule_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimemagicrulematcher.cpp b/src/mimetypes/qmimemagicrulematcher.cpp index 0d587a3..13d5e95 100644 --- a/src/mimetypes/qmimemagicrulematcher.cpp +++ b/src/mimetypes/qmimemagicrulematcher.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimemagicrulematcher_p.h b/src/mimetypes/qmimemagicrulematcher_p.h index b36f8fb..80ae402 100644 --- a/src/mimetypes/qmimemagicrulematcher_p.h +++ b/src/mimetypes/qmimemagicrulematcher_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimeprovider.cpp b/src/mimetypes/qmimeprovider.cpp index 013172b..0f77b95 100644 --- a/src/mimetypes/qmimeprovider.cpp +++ b/src/mimetypes/qmimeprovider.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimeprovider_p.h b/src/mimetypes/qmimeprovider_p.h index 194ac7b..8b0e9c2 100644 --- a/src/mimetypes/qmimeprovider_p.h +++ b/src/mimetypes/qmimeprovider_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimetype.cpp b/src/mimetypes/qmimetype.cpp index 0511d8b..4f80db4 100644 --- a/src/mimetypes/qmimetype.cpp +++ b/src/mimetypes/qmimetype.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimetype.h b/src/mimetypes/qmimetype.h index 3e45ec7..78bf9f7 100644 --- a/src/mimetypes/qmimetype.h +++ b/src/mimetypes/qmimetype.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimetype_p.h b/src/mimetypes/qmimetype_p.h index 9cea5d6..8d392da 100644 --- a/src/mimetypes/qmimetype_p.h +++ b/src/mimetypes/qmimetype_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimetypeparser.cpp b/src/mimetypes/qmimetypeparser.cpp index d205ecd..60497b9 100644 --- a/src/mimetypes/qmimetypeparser.cpp +++ b/src/mimetypes/qmimetypeparser.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/mimetypes/qmimetypeparser_p.h b/src/mimetypes/qmimetypeparser_p.h index 42352f1..45df6a9 100644 --- a/src/mimetypes/qmimetypeparser_p.h +++ b/src/mimetypes/qmimetypeparser_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/tests/auto/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp b/tests/auto/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp index 28b2470..53ad1ef 100644 --- a/tests/auto/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp +++ b/tests/auto/qmimedatabase/qmimedatabase-cache/tst_qmimedatabase-cache.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/auto/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp b/tests/auto/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp index 4585843..18ecd11 100644 --- a/tests/auto/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp +++ b/tests/auto/qmimedatabase/qmimedatabase-xml/tst_qmimedatabase-xml.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp index 2de1e89..a2018a3 100644 --- a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/auto/qmimedatabase/tst_qmimedatabase.h b/tests/auto/qmimedatabase/tst_qmimedatabase.h index 017eb2b..20b9068 100644 --- a/tests/auto/qmimedatabase/tst_qmimedatabase.h +++ b/tests/auto/qmimedatabase/tst_qmimedatabase.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** diff --git a/tests/auto/qmimetype/tst_qmimetype.cpp b/tests/auto/qmimetype/tst_qmimetype.cpp index a6f4cda..d80198e 100644 --- a/tests/auto/qmimetype/tst_qmimetype.cpp +++ b/tests/auto/qmimetype/tst_qmimetype.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** -- cgit v1.2.3