summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-27 10:30:05 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-27 20:38:06 +0200
commite2e9f410cfb211b0660a51283b948d76c0dd03a4 (patch)
tree403e68675d4d0f339cf85950385dc94e0c874b5e
parent6eb19958676f3665b4ee44b1067fd69fb3552dcb (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.*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: I5d1a59e0f450d630a615df61ca23ac1d3185cb84 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--doc/src/examples/logging.qdoc2
-rw-r--r--doc/src/index.qdoc5
-rw-r--r--examples/logger/main.cpp2
-rw-r--r--src/logger/qlogger.cpp2
-rw-r--r--src/logger/qlogger.h2
-rw-r--r--src/logger/qlogger_p.h2
-rw-r--r--src/logger/qloggerglobal.h2
-rw-r--r--tests/auto/logger/tst_qlogger.cpp2
-rw-r--r--tests/auto/loggerenvar/tst_qloggerenvar.cpp2
9 files changed, 10 insertions, 11 deletions
diff --git a/doc/src/examples/logging.qdoc b/doc/src/examples/logging.qdoc
index 1cb3b60..46a71aa 100644
--- a/doc/src/examples/logging.qdoc
+++ b/doc/src/examples/logging.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/doc/src/index.qdoc b/doc/src/index.qdoc
index cb7e267..21313a3 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.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 QtLogger
**
diff --git a/examples/logger/main.cpp b/examples/logger/main.cpp
index 34a378e..ea5e489 100644
--- a/examples/logger/main.cpp
+++ b/examples/logger/main.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 demonstration applications of the logger module
diff --git a/src/logger/qlogger.cpp b/src/logger/qlogger.cpp
index efc50fd..b65a9ed 100644
--- a/src/logger/qlogger.cpp
+++ b/src/logger/qlogger.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 logger module of the Qt Toolkit.
diff --git a/src/logger/qlogger.h b/src/logger/qlogger.h
index 3bdcbe8..967308e 100644
--- a/src/logger/qlogger.h
+++ b/src/logger/qlogger.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 logger module of the Qt Toolkit.
diff --git a/src/logger/qlogger_p.h b/src/logger/qlogger_p.h
index 72144be..fab6d6d 100644
--- a/src/logger/qlogger_p.h
+++ b/src/logger/qlogger_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 QtLogger module of the Qt Toolkit.
diff --git a/src/logger/qloggerglobal.h b/src/logger/qloggerglobal.h
index 4a298c2..cc9593f 100644
--- a/src/logger/qloggerglobal.h
+++ b/src/logger/qloggerglobal.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 logger module of the Qt Toolkit.
diff --git a/tests/auto/logger/tst_qlogger.cpp b/tests/auto/logger/tst_qlogger.cpp
index d88194a..5996d12 100644
--- a/tests/auto/logger/tst_qlogger.cpp
+++ b/tests/auto/logger/tst_qlogger.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.
diff --git a/tests/auto/loggerenvar/tst_qloggerenvar.cpp b/tests/auto/loggerenvar/tst_qloggerenvar.cpp
index 34ac872..5a7c478 100644
--- a/tests/auto/loggerenvar/tst_qloggerenvar.cpp
+++ b/tests/auto/loggerenvar/tst_qloggerenvar.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.