diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2021-04-11 19:22:59 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2021-04-22 17:34:13 (GMT) |
commit | 592aaa4f17d73ec8c475df0f44efaea8cc4d575c (patch) | |
tree | 3cfd68cec756661045ee25c906a8d8f4bddf7a6a /src/htmldocvisitor.cpp | |
parent | 98c67549bc3cd855873e0ef5eeab7c6410699d78 (diff) | |
download | Doxygen-592aaa4f17d73ec8c475df0f44efaea8cc4d575c.zip Doxygen-592aaa4f17d73ec8c475df0f44efaea8cc4d575c.tar.gz Doxygen-592aaa4f17d73ec8c475df0f44efaea8cc4d575c.tar.bz2 |
Refactoring: remove implicit conversion from QCString to const char *
This commit changes the following in relation to string use
- The implicit convert from 'QCString' to 'const char *' is removed
- Strings parameters use 'const QCString &' as much as possible in favor
over 'const char *'
- 'if (s)' where s is a QCString has been replaced by 'if(!s.isEmpty())'
- data() now always returns a valid C-string and not a 0-pointer.
- when passing a string 's' to printf and related functions 'qPrint(s)' is
used instead of 's.data()'
- for empty string arguments 'QCString()' is used instead of '0'
- The copy() operation has been removed
- Where possible 'qstrcmp(a,b)==0' has been replaces by 'a==b' and
'qstrcmp(a,b)<0' has been replaced by 'a<b'
- Parameters of string type that were default initialized with '= 0' are
no initialized with '= QCString()'
Diffstat (limited to 'src/htmldocvisitor.cpp')
-rw-r--r-- | src/htmldocvisitor.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 545b96e..a11d045 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -278,7 +278,7 @@ HtmlDocVisitor::HtmlDocVisitor(TextStream &t,CodeOutputInterface &ci, void HtmlDocVisitor::visit(DocWord *w) { - //printf("word: %s\n",w->word().data()); + //printf("word: %s\n",qPrint(w->word())); if (m_hide) return; filter(w->word()); } @@ -286,7 +286,7 @@ void HtmlDocVisitor::visit(DocWord *w) void HtmlDocVisitor::visit(DocLinkedWord *w) { if (m_hide) return; - //printf("linked word: %s\n",w->word().data()); + //printf("linked word: %s\n",qPrint(w->word())); startLink(w->ref(),w->file(),w->relPath(),w->anchor(),w->tooltip()); filter(w->word()); endLink(); @@ -554,14 +554,14 @@ void HtmlDocVisitor::visit(DocVerbatim *s) forceEndParagraph(s); fileName.sprintf("%s%d%s", - (Config_getString(HTML_OUTPUT)+"/inline_dotgraph_").data(), + qPrint(Config_getString(HTML_OUTPUT)+"/inline_dotgraph_"), dotindex++, ".dot" ); std::ofstream file(fileName.str(),std::ofstream::out | std::ofstream::binary); if (!file.is_open()) { - err("Could not open file %s for writing\n",fileName.data()); + err("Could not open file %s for writing\n",qPrint(fileName)); } else { @@ -589,13 +589,13 @@ void HtmlDocVisitor::visit(DocVerbatim *s) QCString baseName(4096); baseName.sprintf("%s%d", - (Config_getString(HTML_OUTPUT)+"/inline_mscgraph_").data(), + qPrint(Config_getString(HTML_OUTPUT)+"/inline_mscgraph_"), mscindex++ ); std::ofstream file(baseName.str()+".msc",std::ofstream::out | std::ofstream::binary); if (!file.is_open()) { - err("Could not open file %s.msc for writing\n",baseName.data()); + err("Could not open file %s.msc for writing\n",qPrint(baseName)); } else { @@ -778,7 +778,7 @@ void HtmlDocVisitor::visit(DocInclude *inc) void HtmlDocVisitor::visit(DocIncOperator *op) { //printf("DocIncOperator: type=%d first=%d, last=%d text='%s'\n", - // op->type(),op->isFirst(),op->isLast(),op->text().data()); + // op->type(),op->isFirst(),op->isLast(),qPrint(op->text())); if (op->isFirst()) { forceEndParagraph(op); @@ -902,9 +902,9 @@ void HtmlDocVisitor::visit(DocIndexEntry *e) } m_t << "<a name=\"" << anchor << "\"></a>"; //printf("*** DocIndexEntry: word='%s' scope='%s' member='%s'\n", - // e->entry().data(), - // e->scope() ? e->scope()->name().data() : "<null>", - // e->member() ? e->member()->name().data() : "<null>" + // qPrint(e->entry()), + // e->scope() ? qPrint(e->scope()->name()) : "<null>", + // e->member() ? qPrint(e->member()->name()) : "<null>" // ); Doxygen::indexList->addIndexItem(e->scope(),e->member(),anchor,e->entry()); } @@ -1438,7 +1438,7 @@ void HtmlDocVisitor::visitPre(DocSection *s) m_t << "<h" << s->level() << ">"; m_t << "<a class=\"anchor\" id=\"" << s->anchor(); m_t << "\"></a>\n"; - filter(convertCharEntitiesToUTF8(s->title().data())); + filter(convertCharEntitiesToUTF8(s->title())); m_t << "</h" << s->level() << ">\n"; } @@ -2054,7 +2054,7 @@ void HtmlDocVisitor::visitPost(DocXRefItem *x) void HtmlDocVisitor::visitPre(DocInternalRef *ref) { if (m_hide) return; - startLink(0,ref->file(),ref->relPath(),ref->anchor()); + startLink(QCString(),ref->file(),ref->relPath(),ref->anchor()); } void HtmlDocVisitor::visitPost(DocInternalRef *) @@ -2097,9 +2097,9 @@ void HtmlDocVisitor::visitPre(DocVhdlFlow *vf) m_t << "<p>"; m_t << "flowchart: " ; // TODO: translate me m_t << "<a href=\""; - m_t << fname.data(); + m_t << fname; m_t << ".svg\">"; - m_t << VhdlDocGen::getFlowMember()->name().data(); + m_t << VhdlDocGen::getFlowMember()->name(); m_t << "</a>"; if (vf->hasCaption()) { @@ -2130,10 +2130,10 @@ void HtmlDocVisitor::visitPost(DocParBlock *) -void HtmlDocVisitor::filter(const char *str) +void HtmlDocVisitor::filter(const QCString &str) { - if (str==0) return; - const char *p=str; + if (str.isEmpty()) return; + const char *p=str.data(); char c; while (*p) { @@ -2167,10 +2167,10 @@ void HtmlDocVisitor::filter(const char *str) /// Escape basic entities to produce a valid CDATA attribute value, /// assume that the outer quoting will be using the double quote " -void HtmlDocVisitor::filterQuotedCdataAttr(const char* str) +void HtmlDocVisitor::filterQuotedCdataAttr(const QCString &str) { - if (str==0) return; - const char *p=str; + if (str.isEmpty()) return; + const char *p=str.data(); char c; while (*p) { @@ -2207,7 +2207,7 @@ void HtmlDocVisitor::startLink(const QCString &ref,const QCString &file, const QCString &relPath,const QCString &anchor, const QCString &tooltip) { - //printf("HtmlDocVisitor: file=%s anchor=%s\n",file.data(),anchor.data()); + //printf("HtmlDocVisitor: file=%s anchor=%s\n",qPrint(file),qPrint(anchor)); if (!ref.isEmpty()) // link to entity imported via tag file { m_t << "<a class=\"elRef\" "; |