summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-09-03 08:04:45 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-09-03 08:04:45 (GMT)
commit970e282c31011ac40cc94055ac01bea1994433c9 (patch)
treee3fcce5a2fbfdbb13ff1ffb5b52a22660aed8d6c /util
parent7c3fb4ae79b4d4c0831a75821ff256bd96f3003e (diff)
downloadQt-970e282c31011ac40cc94055ac01bea1994433c9.zip
Qt-970e282c31011ac40cc94055ac01bea1994433c9.tar.gz
Qt-970e282c31011ac40cc94055ac01bea1994433c9.tar.bz2
Compile
Diffstat (limited to 'util')
-rw-r--r--util/qlalr/cppgenerator.cpp6
-rw-r--r--util/qlalr/cppgenerator.h4
-rw-r--r--util/qlalr/main.cpp2
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)