diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 13:21:45 +1000 |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 13:21:45 +1000 |
commit | 812b3940012f3c04fb79b8fa8c4ac64ff8051dd4 (patch) | |
tree | 68cee7e8eb439f6034d86ada62f963a5433f4f08 /util | |
parent | 84ff44e7ecf9ef28ebedfedf170ec45fe0cb9ffd (diff) |
Update contact URL in license headers.
Reviewed-by: Trust Me
Diffstat (limited to 'util')
40 files changed, 105 insertions, 106 deletions
diff --git a/util/fixnonlatin1/main.cpp b/util/fixnonlatin1/main.cpp index b2f1a17f7..449af4f8b 100644 --- a/util/fixnonlatin1/main.cpp +++ b/util/fixnonlatin1/main.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/gencmap/gencmap.cpp b/util/gencmap/gencmap.cpp index e260291e2..dc8d98ede 100644 --- a/util/gencmap/gencmap.cpp +++ b/util/gencmap/gencmap.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/configfile.cpp b/util/lexgen/configfile.cpp index 6e1df413c..0edf0a17c 100644 --- a/util/lexgen/configfile.cpp +++ b/util/lexgen/configfile.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/configfile.h b/util/lexgen/configfile.h index 1f1b6fd3c..7f1718b1c 100644 --- a/util/lexgen/configfile.h +++ b/util/lexgen/configfile.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/generator.cpp b/util/lexgen/generator.cpp index 6e9903376..40f9f9c02 100644 --- a/util/lexgen/generator.cpp +++ b/util/lexgen/generator.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/generator.h b/util/lexgen/generator.h index 72ca4e3e8..095b72392 100644 --- a/util/lexgen/generator.h +++ b/util/lexgen/generator.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/global.h b/util/lexgen/global.h index 07bcab4a5..f1244d1a3 100644 --- a/util/lexgen/global.h +++ b/util/lexgen/global.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/main.cpp b/util/lexgen/main.cpp index 17fa93915..959eb7082 100644 --- a/util/lexgen/main.cpp +++ b/util/lexgen/main.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/nfa.cpp b/util/lexgen/nfa.cpp index f9407cfdc..4950169ed 100644 --- a/util/lexgen/nfa.cpp +++ b/util/lexgen/nfa.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/nfa.h b/util/lexgen/nfa.h index 29d02c0ee..ef5567397 100644 --- a/util/lexgen/nfa.h +++ b/util/lexgen/nfa.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/re2nfa.cpp b/util/lexgen/re2nfa.cpp index 770012871..75b1243fb 100644 --- a/util/lexgen/re2nfa.cpp +++ b/util/lexgen/re2nfa.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/re2nfa.h b/util/lexgen/re2nfa.h index f73dc6cb1..0450421ab 100644 --- a/util/lexgen/re2nfa.h +++ b/util/lexgen/re2nfa.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/tests/tst_lexgen.cpp b/util/lexgen/tests/tst_lexgen.cpp index 5cb400278..bc926a705 100644 --- a/util/lexgen/tests/tst_lexgen.cpp +++ b/util/lexgen/tests/tst_lexgen.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/lexgen/tokenizer.cpp b/util/lexgen/tokenizer.cpp index ffeac345c..9ce485fdc 100644 --- a/util/lexgen/tokenizer.cpp +++ b/util/lexgen/tokenizer.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/local_database/testlocales/localemodel.cpp b/util/local_database/testlocales/localemodel.cpp index b8c8e7682..2555e42d5 100644 --- a/util/local_database/testlocales/localemodel.cpp +++ b/util/local_database/testlocales/localemodel.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/local_database/testlocales/localemodel.h b/util/local_database/testlocales/localemodel.h index 780abeb85..eb3d1c723 100644 --- a/util/local_database/testlocales/localemodel.h +++ b/util/local_database/testlocales/localemodel.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/local_database/testlocales/localewidget.cpp b/util/local_database/testlocales/localewidget.cpp index 8a6005e58..36944c0c7 100644 --- a/util/local_database/testlocales/localewidget.cpp +++ b/util/local_database/testlocales/localewidget.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/local_database/testlocales/localewidget.h b/util/local_database/testlocales/localewidget.h index 1485bb443..fa53d76f0 100644 --- a/util/local_database/testlocales/localewidget.h +++ b/util/local_database/testlocales/localewidget.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/local_database/testlocales/main.cpp b/util/local_database/testlocales/main.cpp index a28f93e91..13a26ddba 100644 --- a/util/local_database/testlocales/main.cpp +++ b/util/local_database/testlocales/main.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/normalize/main.cpp b/util/normalize/main.cpp index 6a83407fe..c4897ec0e 100644 --- a/util/normalize/main.cpp +++ b/util/normalize/main.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/plugintest/main.cpp b/util/plugintest/main.cpp index 001b7a5db..6b84e6bdd 100644 --- a/util/plugintest/main.cpp +++ b/util/plugintest/main.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/compress.cpp b/util/qlalr/compress.cpp index 72cffb25d..261a8ddbc 100644 --- a/util/qlalr/compress.cpp +++ b/util/qlalr/compress.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/compress.h b/util/qlalr/compress.h index 360a36b96..39d4945d4 100644 --- a/util/qlalr/compress.h +++ b/util/qlalr/compress.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp index 520b44f0b..987f3f694 100644 --- a/util/qlalr/cppgenerator.cpp +++ b/util/qlalr/cppgenerator.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -49,47 +49,46 @@ QString CppGenerator::trollCopyrightHeader() const { return QLatin1String( - -"/****************************************************************************\n" -"**\n" -"** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n" -"** Contact: Nokia Corporation (qt-info@nokia.com)\n" -"**\n" -"** This file is part of the QtCore module of the Qt Toolkit.\n" -"**\n" -"** $QT_BEGIN_LICENSE:LGPL$\n" -"** No Commercial Usage\n" -"** This file contains pre-release code and may not be distributed.\n" -"** You may use this file in accordance with the terms and conditions\n" -"** contained in the either Technology Preview License Agreement or the\n" -"** Beta Release License Agreement.\n" -"**\n" -"** GNU Lesser General Public License Usage\n" -"** Alternatively, this file may be used under the terms of the GNU Lesser\n" -"** General Public License version 2.1 as published by the Free Software\n" -"** Foundation and appearing in the file LICENSE.LGPL included in the\n" -"** packaging of this file. Please review the following information to\n" -"** ensure the GNU Lesser General Public License version 2.1 requirements\n" -"** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n" -"**\n" -"** In addition, as a special exception, Nokia gives you certain\n" -"** additional rights. These rights are described in the Nokia Qt LGPL\n" -"** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this\n" -"** package.\n" -"**\n" -"** GNU General Public License Usage\n" -"** Alternatively, this file may be used under the terms of the GNU\n" -"** General Public License version 3.0 as published by the Free Software\n" -"** Foundation and appearing in the file LICENSE.GPL included in the\n" -"** packaging of this file. Please review the following information to\n" -"** ensure the GNU General Public License version 3.0 requirements will be\n" -"** met: http://www.gnu.org/copyleft/gpl.html.\n" -"**\n" -"** If you are unsure which license is appropriate for your use, please\n" -"** contact the sales department at http://www.qtsoftware.com/contact.\n" -"** $QT_END_LICENSE$\n" -"**\n" -"****************************************************************************/\n" + "/****************************************************************************\n" + "**\n" + "** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n" + "** Contact: Nokia Corporation (qt-info@nokia.com)\n" + "**\n" + "** This file is part of the QtCore module of the Qt Toolkit.\n" + "**\n" + "** $QT_BEGIN_LICENSE:LGPL$\n" + "** No Commercial Usage\n" + "** This file contains pre-release code and may not be distributed.\n" + "** You may use this file in accordance with the terms and conditions\n" + "** contained in the either Technology Preview License Agreement or the\n" + "** Beta Release License Agreement.\n" + "**\n" + "** GNU Lesser General Public License Usage\n" + "** Alternatively, this file may be used under the terms of the GNU Lesser\n" + "** General Public License version 2.1 as published by the Free Software\n" + "** Foundation and appearing in the file LICENSE.LGPL included in the\n" + "** packaging of this file. Please review the following information to\n" + "** ensure the GNU Lesser General Public License version 2.1 requirements\n" + "** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n" + "**\n" + "** In addition, as a special exception, Nokia gives you certain\n" + "** additional rights. These rights are described in the Nokia Qt LGPL\n" + "** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this\n" + "** package.\n" + "**\n" + "** GNU General Public License Usage\n" + "** Alternatively, this file may be used under the terms of the GNU\n" + "** General Public License version 3.0 as published by the Free Software\n" + "** Foundation and appearing in the file LICENSE.GPL included in the\n" + "** packaging of this file. Please review the following information to\n" + "** ensure the GNU General Public License version 3.0 requirements will be\n" + "** met: http://www.gnu.org/copyleft/gpl.html.\n" + "**\n" + "** If you are unsure which license is appropriate for your use, please\n" + "** contact the sales department at http://qt.nokia.com/contact.\n" + "** $QT_END_LICENSE$\n" + "**\n" + "****************************************************************************/\n" "\n"); } diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h index 0e251ff9a..e519abced 100644 --- a/util/qlalr/cppgenerator.h +++ b/util/qlalr/cppgenerator.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/dotgraph.cpp b/util/qlalr/dotgraph.cpp index b6409ea65..c5b7f5843 100644 --- a/util/qlalr/dotgraph.cpp +++ b/util/qlalr/dotgraph.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/dotgraph.h b/util/qlalr/dotgraph.h index 6c45688e3..cf5219142 100644 --- a/util/qlalr/dotgraph.h +++ b/util/qlalr/dotgraph.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/grammar.cpp b/util/qlalr/grammar.cpp index 1d909cb53..e91eb240a 100644 --- a/util/qlalr/grammar.cpp +++ b/util/qlalr/grammar.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/grammar_p.h b/util/qlalr/grammar_p.h index 516dfec85..2876e9af5 100644 --- a/util/qlalr/grammar_p.h +++ b/util/qlalr/grammar_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/lalr.cpp b/util/qlalr/lalr.cpp index 103fe4b64..489fc6860 100644 --- a/util/qlalr/lalr.cpp +++ b/util/qlalr/lalr.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g index 548223fb5..f7f5bba63 100644 --- a/util/qlalr/lalr.g +++ b/util/qlalr/lalr.g @@ -34,7 +34,7 @@ -- met: http://www.gnu.org/copyleft/gpl.html. -- -- If you are unsure which license is appropriate for your use, please --- contact the sales department at http://www.qtsoftware.com/contact. +-- contact the sales department at http://qt.nokia.com/contact. -- $QT_END_LICENSE$ -- -- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -114,7 +114,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -228,7 +228,7 @@ protected: ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/lalr.h b/util/qlalr/lalr.h index d9c550871..a4955e9f1 100644 --- a/util/qlalr/lalr.h +++ b/util/qlalr/lalr.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/main.cpp b/util/qlalr/main.cpp index 020dd8cca..e78aeb37a 100644 --- a/util/qlalr/main.cpp +++ b/util/qlalr/main.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/parsetable.cpp b/util/qlalr/parsetable.cpp index 3d48f1d3e..f6a405853 100644 --- a/util/qlalr/parsetable.cpp +++ b/util/qlalr/parsetable.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/parsetable.h b/util/qlalr/parsetable.h index f87e461e8..b144ff909 100644 --- a/util/qlalr/parsetable.h +++ b/util/qlalr/parsetable.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/recognizer.cpp b/util/qlalr/recognizer.cpp index f59dcacb0..386dc3117 100644 --- a/util/qlalr/recognizer.cpp +++ b/util/qlalr/recognizer.cpp @@ -35,7 +35,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/qlalr/recognizer.h b/util/qlalr/recognizer.h index 861c2f30b..9ac8ee097 100644 --- a/util/qlalr/recognizer.h +++ b/util/qlalr/recognizer.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/unicode/codecs/big5/main.cpp b/util/unicode/codecs/big5/main.cpp index e8c26cf8b..b47ba462a 100644 --- a/util/unicode/codecs/big5/main.cpp +++ b/util/unicode/codecs/big5/main.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index c24486b23..a832c39c7 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ static struct AgeMap { }; #define CURRENT_UNICODE_VERSION "QChar::Unicode_5_0" -static const char *grapheme_break_string = +static const char *grapheme_break_string = " enum GraphemeBreak {\n" " GraphemeBreakOther, \n" " GraphemeBreakCR,\n" @@ -80,15 +80,15 @@ static const char *grapheme_break_string = " };\n\n"; enum GraphemeBreak { - GraphemeBreakOther, + GraphemeBreakOther, GraphemeBreakCR, GraphemeBreakLF, GraphemeBreakControl, - GraphemeBreakExtend, - GraphemeBreakL, - GraphemeBreakV, - GraphemeBreakT, - GraphemeBreakLV, + GraphemeBreakExtend, + GraphemeBreakL, + GraphemeBreakV, + GraphemeBreakT, + GraphemeBreakLV, GraphemeBreakLVT }; @@ -100,16 +100,16 @@ static void initGraphemeBreak() GraphemeBreak brk; const char *name; } breaks[] = { - { GraphemeBreakOther, "Other" }, - { GraphemeBreakCR, "CR" }, - { GraphemeBreakLF, "LF" }, - { GraphemeBreakControl, "Control" }, - { GraphemeBreakExtend, "Extend" }, - { GraphemeBreakL, "L" }, - { GraphemeBreakV, "V" }, - { GraphemeBreakT, "T" }, - { GraphemeBreakLV, "LV" }, - { GraphemeBreakLVT, "LVT" }, + { GraphemeBreakOther, "Other" }, + { GraphemeBreakCR, "CR" }, + { GraphemeBreakLF, "LF" }, + { GraphemeBreakControl, "Control" }, + { GraphemeBreakExtend, "Extend" }, + { GraphemeBreakL, "L" }, + { GraphemeBreakV, "V" }, + { GraphemeBreakT, "T" }, + { GraphemeBreakLV, "LV" }, + { GraphemeBreakLVT, "LVT" }, { GraphemeBreakOther, 0 } }; GraphemeBreakList *d = breaks; @@ -119,7 +119,7 @@ static void initGraphemeBreak() } } -const char *word_break_string = +const char *word_break_string = " enum WordBreak {\n" " WordBreakOther,\n" " WordBreakFormat,\n" @@ -132,7 +132,7 @@ const char *word_break_string = " };\n\n"; enum WordBreak { - WordBreakOther, + WordBreakOther, WordBreakFormat, WordBreakKatakana, WordBreakALetter, @@ -158,7 +158,7 @@ static void initWordBreak() { WordBreakMidLetter, "MidLetter" }, { WordBreakMidNum, "MidNum" }, { WordBreakNumeric, "Numeric" }, - { WordBreakExtendNumLet, "ExtendNumLet" }, + { WordBreakExtendNumLet, "ExtendNumLet" }, { WordBreakFormat, 0 } }; WordBreakList *d = breaks; @@ -183,7 +183,7 @@ static const char *sentence_break_string = " SentenceBreakSTerm,\n" " SentenceBreakClose\n" " };\n\n"; - + enum SentenceBreak { SentenceBreakOther, SentenceBreakSep, @@ -217,7 +217,7 @@ static void initSentenceBreak() { SentenceBreakNumeric, "Numeric" }, { SentenceBreakATerm, "ATerm" }, { SentenceBreakSTerm, "STerm" }, - { SentenceBreakClose, "Close" }, + { SentenceBreakClose, "Close" }, { SentenceBreakOther, 0 } }; SentenceBreakList *d = breaks; @@ -2502,7 +2502,7 @@ int main(int, char **) "** met: http://www.gnu.org/copyleft/gpl.html.\n" "**\n" "** If you are unsure which license is appropriate for your use, please\n" - "** contact the sales department at http://www.qtsoftware.com/contact.\n" + "** contact the sales department at http://qt.nokia.com/contact.\n" "** $QT_END_LICENSE$\n" "**\n" "****************************************************************************/\n\n" diff --git a/util/xkbdatagen/main.cpp b/util/xkbdatagen/main.cpp index feb811bf8..eaf770b1b 100644 --- a/util/xkbdatagen/main.cpp +++ b/util/xkbdatagen/main.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ |