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/qtreeview-dnd | |
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/qtreeview-dnd')
8 files changed, 18 insertions, 18 deletions
diff --git a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/dragdropmodel.h b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/dragdropmodel.h index 6c014e628..3db371e32 100644 --- a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/dragdropmodel.h +++ b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/dragdropmodel.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. ** @@ -41,8 +41,8 @@ /**************************************************************************** ** -** 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 an example program for Qt. ** EDITIONS: NOLIMITS diff --git a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/main.cpp b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/main.cpp index 47eb2bfcd..88d5838ea 100644 --- a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/main.cpp +++ b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/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/qtreeview-dnd/mainwindow.cpp b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/mainwindow.cpp index a31559251..ec7bf9157 100644 --- a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/mainwindow.cpp +++ b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/mainwindow.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/qtreeview-dnd/mainwindow.h b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/mainwindow.h index 29a3072d1..2e955480d 100644 --- a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/mainwindow.h +++ b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/mainwindow.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/qtreeview-dnd/treeitem.cpp b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treeitem.cpp index 5f3250c40..f213f480e 100644 --- a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treeitem.cpp +++ b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treeitem.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/qtreeview-dnd/treeitem.h b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treeitem.h index b1c126e06..fa32877ba 100644 --- a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treeitem.h +++ b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treeitem.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/qtreeview-dnd/treemodel.cpp b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treemodel.cpp index 1d72ceb85..89249f826 100644 --- a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treemodel.cpp +++ b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treemodel.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/qtreeview-dnd/treemodel.h b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treemodel.h index a009d3bae..5c3604f3e 100644 --- a/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treemodel.h +++ b/doc/codesnippets/doc/src/snippets/qtreeview-dnd/treemodel.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. ** |