summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-22 11:13:55 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-23 11:19:14 +0200
commit657f08da5abfdbc003f5c0d202a6a0c467969ba8 (patch)
tree6e7cabd5d0f555cc5452123d82fb09e7d9e3f798
parent4b9822e094020da9879614afce5052f5c35b01b0 (diff)
Replaced Nokia copyrights in headerHEADmaster
Replaced old Nokia copyrights with Digia copyrights. Removed "All rights reserved" strings without leading copyrights were removed (for example, 'Copyright SomeCompany, all rights reserved remain untouched). Did NOT touch contact details, will change them later. Excluded folders that have '3rdparty' in path. Used command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*' {} \; | tee >(xargs sed -i -r '1,10 s/([ \t#*]*)(.*Copyright.*Nokia.*)/ \1Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I') >(xargs sed -i -r '1,10 s/(^[ \t#*]*)(all rights reserved.*)/\1/I') This excludes binary files and retains whitespace and #* characters in the beginning of the edited lines. Change-Id: I47899537bdb2fa92dd5b2aa981de08102219dd8d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
-rw-r--r--doc/src/QAlignedtimer/QAlignedtimer.qdoc2
-rw-r--r--src/alignedtimer/qalignedtimer.cpp2
-rw-r--r--src/alignedtimer/qalignedtimer.h2
-rw-r--r--src/alignedtimer/qalignedtimer_stub.cpp2
-rw-r--r--src/alignedtimer/qalignedtimer_stub_p.h2
-rw-r--r--src/alignedtimer/qalignedtimer_systemhb.cpp2
-rw-r--r--src/alignedtimer/qalignedtimer_systemhb_p.h2
-rw-r--r--src/alignedtimer/qalignedtimerglobal.h2
-rw-r--r--tests/auto/alignedtimer/tst_qalignedtimer.cpp2
9 files changed, 9 insertions, 9 deletions
diff --git a/doc/src/QAlignedtimer/QAlignedtimer.qdoc b/doc/src/QAlignedtimer/QAlignedtimer.qdoc
index 76c5c87..9bd62fb 100644
--- a/doc/src/QAlignedtimer/QAlignedtimer.qdoc
+++ b/doc/src/QAlignedtimer/QAlignedtimer.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
diff --git a/src/alignedtimer/qalignedtimer.cpp b/src/alignedtimer/qalignedtimer.cpp
index a86e38d..c0f9969 100644
--- a/src/alignedtimer/qalignedtimer.cpp
+++ b/src/alignedtimer/qalignedtimer.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the alignedtimer module of the Qt Toolkit.
diff --git a/src/alignedtimer/qalignedtimer.h b/src/alignedtimer/qalignedtimer.h
index 2ef7eb5..0e9e189 100644
--- a/src/alignedtimer/qalignedtimer.h
+++ b/src/alignedtimer/qalignedtimer.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the alignedtimer module of the Qt Toolkit.
diff --git a/src/alignedtimer/qalignedtimer_stub.cpp b/src/alignedtimer/qalignedtimer_stub.cpp
index fe27f9e..e31e066 100644
--- a/src/alignedtimer/qalignedtimer_stub.cpp
+++ b/src/alignedtimer/qalignedtimer_stub.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the alignedtimer module of the Qt Toolkit.
diff --git a/src/alignedtimer/qalignedtimer_stub_p.h b/src/alignedtimer/qalignedtimer_stub_p.h
index d6014f2..d205cff 100644
--- a/src/alignedtimer/qalignedtimer_stub_p.h
+++ b/src/alignedtimer/qalignedtimer_stub_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the alignedtimer module of the Qt Toolkit.
diff --git a/src/alignedtimer/qalignedtimer_systemhb.cpp b/src/alignedtimer/qalignedtimer_systemhb.cpp
index c1af619..7055710 100644
--- a/src/alignedtimer/qalignedtimer_systemhb.cpp
+++ b/src/alignedtimer/qalignedtimer_systemhb.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the alignedtimer module of the Qt Toolkit.
diff --git a/src/alignedtimer/qalignedtimer_systemhb_p.h b/src/alignedtimer/qalignedtimer_systemhb_p.h
index e65c047..d6af2a5 100644
--- a/src/alignedtimer/qalignedtimer_systemhb_p.h
+++ b/src/alignedtimer/qalignedtimer_systemhb_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the alignedtimer module of the Qt Toolkit.
diff --git a/src/alignedtimer/qalignedtimerglobal.h b/src/alignedtimer/qalignedtimerglobal.h
index bc53770..72d6991 100644
--- a/src/alignedtimer/qalignedtimerglobal.h
+++ b/src/alignedtimer/qalignedtimerglobal.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the alignedtimer module of the Qt Toolkit.
diff --git a/tests/auto/alignedtimer/tst_qalignedtimer.cpp b/tests/auto/alignedtimer/tst_qalignedtimer.cpp
index 7e25559..02b6137 100644
--- a/tests/auto/alignedtimer/tst_qalignedtimer.cpp
+++ b/tests/auto/alignedtimer/tst_qalignedtimer.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the test suite of the Qt Toolkit.