From 970e282c31011ac40cc94055ac01bea1994433c9 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Thu, 3 Sep 2009 18:04:45 +1000 Subject: Compile --- util/qlalr/cppgenerator.cpp | 6 +++--- util/qlalr/cppgenerator.h | 4 ++-- util/qlalr/main.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp index c1fa37a..2c200cc 100644 --- a/util/qlalr/cppgenerator.cpp +++ b/util/qlalr/cppgenerator.cpp @@ -343,7 +343,7 @@ 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() @@ -375,7 +375,7 @@ void CppGenerator::operator () () QString prot = declFileName.toUpper ().replace (QLatin1Char ('.'), QLatin1Char ('_')); - if (troll_copyright) + if (copyright) { out << trollCopyrightHeader() << trollPrivateCopyrightHeader() @@ -397,7 +397,7 @@ void CppGenerator::operator () () QTextStream out (&f); out << "// This file was generated by qlalr - DO NOT EDIT!\n"; - if (troll_copyright) + if (copyright) out << trollCopyrightHeader(); out << "#include \"" << declFileName << "\"" << endl << endl; diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h index cfc0c1e..e5ba612 100644 --- a/util/qlalr/cppgenerator.h +++ b/util/qlalr/cppgenerator.h @@ -72,8 +72,8 @@ private: void generateImpl (QTextStream &out); QString debugInfoProt() const; - QString copyrightHeader() const; - QString privateCopyrightHeader() const; + QString trollCopyrightHeader() const; + QString trollPrivateCopyrightHeader() const; private: static QString startIncludeGuard(const QString &fileName); diff --git a/util/qlalr/main.cpp b/util/qlalr/main.cpp index b598e2a..a51f9a8 100644 --- a/util/qlalr/main.cpp +++ b/util/qlalr/main.cpp @@ -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 (troll_copyright); gen (); if (generate_dot) -- cgit v0.12