From e657c8472cd2430ac783f232a9189f9fc57a58d7 Mon Sep 17 00:00:00 2001 From: Teemu Kaukoranta Date: Mon, 27 May 2013 12:10:02 +0300 Subject: Changed Contact details "qt-project.org/" to "qt-project.org/legal" 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: I540431f916247192d748479fc6c816ebf773516c Reviewed-by: Sergio Ahumada --- doc/src/examples/logging.qdoc | 2 +- examples/logger/main.cpp | 2 +- src/logger/qlogger.cpp | 2 +- src/logger/qlogger.h | 2 +- src/logger/qlogger_p.h | 2 +- src/logger/qloggerglobal.h | 2 +- tests/auto/logger/tst_qlogger.cpp | 2 +- tests/auto/loggerenvar/tst_qloggerenvar.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/src/examples/logging.qdoc b/doc/src/examples/logging.qdoc index 46a71aa..bc7c18d 100644 --- a/doc/src/examples/logging.qdoc +++ b/doc/src/examples/logging.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/examples/logger/main.cpp b/examples/logger/main.cpp index ea5e489..8e6ed3b 100644 --- a/examples/logger/main.cpp +++ b/examples/logger/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the demonstration applications of the logger module ** of the Qt Toolkit. diff --git a/src/logger/qlogger.cpp b/src/logger/qlogger.cpp index b65a9ed..b30966d 100644 --- a/src/logger/qlogger.cpp +++ b/src/logger/qlogger.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** 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 967308e..07835c4 100644 --- a/src/logger/qlogger.h +++ b/src/logger/qlogger.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** 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 fab6d6d..c51b238 100644 --- a/src/logger/qlogger_p.h +++ b/src/logger/qlogger_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** 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 cc9593f..1930f9b 100644 --- a/src/logger/qloggerglobal.h +++ b/src/logger/qloggerglobal.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** 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 5996d12..65060dd 100644 --- a/tests/auto/logger/tst_qlogger.cpp +++ b/tests/auto/logger/tst_qlogger.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** 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 5a7c478..4241c17 100644 --- a/tests/auto/loggerenvar/tst_qloggerenvar.cpp +++ b/tests/auto/loggerenvar/tst_qloggerenvar.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. ** -- cgit v1.2.3