diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-08-30 13:32:37 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-08-30 13:32:37 -0700 |
| commit | d6d6b23e6b5f1d04ce4a9bb290b47424a7b9915a (patch) | |
| tree | 68331af990b7bff3f8a6f27c6f4482e0b8aee47e /cpp/src/slice2html/Gen.h | |
| parent | ICE-7242 - Cross test updates (diff) | |
| download | ice-d6d6b23e6b5f1d04ce4a9bb290b47424a7b9915a.tar.bz2 ice-d6d6b23e6b5f1d04ce4a9bb290b47424a7b9915a.tar.xz ice-d6d6b23e6b5f1d04ce4a9bb290b47424a7b9915a.zip | |
ICE-7301 - slice2html generates bogus links
Diffstat (limited to 'cpp/src/slice2html/Gen.h')
| -rw-r--r-- | cpp/src/slice2html/Gen.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h index 42723b8fa65..8fb67136bc0 100644 --- a/cpp/src/slice2html/Gen.h +++ b/cpp/src/slice2html/Gen.h @@ -50,22 +50,24 @@ protected: void start(const ::std::string&, const ::std::string& = ::std::string()); void end(); - void printComment(const ContainedPtr&, const ContainerPtr&, const ::std::string&, bool = false); + void printComment(const ContainedPtr&, const SyntaxTreeBasePtr&, const ::std::string&, bool = false); void printMetaData(const ContainedPtr&); void printSummary(const ContainedPtr&, const ContainerPtr&, bool, bool); void printHeaderFooter(const ContainedPtr&); void printSearch(); - void printLogo(const ContainedPtr&, const ContainerPtr&, bool); + void printLogo(const ContainedPtr&); - ::std::string toString(const SyntaxTreeBasePtr&, const ContainerPtr&, bool = true, bool = false, - size_t* = 0, bool = false); - ::std::string toString(const ::std::string&, const ContainerPtr&, bool = true, bool = false, size_t* = 0); - ::std::string getComment(const ContainedPtr&, const ContainerPtr&, bool, bool = false); + bool checkFile(const SyntaxTreeBasePtr&); + ContainedPtr getPageElement(const SyntaxTreeBasePtr&); + ::std::string getPath(const SyntaxTreeBasePtr&, const SyntaxTreeBasePtr&); + ::std::string getURL(const SyntaxTreeBasePtr&, const SyntaxTreeBasePtr&, bool, bool); + ::std::string getURL(const ::std::string&, const SyntaxTreeBasePtr&, bool); + + ::std::string getComment(const ContainedPtr&, const SyntaxTreeBasePtr&, bool, bool = false); static ::std::string getAnchor(const SyntaxTreeBasePtr&); static StringList getTarget(const SyntaxTreeBasePtr&); - static ::std::string getLinkPath(const SyntaxTreeBasePtr&, const ContainerPtr&, bool, bool = false); static ::std::string getImageDir(); static ::std::string getLogoURL(); @@ -83,10 +85,11 @@ private: static ::std::string containedToId(const ContainedPtr&, bool); static StringList getTagged(const ::std::string&, ::std::string&); - static ::std::string getScopedMinimized(const ContainedPtr&, const ContainerPtr&, bool = false); + static ::std::string getScopedMinimized(const SyntaxTreeBasePtr&, const SyntaxTreeBasePtr&, bool); static StringList getContained(const SyntaxTreeBasePtr&); static StringList getContainer(const SyntaxTreeBasePtr&); static StringList toStringList(const ContainedPtr&); + static StringList toStringList(const ::std::string&); static void makeDir(const ::std::string&); static ::std::string readFile(const ::std::string&); static void readFile(const ::std::string&, ::std::string&, ::std::string&); |