diff options
Diffstat (limited to 'cpp/src/slice2confluence')
-rw-r--r-- | cpp/src/slice2confluence/ConfluenceOutput.cpp | 2 | ||||
-rw-r--r-- | cpp/src/slice2confluence/ConfluenceOutput.h | 1 | ||||
-rw-r--r-- | cpp/src/slice2confluence/Gen.cpp | 9 | ||||
-rw-r--r-- | cpp/src/slice2confluence/Gen.h | 3 |
4 files changed, 0 insertions, 15 deletions
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp index b464f8a9fcd..e603b5ef73c 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.cpp +++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp @@ -392,7 +392,6 @@ Confluence::ConfluenceOutput::convertCommentHTML(string comment) comment.replace(tagStart, tagEnd + 1 - tagStart, replacement); // Don't skip whitespace } - // Special case: terminate <p> (and any italics) on double newline or end of comment size_t dnl = comment.find("\n\n", tagStart + replacement.size()); tagStart = comment.find("<"); @@ -458,7 +457,6 @@ Confluence::ConfluenceOutput::startElement(const string& element) string::size_type tagpos = element.find_first_of(" "); const string tagname = element.substr(0, tagpos).c_str(); - if(tagname == "p") { _out << "\n"; diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h index 10761537bf0..2848937ebbe 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.h +++ b/cpp/src/slice2confluence/ConfluenceOutput.h @@ -13,7 +13,6 @@ #include <IceUtil/OutputUtil.h> #include <list> - namespace Confluence { diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp index 064236b0c61..ef17947e9f5 100644 --- a/cpp/src/slice2confluence/Gen.cpp +++ b/cpp/src/slice2confluence/Gen.cpp @@ -94,7 +94,6 @@ generate(const UnitPtr& unit, const string& dir, const string& header, const str } - string Slice::GeneratorBase::_dir = "."; string Slice::GeneratorBase::_header1; string Slice::GeneratorBase::_header2; @@ -200,7 +199,6 @@ Slice::GeneratorBase::setSymbols(const ContainedList& symbols) _symbols = symbols; } - void Slice::GeneratorBase::setSortOrder(const vector<string>& sortOrder) { @@ -431,7 +429,6 @@ Slice::GeneratorBase::trim(string str) return out; } - string Slice::GeneratorBase::getUpper(const std::string& str) { @@ -814,7 +811,6 @@ compareContained(const ContainedPtr& p1, const ContainedPtr& p2) //XXX --- END HACK } - if (!c1 && !c2) { // Both are top-level containers, compare cnames @@ -850,7 +846,6 @@ compareContained(const ContainedPtr& p1, const ContainedPtr& p2) if ("Instrumentation" == p1->name() || "Instrumentation" == p2->name()) { } - if (p1->name() == c2->name()) { // Module index comes before its own contents @@ -1528,7 +1523,6 @@ Slice::GeneratorBase::isTagged(const string& tag, string& comment) return false; } - string Slice::GeneratorBase::getScopedMinimized(const ContainedPtr& contained, const ContainerPtr& container, bool shortName) { @@ -1547,7 +1541,6 @@ Slice::GeneratorBase::getScopedMinimized(const ContainedPtr& contained, const Co return s.substr(2); } - // do // { // string s2 = q->scoped(); // Containing scope @@ -2074,7 +2067,6 @@ TOCGenerator::symbols() const return _symbols; } - void TOCGenerator::writeEntry(const ContainedPtr& c) { @@ -3254,7 +3246,6 @@ Slice::EnumGenerator::generate(const EnumPtr& e) _out << "\n{ztop}\n"; } - closeDoc(); start("hr"); diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h index a33e6fe834e..10f4e0a62e3 100644 --- a/cpp/src/slice2confluence/Gen.h +++ b/cpp/src/slice2confluence/Gen.h @@ -144,8 +144,6 @@ class StartPageGenerator : private GeneratorBase { public: - - StartPageGenerator(const Files&); ~StartPageGenerator(); void generate(const ModulePtr&); @@ -155,7 +153,6 @@ private: using GeneratorBase::printHeaderFooter; void printHeaderFooter(); - typedef ::std::vector<StringPair> ModuleDescriptions; ModuleDescriptions _modules; Confluence::ConfluenceOutput _out; |