summaryrefslogtreecommitdiffstats
path: root/util/qlalr
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-08-24 12:02:51 (GMT)
committerMorten Sørvig <msorvig@trolltech.com>2009-08-24 12:02:51 (GMT)
commite3078a5db9e092d78813180ce077789551929e4f (patch)
treefce2a4b5607c8dc796faececf71f78ae83effe4e /util/qlalr
parent3a801a667c7c78076fc4aa84e47432ddd4a382a5 (diff)
parentdb0ebfd97d14bf3c537957d9642ba014318f8418 (diff)
downloadQt-e3078a5db9e092d78813180ce077789551929e4f.zip
Qt-e3078a5db9e092d78813180ce077789551929e4f.tar.gz
Qt-e3078a5db9e092d78813180ce077789551929e4f.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'util/qlalr')
-rw-r--r--util/qlalr/compress.cpp4
-rw-r--r--util/qlalr/compress.h4
-rw-r--r--util/qlalr/cppgenerator.cpp61
-rw-r--r--util/qlalr/cppgenerator.h15
-rw-r--r--util/qlalr/doc/qlalr.qdocconf6
-rw-r--r--util/qlalr/dotgraph.cpp4
-rw-r--r--util/qlalr/dotgraph.h4
-rw-r--r--util/qlalr/grammar.cpp4
-rw-r--r--util/qlalr/grammar_p.h4
-rw-r--r--util/qlalr/lalr.cpp4
-rw-r--r--util/qlalr/lalr.g12
-rw-r--r--util/qlalr/lalr.h4
-rw-r--r--util/qlalr/main.cpp14
-rw-r--r--util/qlalr/parsetable.cpp4
-rw-r--r--util/qlalr/parsetable.h4
-rw-r--r--util/qlalr/recognizer.cpp5
-rw-r--r--util/qlalr/recognizer.h4
17 files changed, 91 insertions, 66 deletions
diff --git a/util/qlalr/compress.cpp b/util/qlalr/compress.cpp
index 72cffb2..efa4fea 100644
--- a/util/qlalr/compress.cpp
+++ b/util/qlalr/compress.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 360a36b..2ca914c 100644
--- a/util/qlalr/compress.h
+++ b/util/qlalr/compress.h
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 9d7a8da..222aaa4 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -34,37 +34,64 @@
** 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$
**
****************************************************************************/
-
#include <QtCore/QtCore>
#include "cppgenerator.h"
#include "lalr.h"
#include "recognizer.h"
-QString CppGenerator::trollCopyrightHeader() const
+QString CppGenerator::copyrightHeader() 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 QtGui 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"
- "** This file is part of the $MODULE$ of the Qt Toolkit.\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"
- "** $TROLLTECH_DUAL_LICENSE$\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"
- "** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE\n"
- "** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.\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");
}
-QString CppGenerator::trollPrivateCopyrightHeader() const
+QString CppGenerator::privateCopyrightHeader() const
{
return QLatin1String(
"//\n"
@@ -315,10 +342,10 @@ void CppGenerator::operator () ()
QTextStream out (&f);
out << "// This file was generated by qlalr - DO NOT EDIT!\n";
- if (troll_copyright)
+ if (copyright)
{
- out << trollCopyrightHeader()
- << trollPrivateCopyrightHeader()
+ out << copyrightHeader()
+ << privateCopyrightHeader()
<< endl;
}
@@ -347,10 +374,10 @@ void CppGenerator::operator () ()
QString prot = declFileName.toUpper ().replace (QLatin1Char ('.'), QLatin1Char ('_'));
- if (troll_copyright)
+ if (copyright)
{
- out << trollCopyrightHeader()
- << trollPrivateCopyrightHeader()
+ out << copyrightHeader()
+ << privateCopyrightHeader()
<< endl;
}
@@ -369,8 +396,8 @@ void CppGenerator::operator () ()
QTextStream out (&f);
out << "// This file was generated by qlalr - DO NOT EDIT!\n";
- if (troll_copyright)
- out << trollCopyrightHeader();
+ if (copyright)
+ out << copyrightHeader();
out << "#include \"" << declFileName << "\"" << endl << endl;
generateImpl(out);
diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h
index 0e251ff..4531b8d 100644
--- a/util/qlalr/cppgenerator.h
+++ b/util/qlalr/cppgenerator.h
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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$
**
****************************************************************************/
@@ -58,23 +58,22 @@ public:
aut (aut),
verbose (verbose),
debug_info (false),
- troll_copyright (false) {}
+ copyright (false) {}
void operator () ();
bool debugInfo () const { return debug_info; }
void setDebugInfo (bool d) { debug_info = d; }
- bool trollCopyright () const { return troll_copyright; }
- void setTrollCopyright (bool t) { troll_copyright = t; }
+ void setCopyright (bool t) { copyright = t; }
private:
void generateDecl (QTextStream &out);
void generateImpl (QTextStream &out);
QString debugInfoProt() const;
- QString trollCopyrightHeader() const;
- QString trollPrivateCopyrightHeader() const;
+ QString copyrightHeader() const;
+ QString privateCopyrightHeader() const;
private:
static QString startIncludeGuard(const QString &fileName);
@@ -89,7 +88,7 @@ private:
int terminal_count;
int non_terminal_count;
bool debug_info;
- bool troll_copyright;
+ bool copyright;
Compress compressed_action;
Compress compressed_goto;
QVector<int> count;
diff --git a/util/qlalr/doc/qlalr.qdocconf b/util/qlalr/doc/qlalr.qdocconf
index a97ef6a..391844b 100644
--- a/util/qlalr/doc/qlalr.qdocconf
+++ b/util/qlalr/doc/qlalr.qdocconf
@@ -2,7 +2,7 @@
project = qlalr
description = qlalr Reference Documentation
-url = http://doc.trolltech.com/
+url = http://qt.nokia.com/doc/
language = Cpp
@@ -38,7 +38,7 @@ HTML.stylesheets = src/classic.css
HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n" \
"<tr>\n" \
"<td align=\"left\" valign=\"top\" width=\"32\">" \
- "<a href=\"http://qtsoftware.com/products/qt\"><img src=\"images/qt-logo.png\" align=\"left\" width=\"32\" height=\"32\" border=\"0\" /></a>" \
+ "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" width=\"32\" height=\"32\" border=\"0\" /></a>" \
"</td>\n" \
"<td width=\"1\">&nbsp;&nbsp;</td>" \
"<td class=\"postheader\" valign=\"center\">" \
@@ -55,7 +55,7 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
" <a href=\"functions.html\">" \
"<font color=\"#004faf\">Functions</font></a>" \
"</td>\n" \
- "<td align=\"right\" valign=\"top\" width=\"230\"><a href=\"http://qtsoftware.com\"><img src=\"images/trolltech-logo.png\" align=\"right\" width=\"203\" height=\"32\" border=\"0\" /></a></td></tr></table>"
+ "<td align=\"right\" valign=\"top\" width=\"230\"><a href=\"http://qt.nokia.com\"><img src=\"images/trolltech-logo.png\" align=\"right\" width=\"203\" height=\"32\" border=\"0\" /></a></td></tr></table>"
HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
diff --git a/util/qlalr/dotgraph.cpp b/util/qlalr/dotgraph.cpp
index b6409ea..5f847a9 100644
--- a/util/qlalr/dotgraph.cpp
+++ b/util/qlalr/dotgraph.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 6c45688..ea4c542 100644
--- a/util/qlalr/dotgraph.h
+++ b/util/qlalr/dotgraph.h
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 1d909cb..26f8378 100644
--- a/util/qlalr/grammar.cpp
+++ b/util/qlalr/grammar.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 516dfec..e1d8eff 100644
--- a/util/qlalr/grammar_p.h
+++ b/util/qlalr/grammar_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 103fe4b..797750c 100644
--- a/util/qlalr/lalr.cpp
+++ b/util/qlalr/lalr.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 548223f..c98c2af 100644
--- a/util/qlalr/lalr.g
+++ b/util/qlalr/lalr.g
@@ -3,7 +3,7 @@
-- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-- Contact: Nokia Corporation (qt-info@nokia.com)
--
--- This file is part of the QLALR project on Trolltech Labs.
+-- This file is part of the QLALR project on Qt Labs.
--
-- $QT_BEGIN_LICENSE:LGPL$
-- No Commercial Usage
@@ -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
@@ -83,7 +83,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the <your project> project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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$
**
****************************************************************************/
@@ -197,7 +197,7 @@ protected:
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the <your project> project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 d9c5508..75cdbe0 100644
--- a/util/qlalr/lalr.h
+++ b/util/qlalr/lalr.h
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 020dd8cc..7c1607e 100644
--- a/util/qlalr/main.cpp
+++ b/util/qlalr/main.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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$
**
****************************************************************************/
@@ -64,7 +64,7 @@ static void help_me ()
<< " --no-debug\t\tno debug information" << endl
<< " --no-lines\t\tno #line directives" << endl
<< " --dot\t\t\tgenerate a graph" << endl
- << " --troll\t\tadd the Trolltech copyright header" << endl
+ << " --copyright\t\tadd the Qt copyright header" << endl
<< endl;
exit (0);
}
@@ -77,7 +77,7 @@ int main (int argc, char *argv[])
bool generate_report = false;
bool no_lines = false;
bool debug_info = true;
- bool troll_copyright = false;
+ bool copyright = false;
QString file_name = 0;
QStringList args = app.arguments ();
@@ -100,8 +100,8 @@ int main (int argc, char *argv[])
else if (arg == QLatin1String ("--no-debug"))
debug_info = false;
- else if (arg == QLatin1String ("--troll"))
- troll_copyright = true;
+ else if (arg == QLatin1String ("--copyright") || arg == QLatin1String ("--troll"))
+ copyright = true;
else if (file_name.isEmpty ())
file_name = arg;
@@ -142,7 +142,7 @@ int main (int argc, char *argv[])
CppGenerator gen (p, grammar, aut, generate_report);
gen.setDebugInfo (debug_info);
- gen.setTrollCopyright (troll_copyright);
+ gen.setCopyright (copyright);
gen ();
if (generate_dot)
diff --git a/util/qlalr/parsetable.cpp b/util/qlalr/parsetable.cpp
index 3d48f1d..bb78d2d 100644
--- a/util/qlalr/parsetable.cpp
+++ b/util/qlalr/parsetable.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 f87e461..8aebdaf 100644
--- a/util/qlalr/parsetable.h
+++ b/util/qlalr/parsetable.h
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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 f59dcac..de0475f 100644
--- a/util/qlalr/recognizer.cpp
+++ b/util/qlalr/recognizer.cpp
@@ -1,10 +1,9 @@
-
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the <your project> project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -35,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.h b/util/qlalr/recognizer.h
index 861c2f3..94f7035 100644
--- a/util/qlalr/recognizer.h
+++ b/util/qlalr/recognizer.h
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QLALR project on Trolltech Labs.
+** This file is part of the QLALR project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
@@ -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$
**
****************************************************************************/