diff options
author | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-05-27 12:18:57 +0300 |
---|---|---|
committer | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-05-28 09:29:50 +0200 |
commit | 188e960e496ad31839ab879e139c4f1cf9f10656 (patch) | |
tree | 2a2fb6648c712004a80d854c3041a0520493030f /doc/codesnippets/doc/src/snippets/updating-selections | |
parent | fa2e571b6c68aa9439a88fc7ab441b6e091268df (diff) |
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: I4456c00202c4a2264a400bdc18c19cd097876861
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'doc/codesnippets/doc/src/snippets/updating-selections')
4 files changed, 8 insertions, 8 deletions
diff --git a/doc/codesnippets/doc/src/snippets/updating-selections/main.cpp b/doc/codesnippets/doc/src/snippets/updating-selections/main.cpp index d5997393f..50cff6cbd 100644 --- a/doc/codesnippets/doc/src/snippets/updating-selections/main.cpp +++ b/doc/codesnippets/doc/src/snippets/updating-selections/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/codesnippets/doc/src/snippets/updating-selections/model.h b/doc/codesnippets/doc/src/snippets/updating-selections/model.h index 0408cf1be..c050d3426 100644 --- a/doc/codesnippets/doc/src/snippets/updating-selections/model.h +++ b/doc/codesnippets/doc/src/snippets/updating-selections/model.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/codesnippets/doc/src/snippets/updating-selections/window.cpp b/doc/codesnippets/doc/src/snippets/updating-selections/window.cpp index f03d524ec..f9ebfcd1e 100644 --- a/doc/codesnippets/doc/src/snippets/updating-selections/window.cpp +++ b/doc/codesnippets/doc/src/snippets/updating-selections/window.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/codesnippets/doc/src/snippets/updating-selections/window.h b/doc/codesnippets/doc/src/snippets/updating-selections/window.h index 57b36a70d..6eff8b2b1 100644 --- a/doc/codesnippets/doc/src/snippets/updating-selections/window.h +++ b/doc/codesnippets/doc/src/snippets/updating-selections/window.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. ** |