summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-23 11:39:03 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-07-11 11:50:26 +0200
commit65b80056cf7a4415ca3a99571d8c4b429b58171a (patch)
tree1ea528a115bcd84ae426b923813c10e970cd5887
parentc774012550bf9a0f6bc4784d72cb6d00d7c23194 (diff)
Replaced Nokia copyrightsHEADmaster
Replaced Nokia copyrights with Digia copyrights Replaced Nokia contact details This command also ignores INdT Copyrights and removes trailing whitespace from removed "all rights reserved" lines. find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*' {} \; | tee >(xargs sed -i -r '1,10 { /INdT/ !{ s/([ \t#*]*)(.*Copyright.*Nokia.*)/ \1Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I } }') >(xargs sed -i -r '1,10 s/(^[ \t]*)([#*]*)([ \t]*) (all rights reserved.*)/\1\2/I') Change-Id: I9792a44e7b27250306bd71c28403721c1676ee4c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--src/json.qdoc5
-rw-r--r--src/qjson.cpp5
-rw-r--r--src/qjson_p.h5
-rw-r--r--src/qjsonarray.cpp5
-rw-r--r--src/qjsonarray.h5
-rw-r--r--src/qjsondocument.cpp5
-rw-r--r--src/qjsondocument.h5
-rw-r--r--src/qjsonglobal.h5
-rw-r--r--src/qjsonobject.cpp5
-rw-r--r--src/qjsonobject.h5
-rw-r--r--src/qjsonparser.cpp5
-rw-r--r--src/qjsonparser_p.h5
-rw-r--r--src/qjsonvalue.cpp5
-rw-r--r--src/qjsonvalue.h5
-rw-r--r--src/qjsonwriter.cpp5
-rw-r--r--src/qjsonwriter_p.h5
-rw-r--r--tests/auto/tst_qtjson.cpp5
-rw-r--r--tests/benchmarks/tst_bench_qtbinaryjson.cpp5
18 files changed, 36 insertions, 54 deletions
diff --git a/src/json.qdoc b/src/json.qdoc
index 5749b76..120f511 100644
--- a/src/json.qdoc
+++ b/src/json.qdoc
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 documentation of the Qt Toolkit.
**
diff --git a/src/qjson.cpp b/src/qjson.cpp
index 1832f60..adec744 100644
--- a/src/qjson.cpp
+++ b/src/qjson.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjson_p.h b/src/qjson_p.h
index 9858932..feeaae5 100644
--- a/src/qjson_p.h
+++ b/src/qjson_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonarray.cpp b/src/qjsonarray.cpp
index 1d70c63..487699f 100644
--- a/src/qjsonarray.cpp
+++ b/src/qjsonarray.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonarray.h b/src/qjsonarray.h
index 730e2dd..bc39bb4 100644
--- a/src/qjsonarray.h
+++ b/src/qjsonarray.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsondocument.cpp b/src/qjsondocument.cpp
index f28ea28..c72df34 100644
--- a/src/qjsondocument.cpp
+++ b/src/qjsondocument.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsondocument.h b/src/qjsondocument.h
index fc6939b..8e272f4 100644
--- a/src/qjsondocument.h
+++ b/src/qjsondocument.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonglobal.h b/src/qjsonglobal.h
index 81e6b5b..0682547 100644
--- a/src/qjsonglobal.h
+++ b/src/qjsonglobal.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonobject.cpp b/src/qjsonobject.cpp
index 5bba1de..fca9f8f 100644
--- a/src/qjsonobject.cpp
+++ b/src/qjsonobject.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonobject.h b/src/qjsonobject.h
index 7ccee6e..c0768c0 100644
--- a/src/qjsonobject.h
+++ b/src/qjsonobject.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonparser.cpp b/src/qjsonparser.cpp
index 683cee9..1d2dd63 100644
--- a/src/qjsonparser.cpp
+++ b/src/qjsonparser.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonparser_p.h b/src/qjsonparser_p.h
index 061ed2c..ef0cdad 100644
--- a/src/qjsonparser_p.h
+++ b/src/qjsonparser_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonvalue.cpp b/src/qjsonvalue.cpp
index c51988b..c654b61 100644
--- a/src/qjsonvalue.cpp
+++ b/src/qjsonvalue.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonvalue.h b/src/qjsonvalue.h
index d1acdaa..bf002c3 100644
--- a/src/qjsonvalue.h
+++ b/src/qjsonvalue.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonwriter.cpp b/src/qjsonwriter.cpp
index 9078b4e..87fe98f 100644
--- a/src/qjsonwriter.cpp
+++ b/src/qjsonwriter.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/src/qjsonwriter_p.h b/src/qjsonwriter_p.h
index f303748..bee12cd 100644
--- a/src/qjsonwriter_p.h
+++ b/src/qjsonwriter_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 QtCore module of the Qt Toolkit.
**
diff --git a/tests/auto/tst_qtjson.cpp b/tests/auto/tst_qtjson.cpp
index d055cee..46c7779 100644
--- a/tests/auto/tst_qtjson.cpp
+++ b/tests/auto/tst_qtjson.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 test suite of the Qt Toolkit.
**
diff --git a/tests/benchmarks/tst_bench_qtbinaryjson.cpp b/tests/benchmarks/tst_bench_qtbinaryjson.cpp
index 9ec907b..cf60fb4 100644
--- a/tests/benchmarks/tst_bench_qtbinaryjson.cpp
+++ b/tests/benchmarks/tst_bench_qtbinaryjson.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 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 test suite of the Qt Toolkit.
**