From 81d0c27d35b62dea9fceae4a4677704f558b5762 Mon Sep 17 00:00:00 2001
From: Julian de Bhal <julian.debhal@nokia.com>
Date: Mon, 12 Oct 2009 10:53:32 +1000
Subject: qlalr Removed the word "troll" from the implementation to match the
 header.

Make qlalr compile.
---
 util/qlalr/cppgenerator.cpp | 20 ++++++++++----------
 util/qlalr/main.cpp         |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index dd5be57..39d94cd 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -46,7 +46,7 @@
 #include "lalr.h"
 #include "recognizer.h"
 
-QString CppGenerator::trollCopyrightHeader() const
+QString CppGenerator::copyrightHeader() const
 {
   return QLatin1String(
     "/****************************************************************************\n"
@@ -92,7 +92,7 @@ QString CppGenerator::trollCopyrightHeader() const
     "\n");
 }
 
-QString CppGenerator::trollPrivateCopyrightHeader() const
+QString CppGenerator::privateCopyrightHeader() const
 {
   return QLatin1String(
     "//\n"
@@ -343,10 +343,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;
         }
 
@@ -375,10 +375,10 @@ void CppGenerator::operator () ()
 
     QString prot = declFileName.toUpper ().replace (QLatin1Char ('.'), QLatin1Char ('_'));
 
-    if (troll_copyright)
+    if (copyright)
       {
-        out << trollCopyrightHeader()
-            << trollPrivateCopyrightHeader()
+        out << copyrightHeader()
+            << privateCopyrightHeader()
             << endl;
       }
 
@@ -397,8 +397,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/main.cpp b/util/qlalr/main.cpp
index 216dd3a..7041e4a 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