summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-27 10:43:56 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-27 20:40:15 +0200
commitf030fdcd99e1e8eb5ef47d6e332beedb04787cf1 (patch)
treeb1e6f244726c61a6adf84bb183fc0f7563e66d90
parent93f609ee36a03ad4ff2162cf45e381f4eb78c78b (diff)
Replaced Nokia copyrights and contact detailsHEADmaster
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.*Nokia.*' {} \; | tee >(xargs sed -i -r '1,50 { /INdT/ !{ 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.*) /\1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs sed -i -r '1,50{/(^[ \t:#*]*)(all rights reserved.*)/Id}') Change-Id: I7bb83e506f202c1d90034aa1ff60839a0a11e42f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--simpletest/tst_simple_mimetypes.cpp5
-rw-r--r--src/imports/mimetypes/mimetypes.cpp5
-rw-r--r--src/imports/mimetypes/qdeclarativemimetype.cpp5
-rw-r--r--src/imports/mimetypes/qdeclarativemimetype_p.h5
-rw-r--r--src/imports/mimetypes/qdeclarativemimetyperegistry.cpp5
-rw-r--r--src/imports/mimetypes/qdeclarativemimetyperegistry_p.h5
-rw-r--r--src/imports/mimetypes/qdeclarativeserviceaction.cpp5
-rw-r--r--src/imports/mimetypes/qdeclarativeserviceaction_p.h5
-rw-r--r--src/mimetypes/qmimetype.cpp5
-rw-r--r--src/mimetypes/qmimetype.h5
-rw-r--r--src/mimetypes/qmimetype_p.h5
-rw-r--r--src/mimetypes/qmimetyperegistry.cpp5
-rw-r--r--src/mimetypes/qmimetyperegistry.h5
-rw-r--r--src/mimetypes/qmimetyperegistry_empty.cpp5
-rw-r--r--src/mimetypes/qmimetypesfwd.h5
-rw-r--r--src/mimetypes/qserviceaction.cpp5
-rw-r--r--src/mimetypes/qserviceaction.h5
-rw-r--r--src/mimetypes/qserviceaction_p.h5
-rw-r--r--unittests/declarative/tst_declarative_mimetypes.cpp5
-rw-r--r--unittests/declarative/tst_declarative_mimetypes.qml5
-rw-r--r--unittests/tst_mimetypes-empty.cpp5
-rw-r--r--unittests/tst_mimetypes.h5
22 files changed, 44 insertions, 66 deletions
diff --git a/simpletest/tst_simple_mimetypes.cpp b/simpletest/tst_simple_mimetypes.cpp
index bd356c3..4795469 100644
--- a/simpletest/tst_simple_mimetypes.cpp
+++ b/simpletest/tst_simple_mimetypes.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/mimetypes.cpp b/src/imports/mimetypes/mimetypes.cpp
index 259fd2b..603c746 100644
--- a/src/imports/mimetypes/mimetypes.cpp
+++ b/src/imports/mimetypes/mimetypes.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/qdeclarativemimetype.cpp b/src/imports/mimetypes/qdeclarativemimetype.cpp
index 74d134c..0a022d2 100644
--- a/src/imports/mimetypes/qdeclarativemimetype.cpp
+++ b/src/imports/mimetypes/qdeclarativemimetype.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/qdeclarativemimetype_p.h b/src/imports/mimetypes/qdeclarativemimetype_p.h
index 79b5808..0610731 100644
--- a/src/imports/mimetypes/qdeclarativemimetype_p.h
+++ b/src/imports/mimetypes/qdeclarativemimetype_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp b/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
index 31a8b2d..092ac6f 100644
--- a/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
+++ b/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h b/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
index 04decd1..06a6cb2 100644
--- a/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
+++ b/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/qdeclarativeserviceaction.cpp b/src/imports/mimetypes/qdeclarativeserviceaction.cpp
index f340698..83d6382 100644
--- a/src/imports/mimetypes/qdeclarativeserviceaction.cpp
+++ b/src/imports/mimetypes/qdeclarativeserviceaction.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/imports/mimetypes/qdeclarativeserviceaction_p.h b/src/imports/mimetypes/qdeclarativeserviceaction_p.h
index 6116170..db66530 100644
--- a/src/imports/mimetypes/qdeclarativeserviceaction_p.h
+++ b/src/imports/mimetypes/qdeclarativeserviceaction_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/qmimetype.cpp b/src/mimetypes/qmimetype.cpp
index aa39e3f..3d0e6d9 100644
--- a/src/mimetypes/qmimetype.cpp
+++ b/src/mimetypes/qmimetype.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/qmimetype.h b/src/mimetypes/qmimetype.h
index ccc1316..58393c0 100644
--- a/src/mimetypes/qmimetype.h
+++ b/src/mimetypes/qmimetype.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/qmimetype_p.h b/src/mimetypes/qmimetype_p.h
index 7f8586c..7d83824 100644
--- a/src/mimetypes/qmimetype_p.h
+++ b/src/mimetypes/qmimetype_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/qmimetyperegistry.cpp b/src/mimetypes/qmimetyperegistry.cpp
index 4376ea5..53f19b9 100644
--- a/src/mimetypes/qmimetyperegistry.cpp
+++ b/src/mimetypes/qmimetyperegistry.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/qmimetyperegistry.h b/src/mimetypes/qmimetyperegistry.h
index 1d3a0d7..d0d7734 100644
--- a/src/mimetypes/qmimetyperegistry.h
+++ b/src/mimetypes/qmimetyperegistry.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/qmimetyperegistry_empty.cpp b/src/mimetypes/qmimetyperegistry_empty.cpp
index fed643a..8cb104d 100644
--- a/src/mimetypes/qmimetyperegistry_empty.cpp
+++ b/src/mimetypes/qmimetyperegistry_empty.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/qmimetypesfwd.h b/src/mimetypes/qmimetypesfwd.h
index bc73083..de1b82f 100644
--- a/src/mimetypes/qmimetypesfwd.h
+++ b/src/mimetypes/qmimetypesfwd.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/qserviceaction.cpp b/src/mimetypes/qserviceaction.cpp
index 0425714..d0e909a 100644
--- a/src/mimetypes/qserviceaction.cpp
+++ b/src/mimetypes/qserviceaction.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/qserviceaction.h b/src/mimetypes/qserviceaction.h
index 9e98a3a..d76d55d 100644
--- a/src/mimetypes/qserviceaction.h
+++ b/src/mimetypes/qserviceaction.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/src/mimetypes/qserviceaction_p.h b/src/mimetypes/qserviceaction_p.h
index d247e6b..1fbf341 100644
--- a/src/mimetypes/qserviceaction_p.h
+++ b/src/mimetypes/qserviceaction_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/unittests/declarative/tst_declarative_mimetypes.cpp b/unittests/declarative/tst_declarative_mimetypes.cpp
index efb5053..08cf3e3 100644
--- a/unittests/declarative/tst_declarative_mimetypes.cpp
+++ b/unittests/declarative/tst_declarative_mimetypes.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/unittests/declarative/tst_declarative_mimetypes.qml b/unittests/declarative/tst_declarative_mimetypes.qml
index 6cc7394..8259036 100644
--- a/unittests/declarative/tst_declarative_mimetypes.qml
+++ b/unittests/declarative/tst_declarative_mimetypes.qml
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/unittests/tst_mimetypes-empty.cpp b/unittests/tst_mimetypes-empty.cpp
index 5c16079..c23c789 100644
--- a/unittests/tst_mimetypes-empty.cpp
+++ b/unittests/tst_mimetypes-empty.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**
diff --git a/unittests/tst_mimetypes.h b/unittests/tst_mimetypes.h
index d5e7cb8..59b46be 100644
--- a/unittests/tst_mimetypes.h
+++ b/unittests/tst_mimetypes.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 QtMimeTypes addon of the Qt Toolkit.
**