Rework warning suppression to use global meta data

1 files changed, 9 insertions, 14 deletions

diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp
index 77624f6cdfa..678ab4bfda6 100644
--- a/cpp/src/slice2confluence/Gen.cpp
+++ b/cpp/src/slice2confluence/Gen.cpp
@@ -39,8 +39,7 @@ namespace Slice
 void
 generate(const UnitPtr& unit, const string& dir, const string& header, const string& footer,
          const string& indexHeader, const string& indexFooter, const string& imageDir, const string& logoURL,
-         const string& searchAction, unsigned indexCount, unsigned warnSummary, const vector<string>& sortOrder,
-         int warningLevel)
+         const string& searchAction, unsigned indexCount, unsigned warnSummary, const vector<string>& sortOrder)
 {
     unit->mergeModules();
 
@@ -69,19 +68,19 @@ generate(const UnitPtr& unit, const string& dir, const string& header, const str
     // to the symbol; if the latter, we cannot.
     //
     Files files;
-    FileVisitor tv(files, warningLevel);
+    FileVisitor tv(files);
     unit->visit(&tv, false);
 
     //
     // Generate the start page.
     //
-    StartPageVisitor spv(files, warningLevel);
+    StartPageVisitor spv(files);
     unit->visit(&spv, false);
 
     //
     // Generate the table of contents.
     //
-    TOCVisitor tocv(files, indexHeader, indexFooter, warningLevel);
+    TOCVisitor tocv(files, indexHeader, indexFooter);
     unit->visit(&tocv, false);
     tocv.generate();
 
@@ -89,7 +88,7 @@ generate(const UnitPtr& unit, const string& dir, const string& header, const str
     // Generate the individual HTML pages.
     //
     GeneratorBase::setSymbols(tocv.symbols());
-    PageVisitor v(files, warningLevel);
+    PageVisitor v(files);
     unit->visit(&v, false);
 }
 
@@ -1954,8 +1953,7 @@ Slice::StartPageGenerator::printHeaderFooter()
     // Do nothing
 }
 
-Slice::FileVisitor::FileVisitor(Files& files, int warningLevel) :
-    ParserVisitor(warningLevel),
+Slice::FileVisitor::FileVisitor(Files& files) :
     _files(files)
 {
 }
@@ -2018,8 +2016,7 @@ Slice::FileVisitor::visitEnum(const EnumPtr& e)
     _files.insert(e->file());
 }
 
-Slice::StartPageVisitor::StartPageVisitor(const Files& files, int warningLevel) :
-    ParserVisitor(warningLevel),
+Slice::StartPageVisitor::StartPageVisitor(const Files& files) :
     _spg(files)
 {
 }
@@ -2176,8 +2173,7 @@ TOCGenerator::writeEntry(const ContainedPtr& c)
     end();
 }
 
-TOCVisitor::TOCVisitor(const Files& files, const string& header, const string& footer, int warningLevel) :
-    ParserVisitor(warningLevel),
+TOCVisitor::TOCVisitor(const Files& files, const string& header, const string& footer) :
     _tg(files, header, footer)
 {
 }
@@ -3267,8 +3263,7 @@ Slice::EnumGenerator::generate(const EnumPtr& e)
     assert(_out.currIndent() == indent);
 }
 
-Slice::PageVisitor::PageVisitor(const Files& files, int warningLevel) :
-    ParserVisitor(warningLevel),
+Slice::PageVisitor::PageVisitor(const Files& files) :
     _files(files)
 {
 }