diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2011-12-26 14:28:40 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2011-12-26 14:28:40 (GMT) |
commit | 4d121f89106d6c73fcb82dfc57b51fd9eb6a13d7 (patch) | |
tree | 7f59fc72959fc8ac950d4affd83be0c3b2b4cf2b /src/htmldocvisitor.cpp | |
parent | e7c5e0d738bcc16bb2194740fd009242d4059045 (diff) | |
download | Doxygen-4d121f89106d6c73fcb82dfc57b51fd9eb6a13d7.zip Doxygen-4d121f89106d6c73fcb82dfc57b51fd9eb6a13d7.tar.gz Doxygen-4d121f89106d6c73fcb82dfc57b51fd9eb6a13d7.tar.bz2 |
Release-1.7.6.1-20111226
Diffstat (limited to 'src/htmldocvisitor.cpp')
-rw-r--r-- | src/htmldocvisitor.cpp | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index a35d92a..16c5b46 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -83,8 +83,8 @@ static bool mustBeOutsideParagraph(DocNode *n) /* \internal */ case DocNode::Kind_Internal: /* <div> */ - case DocNode::Kind_Verbatim: case DocNode::Kind_Include: + case DocNode::Kind_Verbatim: case DocNode::Kind_Image: case DocNode::Kind_SecRefList: /* <hr> */ @@ -107,8 +107,6 @@ static bool mustBeOutsideParagraph(DocNode *n) return FALSE; } - - static QString htmlAttribsToString(const HtmlAttribList &attribs) { QString result; @@ -849,16 +847,6 @@ void HtmlDocVisitor::visitPre(DocPara *p) void HtmlDocVisitor::visitPost(DocPara *p) { -// if (m_hide) return; -// if (!p->isLast() && // omit <p> for last paragraph -// !(p->parent() && // and for parameter sections -// p->parent()->kind()==DocNode::Kind_ParamSect -// ) -// ) -// { -// m_t << "<p>\n"; -// } - bool needsTag = FALSE; if (p && p->parent()) { @@ -1209,11 +1197,7 @@ void HtmlDocVisitor::visitPost(DocInternal *) void HtmlDocVisitor::visitPre(DocHRef *href) { if (m_hide) return; - QCString url = href->url(); - if (url.left(5)!="http:" && url.left(6)!="https:" && url.left(4)!="ftp:") - { - url.prepend(href->relPath()); - } + QCString url = correctURL(href->url(),href->relPath()); m_t << "<a href=\"" << convertToXML(url) << "\"" << htmlAttribsToString(href->attribs()) << ">"; } @@ -1261,11 +1245,7 @@ void HtmlDocVisitor::visitPre(DocImage *img) } else { - if (url.left(5)!="http:" && url.left(6)!="https:" && url.left(4)!="ftp:") - { - url.prepend(img->relPath()); - } - m_t << "<img src=\"" << url << "\" " + m_t << "<img src=\"" << correctURL(url,img->relPath()) << "\" " << htmlAttribsToString(img->attribs()) << "/>" << endl; } |