diff options
Diffstat (limited to 'util/qlalr')
-rw-r--r-- | util/qlalr/compress.cpp | 2 | ||||
-rw-r--r-- | util/qlalr/cppgenerator.cpp | 23 | ||||
-rw-r--r-- | util/qlalr/dotgraph.cpp | 2 | ||||
-rw-r--r-- | util/qlalr/grammar.cpp | 2 | ||||
-rw-r--r-- | util/qlalr/lalr.cpp | 2 | ||||
-rw-r--r-- | util/qlalr/main.cpp | 12 | ||||
-rw-r--r-- | util/qlalr/parsetable.cpp | 2 | ||||
-rw-r--r-- | util/qlalr/recognizer.cpp | 2 |
8 files changed, 24 insertions, 23 deletions
diff --git a/util/qlalr/compress.cpp b/util/qlalr/compress.cpp index efa4fea..3fcd6bf 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 Qt Labs. +** This file is part of the test suite module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp index 222aaa4..4b31699 100644 --- a/util/qlalr/cppgenerator.cpp +++ b/util/qlalr/cppgenerator.cpp @@ -39,13 +39,14 @@ ** ****************************************************************************/ + #include <QtCore/QtCore> #include "cppgenerator.h" #include "lalr.h" #include "recognizer.h" -QString CppGenerator::copyrightHeader() const +QString CppGenerator::trollCopyrightHeader() const { return QLatin1String( "/****************************************************************************\n" @@ -53,7 +54,7 @@ QString CppGenerator::copyrightHeader() const "** 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" + "** This file is part of the QtCore module of the Qt Toolkit.\n" "**\n" "** $QT_BEGIN_LICENSE:LGPL$\n" "** No Commercial Usage\n" @@ -91,7 +92,7 @@ QString CppGenerator::copyrightHeader() const "\n"); } -QString CppGenerator::privateCopyrightHeader() const +QString CppGenerator::trollPrivateCopyrightHeader() const { return QLatin1String( "//\n" @@ -342,10 +343,10 @@ void CppGenerator::operator () () QTextStream out (&f); out << "// This file was generated by qlalr - DO NOT EDIT!\n"; - if (copyright) + if (troll_copyright) { - out << copyrightHeader() - << privateCopyrightHeader() + out << trollCopyrightHeader() + << trollPrivateCopyrightHeader() << endl; } @@ -374,10 +375,10 @@ void CppGenerator::operator () () QString prot = declFileName.toUpper ().replace (QLatin1Char ('.'), QLatin1Char ('_')); - if (copyright) + if (troll_copyright) { - out << copyrightHeader() - << privateCopyrightHeader() + out << trollCopyrightHeader() + << trollPrivateCopyrightHeader() << endl; } @@ -396,8 +397,8 @@ void CppGenerator::operator () () QTextStream out (&f); out << "// This file was generated by qlalr - DO NOT EDIT!\n"; - if (copyright) - out << copyrightHeader(); + if (troll_copyright) + out << trollCopyrightHeader(); out << "#include \"" << declFileName << "\"" << endl << endl; generateImpl(out); diff --git a/util/qlalr/dotgraph.cpp b/util/qlalr/dotgraph.cpp index 5f847a9..67359d4 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 Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/grammar.cpp b/util/qlalr/grammar.cpp index 26f8378..e5e5618 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 Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/lalr.cpp b/util/qlalr/lalr.cpp index 797750c..5c4eac2 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 Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/main.cpp b/util/qlalr/main.cpp index 7c1607e..acfb7a5 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 Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage @@ -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 - << " --copyright\t\tadd the Qt copyright header" << endl + << " --troll\t\tadd the Trolltech 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 copyright = false; + bool troll_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 ("--copyright") || arg == QLatin1String ("--troll")) - copyright = true; + else if (arg == QLatin1String ("--troll")) + 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.setCopyright (copyright); + gen.setTrollCopyright (troll_copyright); gen (); if (generate_dot) diff --git a/util/qlalr/parsetable.cpp b/util/qlalr/parsetable.cpp index bb78d2d..e4eb684 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 Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/util/qlalr/recognizer.cpp b/util/qlalr/recognizer.cpp index de0475f..daf371b 100644 --- a/util/qlalr/recognizer.cpp +++ b/util/qlalr/recognizer.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 Qt Labs. +** This file is part of the utils of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |