diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-01-24 12:33:07 +1000 |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2012-01-30 06:38:58 +0100 |
commit | 6e2a2489b2586cf5bcf8cfee7827199dfdefae47 (patch) | |
tree | 26552db238dca0b097814eb0836988e56416484b | |
parent | 15d65d45af08074ab91029a05b1e815170f66c61 (diff) |
Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: I68bbcebeeddd84af30cb3361e5568193bb391817
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r-- | doc/src/qlalr.qdoc | 2 | ||||
-rw-r--r-- | examples/dummy-xml/ll/dummy-xml-ll.cpp | 2 | ||||
-rw-r--r-- | examples/dummy-xml/xml.g | 2 | ||||
-rw-r--r-- | examples/glsl/build.sh | 2 | ||||
-rw-r--r-- | examples/glsl/glsl-lex.l | 2 | ||||
-rw-r--r-- | examples/glsl/glsl.g | 2 | ||||
-rw-r--r-- | examples/lambda/lambda.g | 2 | ||||
-rw-r--r-- | examples/lambda/main.cpp | 2 | ||||
-rw-r--r-- | examples/qparser/calc.g | 2 | ||||
-rw-r--r-- | examples/qparser/calc.l | 2 | ||||
-rw-r--r-- | examples/qparser/qparser.cpp | 2 | ||||
-rw-r--r-- | examples/qparser/qparser.h | 2 | ||||
-rw-r--r-- | src/compress.cpp | 2 | ||||
-rw-r--r-- | src/compress.h | 2 | ||||
-rw-r--r-- | src/cppgenerator.cpp | 4 | ||||
-rw-r--r-- | src/cppgenerator.h | 2 | ||||
-rw-r--r-- | src/dotgraph.cpp | 2 | ||||
-rw-r--r-- | src/dotgraph.h | 2 | ||||
-rw-r--r-- | src/grammar.cpp | 2 | ||||
-rw-r--r-- | src/grammar_p.h | 2 | ||||
-rw-r--r-- | src/lalr.cpp | 2 | ||||
-rw-r--r-- | src/lalr.g | 6 | ||||
-rw-r--r-- | src/lalr.h | 2 | ||||
-rw-r--r-- | src/main.cpp | 2 | ||||
-rw-r--r-- | src/parsetable.cpp | 2 | ||||
-rw-r--r-- | src/parsetable.h | 2 | ||||
-rw-r--r-- | src/recognizer.cpp | 2 | ||||
-rw-r--r-- | src/recognizer.h | 2 |
28 files changed, 31 insertions, 31 deletions
diff --git a/doc/src/qlalr.qdoc b/doc/src/qlalr.qdoc index 0055d9c..7b4b29a 100644 --- a/doc/src/qlalr.qdoc +++ b/doc/src/qlalr.qdoc @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -21,6 +20,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/dummy-xml/ll/dummy-xml-ll.cpp b/examples/dummy-xml/ll/dummy-xml-ll.cpp index b34c8bf..e9b7d75 100644 --- a/examples/dummy-xml/ll/dummy-xml-ll.cpp +++ b/examples/dummy-xml/ll/dummy-xml-ll.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the QLALR module of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/dummy-xml/xml.g b/examples/dummy-xml/xml.g index c5ad843..da5dc9a 100644 --- a/examples/dummy-xml/xml.g +++ b/examples/dummy-xml/xml.g @@ -1,7 +1,6 @@ ---------------------------------------------------------------------------- -- -- Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --- All rights reserved. -- Contact: http://www.qt-project.org/ -- -- This file is part of the QtCore module of the Qt Toolkit. @@ -35,6 +34,7 @@ -- -- -- +-- -- $QT_END_LICENSE$ -- ---------------------------------------------------------------------------- diff --git a/examples/glsl/build.sh b/examples/glsl/build.sh index 5ba201c..8293d41 100644 --- a/examples/glsl/build.sh +++ b/examples/glsl/build.sh @@ -2,7 +2,6 @@ ############################################################################# ## ## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -## All rights reserved. ## Contact: http://www.qt-project.org/ ## ## This file is the build configuration utility of the Qt Toolkit. @@ -36,6 +35,7 @@ ## ## ## +## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/examples/glsl/glsl-lex.l b/examples/glsl/glsl-lex.l index 3d0a3ea..74992ed 100644 --- a/examples/glsl/glsl-lex.l +++ b/examples/glsl/glsl-lex.l @@ -3,7 +3,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the QLALR tool of the Qt Toolkit. @@ -37,6 +36,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/glsl/glsl.g b/examples/glsl/glsl.g index 0b0ee20..5c3cf9c 100644 --- a/examples/glsl/glsl.g +++ b/examples/glsl/glsl.g @@ -1,7 +1,6 @@ ---------------------------------------------------------------------------- -- -- Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --- All rights reserved. -- Contact: http://www.qt-project.org/ -- -- This file is part of the QtCore module of the Qt Toolkit. @@ -35,6 +34,7 @@ -- -- -- +-- -- $QT_END_LICENSE$ -- ---------------------------------------------------------------------------- diff --git a/examples/lambda/lambda.g b/examples/lambda/lambda.g index d442eb0..35b1020 100644 --- a/examples/lambda/lambda.g +++ b/examples/lambda/lambda.g @@ -1,7 +1,6 @@ ---------------------------------------------------------------------------- -- -- Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --- All rights reserved. -- Contact: http://www.qt-project.org/ -- -- This file is part of the QtCore module of the Qt Toolkit. @@ -35,6 +34,7 @@ -- -- -- +-- -- $QT_END_LICENSE$ -- ---------------------------------------------------------------------------- diff --git a/examples/lambda/main.cpp b/examples/lambda/main.cpp index a9f2d43..6c516ae 100644 --- a/examples/lambda/main.cpp +++ b/examples/lambda/main.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the QLALR module of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/qparser/calc.g b/examples/qparser/calc.g index d7394d8..e46ee09 100644 --- a/examples/qparser/calc.g +++ b/examples/qparser/calc.g @@ -1,7 +1,6 @@ ---------------------------------------------------------------------------- -- -- Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --- All rights reserved. -- Contact: http://www.qt-project.org/ -- -- This file is part of the QtCore module of the Qt Toolkit. @@ -35,6 +34,7 @@ -- -- -- +-- -- $QT_END_LICENSE$ -- ---------------------------------------------------------------------------- diff --git a/examples/qparser/calc.l b/examples/qparser/calc.l index fb25c61..10a740e 100644 --- a/examples/qparser/calc.l +++ b/examples/qparser/calc.l @@ -5,7 +5,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the QLALR tool of the Qt Toolkit. @@ -39,6 +38,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/qparser/qparser.cpp b/examples/qparser/qparser.cpp index 36e5c1c..20f4f71 100644 --- a/examples/qparser/qparser.cpp +++ b/examples/qparser/qparser.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the QLALR module of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/qparser/qparser.h b/examples/qparser/qparser.h index c295468..8dca34d 100644 --- a/examples/qparser/qparser.h +++ b/examples/qparser/qparser.h @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the QLALR module of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/compress.cpp b/src/compress.cpp index 052cb36..48fbec6 100644 --- a/src/compress.cpp +++ b/src/compress.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the test suite module of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/compress.h b/src/compress.h index 45b1358..355c2cb 100644 --- a/src/compress.h +++ b/src/compress.h @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/cppgenerator.cpp b/src/cppgenerator.cpp index 52d371a..6eed6b8 100644 --- a/src/cppgenerator.cpp +++ b/src/cppgenerator.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -52,7 +52,6 @@ QString CppGenerator::copyrightHeader() const "/****************************************************************************\n" "**\n" "** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).\n" - "** All rights reserved.\n" "** Contact: http://www.qt-project.org/\n" "**\n" "** This file is part of the QtCore module of the Qt Toolkit.\n" @@ -86,6 +85,7 @@ QString CppGenerator::copyrightHeader() const "**\n" "**\n" "**\n" + "**\n" "** $QT_END_LICENSE$\n" "**\n" "****************************************************************************/\n" diff --git a/src/cppgenerator.h b/src/cppgenerator.h index ab68074..949867d 100644 --- a/src/cppgenerator.h +++ b/src/cppgenerator.h @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/dotgraph.cpp b/src/dotgraph.cpp index d979db9..17f7fcc 100644 --- a/src/dotgraph.cpp +++ b/src/dotgraph.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/dotgraph.h b/src/dotgraph.h index 7998e4e..ba83f5f 100644 --- a/src/dotgraph.h +++ b/src/dotgraph.h @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/grammar.cpp b/src/grammar.cpp index 250914d..584f42f 100644 --- a/src/grammar.cpp +++ b/src/grammar.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/grammar_p.h b/src/grammar_p.h index 03183fc..c995577 100644 --- a/src/grammar_p.h +++ b/src/grammar_p.h @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/lalr.cpp b/src/lalr.cpp index d9efe11..3cb5776 100644 --- a/src/lalr.cpp +++ b/src/lalr.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -1,7 +1,6 @@ ----------------------------------------------------------------------------- -- -- Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --- All rights reserved. -- Contact: http://www.qt-project.org/ -- -- This file is part of the QLALR project on Qt Labs. @@ -35,6 +34,7 @@ -- -- -- +-- -- $QT_END_LICENSE$ -- ----------------------------------------------------------------------------- @@ -78,7 +78,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the QLALR project on Qt Labs. @@ -112,6 +111,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -192,7 +192,6 @@ protected: /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the QLALR project on Qt Labs. @@ -226,6 +225,7 @@ protected: ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/main.cpp b/src/main.cpp index 49bca4f..aa4e5aa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/parsetable.cpp b/src/parsetable.cpp index 6285a8f..02ed3d9 100644 --- a/src/parsetable.cpp +++ b/src/parsetable.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/parsetable.h b/src/parsetable.h index 124e810..4d1d1f4 100644 --- a/src/parsetable.h +++ b/src/parsetable.h @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/recognizer.cpp b/src/recognizer.cpp index e597512..6bdee47 100644 --- a/src/recognizer.cpp +++ b/src/recognizer.cpp @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/recognizer.h b/src/recognizer.h index b0717cf..71afac4 100644 --- a/src/recognizer.h +++ b/src/recognizer.h @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the utils of the Qt Toolkit. @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ |