From 962b9c9a85384f358258725767d5ae5a2784a0e8 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 1 Jun 2019 14:01:20 +0200 Subject: Correction warning message When there is a problem with a backticjk comment block we can get the message: reached end of file while inside a ````' block! this is a bit unreadable / non understandable as we see see 4 backticks followed by a single quote, it woulb be more readable when we get reached end of file while inside a '```' block! --- src/scanner.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scanner.l b/src/scanner.l index f94e4f8..2634485 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -6771,7 +6771,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } <> { warn(yyFileName,yyLineNr, - "reached end of file while inside a `%s' block!\n" + "reached end of file while inside a '%s' block!\n" "The command that should end the block seems to be missing!\n", docBlockName.data()); yyterminate(); -- cgit v0.12 From 3c3efc26e6b258ef2c3916f7e1b2c07254039ad4 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 1 Jun 2019 16:01:16 +0200 Subject: Correction warning message Consistency --- addon/doxmlparser/src/basehandler.h | 2 +- addon/doxmlparser/src/compoundhandler.cpp | 10 +- addon/doxmlparser/src/dochandler.cpp | 14 +- addon/doxmlparser/src/linkedtexthandler.cpp | 6 +- addon/doxmlparser/src/mainhandler.cpp | 4 +- addon/doxmlparser/src/memberhandler.cpp | 16 +- addon/doxmlparser/src/paramhandler.cpp | 8 +- addon/doxmlparser/src/sectionhandler.cpp | 6 +- addon/doxmlparser/test/main.cpp | 26 +-- addon/doxywizard/config_doxyw.l | 20 +-- src/classdef.cpp | 24 +-- src/code.l | 30 ++-- src/commentscan.l | 4 +- src/configimpl.l | 56 +++---- src/constexp.l | 2 +- src/declinfo.l | 14 +- src/defargs.l | 6 +- src/defgen.cpp | 8 +- src/definition.cpp | 12 +- src/diagram.cpp | 6 +- src/docparser.cpp | 26 +-- src/doctokenizer.l | 10 +- src/dot.cpp | 24 +-- src/doxygen.cpp | 242 ++++++++++++++-------------- src/filedef.cpp | 2 +- src/filename.cpp | 2 +- src/fortrancode.l | 2 +- src/fortranscanner.l | 2 +- src/groupdef.cpp | 8 +- src/htmldocvisitor.cpp | 2 +- src/index.cpp | 4 +- src/latexdocvisitor.cpp | 2 +- src/layout.cpp | 2 +- src/mandocvisitor.cpp | 2 +- src/markdown.cpp | 2 +- src/memberdef.cpp | 30 ++-- src/membergroup.cpp | 2 +- src/memberlist.cpp | 6 +- src/msc.cpp | 2 +- src/namespacedef.cpp | 2 +- src/perlmodgen.cpp | 6 +- src/pre.l | 56 +++---- src/pycode.l | 8 +- src/rtfdocvisitor.cpp | 2 +- src/rtfgen.cpp | 4 +- src/scanner.l | 30 ++-- src/tagreader.cpp | 116 ++++++------- src/template.cpp | 2 +- src/util.cpp | 124 +++++++------- src/vhdlcode.l | 2 +- src/xmldocvisitor.cpp | 2 +- src/xmlgen.cpp | 2 +- 52 files changed, 501 insertions(+), 501 deletions(-) diff --git a/addon/doxmlparser/src/basehandler.h b/addon/doxmlparser/src/basehandler.h index 5715dda..a82114d 100644 --- a/addon/doxmlparser/src/basehandler.h +++ b/addon/doxmlparser/src/basehandler.h @@ -175,7 +175,7 @@ template class BaseHandler : public QXmlDefaultHandler, !m_fallBackHandler->handleStartElement(name,attrib) ) { - debug(1,"line %d, col %d: found unexpected tag `%s', skipping until matching end tag\n", + debug(1,"line %d, col %d: found unexpected tag '%s', skipping until matching end tag\n", s_theLocator->lineNumber(),s_theLocator->columnNumber(), name.data()); m_skipUntil = name; diff --git a/addon/doxmlparser/src/compoundhandler.cpp b/addon/doxmlparser/src/compoundhandler.cpp index 3e729e9..42138ae 100644 --- a/addon/doxmlparser/src/compoundhandler.cpp +++ b/addon/doxmlparser/src/compoundhandler.cpp @@ -152,7 +152,7 @@ class CompoundTypeMap int *val = m_map.find(s.utf8()); if (val==0) { - debug(1,"Warning: `%s' is an invalid compound type\n",s.data()); + debug(1,"Warning: '%s' is an invalid compound type\n",s.data()); return ICompound::Invalid; } else return (ICompound::CompoundKind)*val; @@ -325,7 +325,7 @@ void CompoundHandler::startCompound(const QXmlAttributes& attrib) m_kindString = attrib.value("kind"); m_kind = s_typeMap->map(m_kindString); m_protection = attrib.value("prot"); - debug(2,"startCompound(id=`%s' type=`%s')\n",m_id.data(),m_kindString.data()); + debug(2,"startCompound(id='%s' type='%s')\n",m_id.data(),m_kindString.data()); } void CompoundHandler::endCompound() @@ -345,7 +345,7 @@ void CompoundHandler::startLocation(const QXmlAttributes& attrib) void CompoundHandler::endCompoundName() { m_name = m_curString.stripWhiteSpace(); - debug(2,"Compound name `%s'\n",m_name.data()); + debug(2,"Compound name '%s'\n",m_name.data()); } void CompoundHandler::startInnerClass(const QXmlAttributes& attrib) @@ -412,7 +412,7 @@ void CompoundHandler::startSuperClass(const QXmlAttributes& attrib) prot, kind ); - debug(2,"super class id=`%s' prot=`%s' virt=`%s'\n", + debug(2,"super class id='%s' prot='%s' virt='%s'\n", attrib.value("refid").data(), protString.data(), kindString.data()); @@ -442,7 +442,7 @@ void CompoundHandler::startSubClass(const QXmlAttributes& attrib) prot, kind ); - debug(2,"sub class id=`%s' prot=`%s' virt=`%s'\n", + debug(2,"sub class id='%s' prot='%s' virt='%s'\n", attrib.value("refid").data(), protString.data(), kindString.data()); diff --git a/addon/doxmlparser/src/dochandler.cpp b/addon/doxmlparser/src/dochandler.cpp index 4e25813..ea1abf5 100644 --- a/addon/doxmlparser/src/dochandler.cpp +++ b/addon/doxmlparser/src/dochandler.cpp @@ -842,7 +842,7 @@ void RefHandler::endRef() { m_linkText = m_curString; m_parent->setDelegate(0); - debug(2,"End ref: text=`%s'\n",m_linkText.data()); + debug(2,"End ref: text='%s'\n",m_linkText.data()); } @@ -1098,7 +1098,7 @@ void HighlightHandler::startHighlight(const QXmlAttributes& attrib) void HighlightHandler::endHighlight() { addTextNode(); - debug(2,"end highlight class=`%s'\n",m_hlString.data()); + debug(2,"end highlight class='%s'\n",m_hlString.data()); m_parent->setDelegate(0); } @@ -1297,7 +1297,7 @@ void FormulaHandler::startFormula(const QXmlAttributes& attrib) void FormulaHandler::endFormula() { m_text = m_curString; - debug(2,"formula id=`%s' text=`%s'\n",m_id.data(),m_text.data()); + debug(2,"formula id='%s' text='%s'\n",m_id.data(),m_text.data()); m_parent->setDelegate(0); } @@ -1323,7 +1323,7 @@ void AnchorHandler::startAnchor(const QXmlAttributes& attrib) void AnchorHandler::endAnchor() { - debug(2,"anchor id=`%s'\n",m_id.data()); + debug(2,"anchor id='%s'\n",m_id.data()); m_parent->setDelegate(0); } @@ -1351,7 +1351,7 @@ void ImageHandler::startImage(const QXmlAttributes& attrib) void ImageHandler::endImage() { m_caption = m_curString; - debug(2,"image name=`%s' caption=`%s'\n",m_name.data(),m_caption.data()); + debug(2,"image name='%s' caption='%s'\n",m_name.data(),m_caption.data()); m_parent->setDelegate(0); } @@ -1379,7 +1379,7 @@ void DotFileHandler::startDotFile(const QXmlAttributes& attrib) void DotFileHandler::endDotFile() { m_caption = m_curString; - debug(2,"image name=`%s' caption=`%s'\n",m_name.data(),m_caption.data()); + debug(2,"image name='%s' caption='%s'\n",m_name.data(),m_caption.data()); m_parent->setDelegate(0); } @@ -1409,7 +1409,7 @@ void IndexEntryHandler::startIndexEntry(const QXmlAttributes& /*attrib*/) void IndexEntryHandler::endIndexEntry() { - debug(2,"index entry primary=`%s' secondary=`%s'\n", + debug(2,"index entry primary='%s' secondary='%s'\n", m_primary.data(),m_secondary.data()); m_parent->setDelegate(0); } diff --git a/addon/doxmlparser/src/linkedtexthandler.cpp b/addon/doxmlparser/src/linkedtexthandler.cpp index 1164688..b774f0f 100644 --- a/addon/doxmlparser/src/linkedtexthandler.cpp +++ b/addon/doxmlparser/src/linkedtexthandler.cpp @@ -81,7 +81,7 @@ void LinkedTextHandler::end() if (!m_curString.isEmpty()) { m_children.append(new LT_Text(m_curString)); - debug(2,"LinkedTextHandler: add text `%s'\n",m_curString.data()); + debug(2,"LinkedTextHandler: add text '%s'\n",m_curString.data()); m_curString=""; } m_parent->setDelegate(0); @@ -92,7 +92,7 @@ void LinkedTextHandler::startRef(const QXmlAttributes& attrib) if (!m_curString.isEmpty()) { m_children.append(new LT_Text(m_curString)); - debug(2,"LinkedTextHandler: add text `%s'\n",m_curString.data()); + debug(2,"LinkedTextHandler: add text '%s'\n",m_curString.data()); m_curString=""; } ASSERT(m_ref==0); @@ -107,7 +107,7 @@ void LinkedTextHandler::endRef() { m_ref->setText(m_curString); m_children.append(m_ref); - debug(2,"LinkedTextHandler: add ref `%s'\n",m_ref->text()->latin1()); + debug(2,"LinkedTextHandler: add ref '%s'\n",m_ref->text()->latin1()); m_ref=0; } diff --git a/addon/doxmlparser/src/mainhandler.cpp b/addon/doxmlparser/src/mainhandler.cpp index 93525f0..51beea0 100644 --- a/addon/doxmlparser/src/mainhandler.cpp +++ b/addon/doxmlparser/src/mainhandler.cpp @@ -170,12 +170,12 @@ void MainHandler::dump() CompoundEntry *ce; for (cli.toFirst();(ce=cli.current());++cli) { - debug(2,"compound id=`%s' name=`%s'\n",ce->id.data(),ce->name.data()); + debug(2,"compound id='%s' name='%s'\n",ce->id.data(),ce->name.data()); QDictIterator mdi(ce->memberDict); MemberEntry *me; for (mdi.toFirst();(me=mdi.current());++mdi) { - debug(2," member id=`%s' name=`%s'\n",me->id.data(),me->name.data()); + debug(2," member id='%s' name='%s'\n",me->id.data(),me->name.data()); } } } diff --git a/addon/doxmlparser/src/memberhandler.cpp b/addon/doxmlparser/src/memberhandler.cpp index 7a3f228..6042f91 100644 --- a/addon/doxmlparser/src/memberhandler.cpp +++ b/addon/doxmlparser/src/memberhandler.cpp @@ -48,7 +48,7 @@ class MemberTypeMap int *val = m_map.find(s.utf8()); if (val==0) { - debug(1,"Warning: `%s' is an invalid member type\n",s.data()); + debug(1,"Warning: '%s' is an invalid member type\n",s.data()); return IMember::Invalid; } else return (IMember::MemberKind)*val; @@ -240,7 +240,7 @@ void MemberHandler::startMember(const QXmlAttributes& attrib) { m_parent->setDelegate(this); m_kindString = attrib.value("kind"); - //printf("startMember kindString=`%s'\n",m_kindString.data()); + //printf("startMember kindString='%s'\n",m_kindString.data()); m_kind = s_typeMap->map(m_kindString); m_id = attrib.value("id"); m_protection = attrib.value("prot"); @@ -254,7 +254,7 @@ void MemberHandler::startMember(const QXmlAttributes& attrib) m_isReadable = attrib.value("readable")=="yes"; m_isWritable = attrib.value("writable")=="yes"; - debug(2,"member kind=`%s' id=`%s' prot=`%s' virt=`%s'\n", + debug(2,"member kind='%s' id='%s' prot='%s' virt='%s'\n", m_kindString.data(),m_id.data(),m_protection.data(),m_virtualness.data()); } @@ -262,7 +262,7 @@ void MemberHandler::startEnumValue(const QXmlAttributes& attrib) { m_parent->setDelegate(this); m_kindString = "enumvalue"; - //printf("startEnumValue kindString=`%s'\n",m_kindString.data()); + //printf("startEnumValue kindString='%s'\n",m_kindString.data()); m_kind = s_typeMap->map(m_kindString); m_id = attrib.value("id"); m_protection = attrib.value("prot"); @@ -275,7 +275,7 @@ void MemberHandler::startEnumValue(const QXmlAttributes& attrib) m_isMutable = FALSE; m_isReadable = FALSE; m_isWritable = FALSE; - debug(2,"member kind=`%s' id=`%s' prot=`%s' virt=`%s'\n", + debug(2,"member kind='%s' id='%s' prot='%s' virt='%s'\n", m_kindString.data(),m_id.data(),m_protection.data(),m_virtualness.data()); } @@ -409,7 +409,7 @@ void MemberHandler::startName(const QXmlAttributes &) void MemberHandler::endName() { m_name = m_curString.stripWhiteSpace(); - debug(2,"member name=`%s'\n",m_name.data()); + debug(2,"member name='%s'\n",m_name.data()); } void MemberHandler::startRead(const QXmlAttributes &) @@ -420,7 +420,7 @@ void MemberHandler::startRead(const QXmlAttributes &) void MemberHandler::endRead() { m_read = m_curString.stripWhiteSpace(); - debug(2,"member read=`%s'\n",m_read.data()); + debug(2,"member read='%s'\n",m_read.data()); } void MemberHandler::startWrite(const QXmlAttributes &) @@ -431,7 +431,7 @@ void MemberHandler::startWrite(const QXmlAttributes &) void MemberHandler::endWrite() { m_write = m_curString.stripWhiteSpace(); - debug(2,"member write=`%s'\n",m_write.data()); + debug(2,"member write='%s'\n",m_write.data()); } void MemberHandler::startDefinition(const QXmlAttributes&) diff --git a/addon/doxmlparser/src/paramhandler.cpp b/addon/doxmlparser/src/paramhandler.cpp index 831d5e4..7a6f455 100644 --- a/addon/doxmlparser/src/paramhandler.cpp +++ b/addon/doxmlparser/src/paramhandler.cpp @@ -103,25 +103,25 @@ void ParamHandler::startType(const QXmlAttributes& /*attrib*/) void ParamHandler::endDeclName() { m_declName = m_curString.stripWhiteSpace(); - debug(2,"member declName=`%s'\n",m_declName.data()); + debug(2,"member declName='%s'\n",m_declName.data()); } void ParamHandler::endDefName() { m_defName = m_curString.stripWhiteSpace(); - debug(2,"member defName=`%s'\n",m_defName.data()); + debug(2,"member defName='%s'\n",m_defName.data()); } void ParamHandler::endAttrib() { m_attrib = m_curString.stripWhiteSpace(); - debug(2,"member attrib=`%s'\n",m_attrib.data()); + debug(2,"member attrib='%s'\n",m_attrib.data()); } void ParamHandler::endArray() { m_array = m_curString.stripWhiteSpace(); - debug(2,"member array=`%s'\n",m_array.data()); + debug(2,"member array='%s'\n",m_array.data()); } void ParamHandler::startDefVal(const QXmlAttributes& /*attrib*/) diff --git a/addon/doxmlparser/src/sectionhandler.cpp b/addon/doxmlparser/src/sectionhandler.cpp index 1137901..cadd82b 100644 --- a/addon/doxmlparser/src/sectionhandler.cpp +++ b/addon/doxmlparser/src/sectionhandler.cpp @@ -68,7 +68,7 @@ class SectionTypeMap int *val = m_map.find(s.utf8()); if (val==0) { - debug(1,"Warning: `%s' is an invalid section type\n",s.data()); + debug(1,"Warning: '%s' is an invalid section type\n",s.data()); return ISection::Invalid; } else return (ISection::SectionKind)*val; @@ -110,7 +110,7 @@ void SectionHandler::startSection(const QXmlAttributes& attrib) m_parent->setDelegate(this); m_kindString = attrib.value("kind"); m_kind = s_typeMap->map(m_kindString); - debug(2,"section kind=`%s'\n",m_kindString.data()); + debug(2,"section kind='%s'\n",m_kindString.data()); } void SectionHandler::startDescription(const QXmlAttributes& attrib) @@ -141,7 +141,7 @@ void SectionHandler::startHeader(const QXmlAttributes&) void SectionHandler::endHeader() { m_header = m_curString.stripWhiteSpace(); - debug(2,"member header=`%s'\n",m_header.data()); + debug(2,"member header='%s'\n",m_header.data()); } void SectionHandler::initialize(CompoundHandler *ch) diff --git a/addon/doxmlparser/test/main.cpp b/addon/doxmlparser/test/main.cpp index 5f37c81..70c79da 100644 --- a/addon/doxmlparser/test/main.cpp +++ b/addon/doxmlparser/test/main.cpp @@ -51,7 +51,7 @@ void DumpDoc(IDoc *doc,int level) if (doc==0) return; QString indent; indent.fill(' ',level); - //printf(" doc node kind=`%d'\n",doc->kind()); + //printf(" doc node kind='%d'\n",doc->kind()); switch (doc->kind()) { case IDoc::Para: @@ -73,7 +73,7 @@ void DumpDoc(IDoc *doc,int level) { IDocText *txt = dynamic_cast(doc); ASSERT(txt!=0); - InPrint(("\n", + InPrint(("\n", txt->text()->latin1(),txt->markup(),txt->headingLevel())); } break; @@ -244,21 +244,21 @@ void DumpDoc(IDoc *doc,int level) { IDocULink *ul = dynamic_cast(doc); ASSERT(ul!=0); - InPrint(("\n",ul->url()->latin1(),ul->text()->latin1())); + InPrint(("\n",ul->url()->latin1(),ul->text()->latin1())); } break; case IDoc::EMail: { IDocEMail *em = dynamic_cast(doc); ASSERT(em!=0); - InPrint(("\n",em->address()->latin1())); + InPrint(("\n",em->address()->latin1())); } break; case IDoc::Link: { IDocLink *lk = dynamic_cast(doc); ASSERT(lk!=0); - InPrint(("\n",lk->refId()->latin1(),lk->text()->latin1())); + InPrint(("\n",lk->refId()->latin1(),lk->text()->latin1())); } break; case IDoc::ProgramListing: @@ -280,7 +280,7 @@ void DumpDoc(IDoc *doc,int level) { IDocCodeLine *cl = dynamic_cast(doc); ASSERT(cl!=0); - InPrint(("\n",cl->lineNumber(),cl->refId()->latin1())); + InPrint(("\n",cl->lineNumber(),cl->refId()->latin1())); IDocIterator *cei = cl->codeElements(); IDoc *ce; for (cei->toFirst();(ce=cei->current());cei->toNext()) @@ -310,35 +310,35 @@ void DumpDoc(IDoc *doc,int level) { IDocFormula *fm = dynamic_cast(doc); ASSERT(fm!=0); - InPrint(("\n",fm->id()->latin1(),fm->text()->latin1())); + InPrint(("\n",fm->id()->latin1(),fm->text()->latin1())); } break; case IDoc::Image: { IDocImage *img = dynamic_cast(doc); ASSERT(img!=0); - InPrint(("\n",img->name()->latin1(),img->caption()->latin1())); + InPrint(("\n",img->name()->latin1(),img->caption()->latin1())); } break; case IDoc::DotFile: { IDocDotFile *df = dynamic_cast(doc); ASSERT(df!=0); - InPrint(("\n",df->name()->latin1(),df->caption()->latin1())); + InPrint(("\n",df->name()->latin1(),df->caption()->latin1())); } break; case IDoc::IndexEntry: { IDocIndexEntry *ie = dynamic_cast(doc); ASSERT(ie!=0); - InPrint(("\n",ie->primary()->latin1(),ie->secondary()->latin1())); + InPrint(("\n",ie->primary()->latin1(),ie->secondary()->latin1())); } break; case IDoc::Table: { IDocTable *tbl = dynamic_cast(doc); ASSERT(tbl!=0); - InPrint(("\n",tbl->numColumns(),tbl->caption()->latin1())); + InPrint(("
\n",tbl->numColumns(),tbl->caption()->latin1())); IDocIterator *ri = tbl->rows(); IDoc *row; for (ri->toFirst();(row=ri->current());ri->toNext()) @@ -383,7 +383,7 @@ void DumpDoc(IDoc *doc,int level) { IDocSection *sec = dynamic_cast(doc); ASSERT(sec!=0); - InPrint(("
\n", + InPrint(("
\n", sec->id()->latin1(),sec->level())); DumpDoc(sec->title(),level+1); IDocIterator *di = sec->paragraphs(); @@ -653,7 +653,7 @@ int main(int argc,char **argv) ILinkedTextIterator *lti = ev->initializer(); QString init = linkedTextToString(lti); lti->release(); - printf(" Enum value `%s' init=`%s'\n", + printf(" Enum value '%s' init='%s'\n", ev->name()->latin1(),init.latin1()); } evi->release(); diff --git a/addon/doxywizard/config_doxyw.l b/addon/doxywizard/config_doxyw.l index 960b7cb..8549e6b 100644 --- a/addon/doxywizard/config_doxyw.l +++ b/addon/doxywizard/config_doxyw.l @@ -230,7 +230,7 @@ static void readIncludeFile(const QString &incName) g_curOption = g_options->value(cmd); if (g_curOption==0) // oops not known { - config_warn("ignoring unsupported tag `%s' at line %d, file %s\n", + config_warn("ignoring unsupported tag '%s' at line %d, file %s\n", qPrintable(cmd),yylineno,qPrintable(g_yyFileName)); BEGIN(SkipInvalid); } @@ -255,7 +255,7 @@ static void readIncludeFile(const QString &incName) BEGIN(GetString); break; case Input::Obsolete: - config_warn("Tag `%s' at line %d of file %s has become obsolete.\n" + config_warn("Tag '%s' at line %d of file %s has become obsolete.\n" "To avoid this warning please update your configuration " "file using \"doxygen -u\"\n", qPrintable(cmd), yylineno,qPrintable(g_yyFileName)); @@ -269,7 +269,7 @@ static void readIncludeFile(const QString &incName) g_curOption = g_options->value(cmd); if (g_curOption==0) // oops not known { - config_warn("ignoring unsupported tag `%s' at line %d, file %s\n", + config_warn("ignoring unsupported tag '%s' at line %d, file %s\n", yytext,yylineno,qPrintable(g_yyFileName)); BEGIN(SkipInvalid); } @@ -285,12 +285,12 @@ static void readIncludeFile(const QString &incName) case Input::String: case Input::Int: case Input::Bool: - config_warn("operator += not supported for `%s'. Ignoring line at line %d, file %s\n", + config_warn("operator += not supported for '%s'. Ignoring line at line %d, file %s\n", yytext,yylineno,qPrintable(g_yyFileName)); BEGIN(SkipInvalid); break; case Input::Obsolete: - config_warn("Tag `%s' at line %d of file %s has become obsolete.\n" + config_warn("Tag '%s' at line %d of file %s has become obsolete.\n" "To avoid this warning please update your configuration " "file using \"doxygen -u\"\n", qPrintable(cmd),yylineno,qPrintable(g_yyFileName)); @@ -327,12 +327,12 @@ static void readIncludeFile(const QString &incName) } } -[a-z_A-Z0-9]+ { config_warn("ignoring unknown tag `%s' at line %d, file %s\n",yytext,yylineno,qPrintable(g_yyFileName)); } +[a-z_A-Z0-9]+ { config_warn("ignoring unknown tag '%s' at line %d, file %s\n",yytext,yylineno,qPrintable(g_yyFileName)); } \n { BEGIN(Start); } \n { if (!g_elemStr.isEmpty()) { - //printf("elemStr1=`%s'\n",qPrintable(elemStr)); + //printf("elemStr1='%s'\n",qPrintable(elemStr)); *g_arg = QVariant(g_arg->toStringList() << g_elemStr); } BEGIN(Start); @@ -340,7 +340,7 @@ static void readIncludeFile(const QString &incName) [ \t]+ { if (!g_elemStr.isEmpty()) { - //printf("elemStr2=`%s'\n",qPrintable(elemStr)); + //printf("elemStr2='%s'\n",qPrintable(elemStr)); *g_arg = QVariant(g_arg->toStringList() << g_elemStr); } g_elemStr = QString(); @@ -356,7 +356,7 @@ static void readIncludeFile(const QString &incName) "\""|"\n" { // we add a bogus space to signal that the string was quoted. This space will be stripped later on. g_tmpString+=" "; - //printf("Quoted String = `%s'\n",qPrintable(tmpString)); + //printf("Quoted String = '%s'\n",qPrintable(tmpString)); if (g_lastState==GetString) { *g_arg = g_codec->toUnicode(g_tmpString); @@ -401,7 +401,7 @@ static void substEnvVarsInString(QString &s) while ((i=re.indexIn(s,p))!=-1) { l = re.matchedLength(); - //printf("Found environment var s.mid(%d,%d)=`%s'\n",i+2,l-3,qPrintable(s.mid(i+2,l-3))); + //printf("Found environment var s.mid(%d,%d)='%s'\n",i+2,l-3,qPrintable(s.mid(i+2,l-3))); QString env=g_codec->toUnicode(getenv(s.mid(i+2,l-3).toLatin1())); substEnvVarsInString(env); // recursively expand variables if needed. s = s.left(i)+env+s.right(s.length()-i-l); diff --git a/src/classdef.cpp b/src/classdef.cpp index 3a680c5..d528848 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -3450,7 +3450,7 @@ bool ClassDefImpl::hasNonReferenceSuperClass() const void ClassDefImpl::writeDeclaration(OutputList &ol,const MemberDef *md,bool inGroup, const ClassDef *inheritedFrom,const char *inheritId) const { - //printf("ClassName=`%s' inGroup=%d\n",name().data(),inGroup); + //printf("ClassName='%s' inGroup=%d\n",name().data(),inGroup); ol.docify(compoundTypeString()); QCString cn = displayName(FALSE); @@ -3564,8 +3564,8 @@ bool ClassDefImpl::hasDocumentation() const //---------------------------------------------------------------------- // recursive function: -// returns TRUE iff class definition `bcd' represents an (in)direct base -// class of class definition `cd'. +// returns TRUE iff class definition 'bcd' represents an (in)direct base +// class of class definition 'cd'. bool ClassDefImpl::isBaseClass(const ClassDef *bcd, bool followInstances,int level) const { @@ -3630,7 +3630,7 @@ static bool isStandardFunc(MemberDef *md) } /*! - * recursively merges the `all members' lists of a class base + * recursively merges the 'all members' lists of a class base * with that of this class. Must only be called for classes without * subclasses! */ @@ -3775,7 +3775,7 @@ void ClassDefImpl::mergeMembers() { if (!isStandardFunc(srcMd)) { - //printf(" insertMember `%s'\n",srcMd->name().data()); + //printf(" insertMember '%s'\n",srcMd->name().data()); internalInsertMember(srcMd,prot,FALSE); } } @@ -3852,7 +3852,7 @@ void ClassDefImpl::mergeMembers() { if (!isStandardFunc(mi->memberDef)) { - //printf(" insertMember `%s'\n",mi->memberDef->name().data()); + //printf(" insertMember '%s'\n",mi->memberDef->name().data()); internalInsertMember(mi->memberDef,prot,FALSE); } } @@ -4113,7 +4113,7 @@ void ClassDefImpl::determineImplUsageRelation() if (md->isVariable()) // for each member variable in this class { QCString type=removeRedundantWhiteSpace(md->typeString()); - //printf("in class %s found var type=`%s' name=`%s'\n", + //printf("in class %s found var type='%s' name='%s'\n", // name().data(),type.data(),md->name().data()); int pos=0; QCString usedClassName; @@ -4121,7 +4121,7 @@ void ClassDefImpl::determineImplUsageRelation() bool found=FALSE; while (extractClassNameFromType(type,pos,usedClassName,templSpec)!=-1 && !found) { - //printf("usedClassName=`%s' templSpec=%s\n",usedClassName.data(),templSpec.data()); + //printf("usedClassName='%s' templSpec=%s\n",usedClassName.data(),templSpec.data()); // check if usedClassName is a template argument of its class ClassDef *cd=md->getClassDef(); if (cd && cd->templateArguments()) @@ -4233,11 +4233,11 @@ void ClassDefImpl::addUsedInterfaceClasses(MemberDef *md,const char *typeStr) { ucd = new UsesClassDef(cd); m_impl->usesIntfClassDict->insert(cd->name(),ucd); - //printf("in class `%s' adding used intf class `%s'\n", + //printf("in class '%s' adding used intf class '%s'\n", // name().data(),cd->name().data()); } ucd->addAccessor(md->name()); - //printf("in class `%s' adding accessor `%s' to class `%s'\n", + //printf("in class '%s' adding accessor '%s' to class '%s'\n", // name().data(),md->name().data(),ucd->classDef->name().data()); } p=i+l; @@ -4476,7 +4476,7 @@ ClassDef *ClassDefImpl::insertTemplateInstance(const QCString &fileName, ClassDef *templateClass=m_impl->templateInstances->find(templSpec); if (templateClass==0) { - Debug::print(Debug::Classes,0," New template instance class `%s'`%s'\n",qPrint(name()),qPrint(templSpec)); + Debug::print(Debug::Classes,0," New template instance class '%s''%s'\n",qPrint(name()),qPrint(templSpec)); QCString tcname = removeRedundantWhiteSpace(localName()+templSpec); templateClass = new ClassDefImpl( fileName,startLine,startColumn,tcname,ClassDef::Class); @@ -4499,7 +4499,7 @@ ClassDef *ClassDefImpl::getVariableInstance(const char *templSpec) const ClassDef *templateClass=m_impl->variableInstances->find(templSpec); if (templateClass==0) { - Debug::print(Debug::Classes,0," New template variable instance class `%s'`%s'\n",qPrint(name()),qPrint(templSpec)); + Debug::print(Debug::Classes,0," New template variable instance class '%s' '%s'\n",qPrint(name()),qPrint(templSpec)); QCString tcname = removeRedundantWhiteSpace(name()+templSpec); templateClass = new ClassDefImpl("",1,1,tcname, ClassDef::Class,0,0,FALSE); diff --git a/src/code.l b/src/code.l index ad39e0e..e9c8689 100644 --- a/src/code.l +++ b/src/code.l @@ -415,7 +415,7 @@ static void pushScope(const char *s) g_classScope += "::"; g_classScope += s; } - //printf("pushScope(%s) result: `%s'\n",s,g_classScope.data()); + //printf("pushScope(%s) result: '%s'\n",s,g_classScope.data()); } /*! remove the top class/namespace name from the scope */ @@ -431,7 +431,7 @@ static void popScope() { //err("Too many end of scopes found!\n"); } - //printf("popScope() result: `%s'\n",g_classScope.data()); + //printf("popScope() result: '%s'\n",g_classScope.data()); } static void setCurrentDoc(const QCString &anchor) @@ -482,7 +482,7 @@ static void setClassScope(const QCString &name) n = n.mid(i+2); } pushScope(n); - //printf("--->New class scope `%s'\n",g_classScope.data()); + //printf("--->New class scope '%s'\n",g_classScope.data()); } /*! start a new line of code, inserting a line number if g_sourceFileDef @@ -513,7 +513,7 @@ static void startCodeLine() g_args.resize(0); g_parmType.resize(0); g_parmName.resize(0); - //printf("Real scope: `%s'\n",g_realScope.data()); + //printf("Real scope: '%s'\n",g_realScope.data()); g_bodyCurlyCount = 0; QCString lineAnchor; lineAnchor.sprintf("l%05d",g_yyLineNr); @@ -567,7 +567,7 @@ static void nextCodeLine() } } -/*! write a code fragment `text' that may span multiple lines, inserting +/*! write a code fragment 'text' that may span multiple lines, inserting * line numbers for each line. */ static void codifyLines(const char *text) @@ -713,7 +713,7 @@ static ClassDef *stripClassName(const char *s,Definition *d=g_currentDefinition) { cd=getResolvedClass(d,g_sourceFileDef,clName); } - //printf("stripClass trying `%s' = %p\n",clName.data(),cd); + //printf("stripClass trying '%s' = %p\n",clName.data(),cd); if (cd) { return cd; @@ -768,7 +768,7 @@ static MemberDef *setCallContextForVar(const QCString &name) DBG_CTX((stderr,"local variable?\n")); if (mcd!=VariableContext::dummyContext) { - DBG_CTX((stderr,"local var `%s' mcd=%s\n",name.data(),mcd->name().data())); + DBG_CTX((stderr,"local var '%s' mcd=%s\n",name.data(),mcd->name().data())); g_theCallContext.setScope(mcd); } } @@ -786,7 +786,7 @@ static MemberDef *setCallContextForVar(const QCString &name) DBG_CTX((stderr,"Found member %s\n",md->name().data())); if (g_scopeStack.top()!=CLASSBLOCK) { - DBG_CTX((stderr,"class member `%s' mcd=%s\n",name.data(),mcd->name().data())); + DBG_CTX((stderr,"class member '%s' mcd=%s\n",name.data(),mcd->name().data())); g_theCallContext.setScope(stripClassName(md->typeString(),md->getOuterScope())); } return md; @@ -797,7 +797,7 @@ static MemberDef *setCallContextForVar(const QCString &name) // look for a global member if ((mn=Doxygen::functionNameSDict->find(name))) { - //printf("global var `%s'\n",name.data()); + //printf("global var '%s'\n",name.data()); if (mn->count()==1) // global defined only once { MemberDef *md=mn->getFirst(); @@ -865,7 +865,7 @@ static bool getLinkInScope(const QCString &c, // scope const FileDef *fd = 0; const NamespaceDef *nd = 0; const GroupDef *gd = 0; - DBG_CTX((stderr,"getLinkInScope: trying `%s'::`%s' varOnly=%d\n",c.data(),m.data(),varOnly)); + DBG_CTX((stderr,"getLinkInScope: trying '%s'::'%s' varOnly=%d\n",c.data(),m.data(),varOnly)); if (getDefs(c,m,"()",md,cd,fd,nd,gd,FALSE,g_sourceFileDef,FALSE,g_forceTagReference) && (!varOnly || md->isVariable())) { @@ -899,7 +899,7 @@ static bool getLinkInScope(const QCString &c, // scope { addDocCrossReference(g_currentMemberDef,const_cast(md)); } - //printf("d->getReference()=`%s' d->getOutputBase()=`%s' name=`%s' member name=`%s'\n",d->getReference().data(),d->getOutputFileBase().data(),d->name().data(),md->name().data()); + //printf("d->getReference()='%s' d->getOutputBase()='%s' name='%s' member name='%s'\n",d->getReference().data(),d->getOutputFileBase().data(),d->name().data(),md->name().data()); writeMultiLineCodeLink(ol,md, text ? text : memberText); addToSearchIndex(text ? text : memberText); @@ -1122,7 +1122,7 @@ static bool generateClassMemberLink(CodeOutputInterface &ol,MemberDef *xmd,const // extract class definition of the return type in order to resolve // a->b()->c() like call chains - //printf("type=`%s' args=`%s' class=%s\n", + //printf("type='%s' args='%s' class=%s\n", // xmd->typeString(),xmd->argsString(), // xmd->getClassDef()->name().data()); @@ -1250,7 +1250,7 @@ static void generateMemberLink(CodeOutputInterface &ol,const QCString &varName, vcd = getResolvedClass(g_currentDefinition,g_sourceFileDef,g_classScope); if (vcd && vcd->isLinkable()) { - //printf("Found class %s for variable `%s'\n",g_classScope.data(),varName.data()); + //printf("Found class %s for variable '%s'\n",g_classScope.data(),varName.data()); MemberName *vmn=Doxygen::memberNameSDict->find(varName); if (vmn==0) { @@ -1261,7 +1261,7 @@ static void generateMemberLink(CodeOutputInterface &ol,const QCString &varName, ClassDef *jcd = getClass(vn.left(vi)); vn=vn.right(vn.length()-vi-2); vmn=Doxygen::memberNameSDict->find(vn); - //printf("Trying name `%s' scope=%s\n",vn.data(),scope.data()); + //printf("Trying name '%s' scope=%s\n",vn.data(),scope.data()); if (vmn) { MemberNameIterator vmni(*vmn); @@ -1284,7 +1284,7 @@ static void generateMemberLink(CodeOutputInterface &ol,const QCString &varName, } if (vmn) { - //printf("There is a variable with name `%s'\n",varName); + //printf("There is a variable with name '%s'\n",varName); MemberNameIterator vmni(*vmn); MemberDef *vmd; for (;(vmd=vmni.current());++vmni) diff --git a/src/commentscan.l b/src/commentscan.l index eb1629e..bf8a37f 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -2972,7 +2972,7 @@ static bool handleToc(const QCString &, const QCStringList &optList) { if (sscanf(opt.right(opt.length() - i - 1).data(),"%d%c",&level,&dum) != 1) { - warn(yyFileName,yyLineNr,"Unknown option:level specified with \\tableofcontents: `%s'", (*it).stripWhiteSpace().data()); + warn(yyFileName,yyLineNr,"Unknown option:level specified with \\tableofcontents: '%s'", (*it).stripWhiteSpace().data()); opt = ""; } else @@ -3002,7 +3002,7 @@ static bool handleToc(const QCString &, const QCStringList &optList) } else { - warn(yyFileName,yyLineNr,"Unknown option specified with \\tableofcontents: `%s'", (*it).stripWhiteSpace().data()); + warn(yyFileName,yyLineNr,"Unknown option specified with \\tableofcontents: '%s'", (*it).stripWhiteSpace().data()); } } } diff --git a/src/configimpl.l b/src/configimpl.l index d114b4a..0c9d8ac 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -174,7 +174,7 @@ void ConfigInt::convertStrToVal() int val = m_valueString.toInt(&ok); if (!ok || valm_maxVal) { - config_warn("argument `%s' for option %s is not a valid number in the range [%d..%d]!\n" + config_warn("argument '%s' for option %s is not a valid number in the range [%d..%d]!\n" "Using the default: %d!\n",m_valueString.data(),m_name.data(),m_minVal,m_maxVal,m_value); } else @@ -199,7 +199,7 @@ void ConfigBool::convertStrToVal() } else { - config_warn("argument `%s' for option %s is not a valid boolean value\n" + config_warn("argument '%s' for option %s is not a valid boolean value\n" "Using the default: %s!\n",m_valueString.data(),m_name.data(),m_value?"YES":"NO"); } } @@ -711,7 +711,7 @@ static void readIncludeFile(const char *incName) ConfigOption *option = config->get(cmd); if (option==0) // oops not known { - config_warn("ignoring unsupported tag `%s' at line %d, file %s\n", + config_warn("ignoring unsupported tag '%s' at line %d, file %s\n", cmd.data(),yyLineNr,yyFileName.data()); BEGIN(SkipInvalid); } @@ -754,12 +754,12 @@ static void readIncludeFile(const char *incName) case ConfigOption::O_Obsolete: if (config_upd) { - config_warn("Tag `%s' at line %d of file `%s' has become obsolete.\n" + config_warn("Tag '%s' at line %d of file '%s' has become obsolete.\n" " This tag has been removed.\n", cmd.data(),yyLineNr,yyFileName.data()); } else { - config_warn("Tag `%s' at line %d of file `%s' has become obsolete.\n" + config_warn("Tag '%s' at line %d of file '%s' has become obsolete.\n" " To avoid this warning please remove this line from your configuration " "file or upgrade it using \"doxygen -u\"\n", cmd.data(),yyLineNr,yyFileName.data()); } @@ -768,12 +768,12 @@ static void readIncludeFile(const char *incName) case ConfigOption::O_Disabled: if (config_upd) { - config_warn("Tag `%s' at line %d of file `%s' belongs to an option that was not enabled at compile time.\n" + config_warn("Tag '%s' at line %d of file '%s' belongs to an option that was not enabled at compile time.\n" " This tag has been removed.\n", cmd.data(),yyLineNr,yyFileName.data()); } else { - config_warn("Tag `%s' at line %d of file `%s' belongs to an option that was not enabled at compile time.\n" + config_warn("Tag '%s' at line %d of file '%s' belongs to an option that was not enabled at compile time.\n" " To avoid this warning please remove this line from your configuration " "file or upgrade it using \"doxygen -u\", or recompile doxygen with this feature enabled.\n", cmd.data(),yyLineNr,yyFileName.data()); } @@ -787,7 +787,7 @@ static void readIncludeFile(const char *incName) ConfigOption *option = config->get(cmd); if (option==0) // oops not known { - config_warn("ignoring unsupported tag `%s' at line %d, file %s\n", + config_warn("ignoring unsupported tag '%s' at line %d, file %s\n", cmd.data(),yyLineNr,yyFileName.data()); BEGIN(SkipInvalid); } @@ -809,18 +809,18 @@ static void readIncludeFile(const char *incName) case ConfigOption::O_String: case ConfigOption::O_Int: case ConfigOption::O_Bool: - config_warn("operator += not supported for `%s'. Ignoring line at line %d, file %s\n", + config_warn("operator += not supported for '%s'. Ignoring line at line %d, file %s\n", yytext,yyLineNr,yyFileName.data()); BEGIN(SkipInvalid); break; case ConfigOption::O_Obsolete: - config_warn("Tag `%s' at line %d of file %s has become obsolete.\n" + config_warn("Tag '%s' at line %d of file %s has become obsolete.\n" "To avoid this warning please update your configuration " "file using \"doxygen -u\"\n", cmd.data(),yyLineNr,yyFileName.data()); BEGIN(SkipInvalid); break; case ConfigOption::O_Disabled: - config_warn("Tag `%s' at line %d of file %s belongs to an option that was not enabled at compile time.\n" + config_warn("Tag '%s' at line %d of file %s belongs to an option that was not enabled at compile time.\n" "To avoid this warning please remove this line from your configuration " "file, upgrade it using \"doxygen -u\", or recompile doxygen with this feature enabled.\n", cmd.data(),yyLineNr,yyFileName.data()); BEGIN(SkipInvalid); @@ -857,13 +857,13 @@ static void readIncludeFile(const char *incName) } } -[a-z_A-Z0-9]+ { config_warn("ignoring unknown tag `%s' at line %d, file %s\n",yytext,yyLineNr,yyFileName.data()); } +[a-z_A-Z0-9]+ { config_warn("ignoring unknown tag '%s' at line %d, file %s\n",yytext,yyLineNr,yyFileName.data()); } \n { yyLineNr++; BEGIN(Start); } \n { yyLineNr++; if (!elemStr.isEmpty()) { - //printf("elemStr1=`%s'\n",elemStr.data()); + //printf("elemStr1='%s'\n",elemStr.data()); l->append(elemStr); } BEGIN(Start); @@ -871,7 +871,7 @@ static void readIncludeFile(const char *incName) [ \t,]+ { if (!elemStr.isEmpty()) { - //printf("elemStr2=`%s'\n",elemStr.data()); + //printf("elemStr2='%s'\n",elemStr.data()); l->append(elemStr); } elemStr.resize(0); @@ -886,7 +886,7 @@ static void readIncludeFile(const char *incName) "\""|"\n" { // we add a bogus space to signal that the string was quoted. This space will be stripped later on. tmpString+=" "; - //printf("Quoted String = `%s'\n",tmpString.data()); + //printf("Quoted String = '%s'\n",tmpString.data()); if (lastState==GetString) { (*s)+=configStringRecode(tmpString,encoding,"UTF-8"); @@ -917,7 +917,7 @@ static void readIncludeFile(const char *incName) else { *b=FALSE; - config_warn("Invalid value `%s' for " + config_warn("Invalid value '%s' for " "boolean tag in line %d, file %s; use YES or NO\n", bs.data(),yyLineNr,yyFileName.data()); } @@ -1003,7 +1003,7 @@ static void substEnvVarsInString(QCString &s) //printf("substEnvVarInString(%s) start\n",s.data()); while ((i=re.match(s,p,&l))!=-1 || (i=re2.match(s,p,&l))!=-1) { - //printf("Found environment var s.mid(%d,%d)=`%s'\n",i+2,l-3,s.mid(i+2,l-3).data()); + //printf("Found environment var s.mid(%d,%d)='%s'\n",i+2,l-3,s.mid(i+2,l-3).data()); QCString env=portable_getenv(s.mid(i+2,l-3)); substEnvVarsInString(env); // recursively expand variables if needed. s = s.left(i)+env+s.right(s.length()-i-l); @@ -1200,7 +1200,7 @@ static QCString configFileToString(const char *name) QFileInfo fi(name); if (!fi.exists() || !fi.isFile()) { - config_err("file `%s' not found\n",name); + config_err("file '%s' not found\n",name); return ""; } f.setName(name); @@ -1221,7 +1221,7 @@ static QCString configFileToString(const char *name) } if (!fileOpened) { - config_err("cannot open file `%s' for reading\n",name); + config_err("cannot open file '%s' for reading\n",name); exit(1); } return ""; @@ -1399,7 +1399,7 @@ void Config::checkAndCorrect() QFileInfo fi(headerFile); if (!fi.exists()) { - err("tag HTML_HEADER: header file `%s' " + err("tag HTML_HEADER: header file '%s' " "does not exist\n",headerFile.data()); exit(1); } @@ -1411,7 +1411,7 @@ void Config::checkAndCorrect() QFileInfo fi(footerFile); if (!fi.exists()) { - err("tag HTML_FOOTER: footer file `%s' " + err("tag HTML_FOOTER: footer file '%s' " "does not exist\n",footerFile.data()); exit(1); } @@ -1426,7 +1426,7 @@ void Config::checkAndCorrect() QFileInfo fi(MathJaxCodefile); if (!fi.exists()) { - err("tag MATHJAX_CODEFILE file `%s' " + err("tag MATHJAX_CODEFILE file '%s' " "does not exist\n",MathJaxCodefile.data()); exit(1); } @@ -1446,7 +1446,7 @@ void Config::checkAndCorrect() QFileInfo fi(latexHeaderFile); if (!fi.exists()) { - err("tag LATEX_HEADER: header file `%s' " + err("tag LATEX_HEADER: header file '%s' " "does not exist\n",latexHeaderFile.data()); exit(1); } @@ -1458,7 +1458,7 @@ void Config::checkAndCorrect() QFileInfo fi(latexFooterFile); if (!fi.exists()) { - err("tag LATEX_FOOTER: footer file `%s' " + err("tag LATEX_FOOTER: footer file '%s' " "does not exist\n",latexFooterFile.data()); exit(1); } @@ -1470,7 +1470,7 @@ void Config::checkAndCorrect() while (s) { QFileInfo fi(s); - if (!fi.exists()) warn_uncond("tag INCLUDE_PATH: include path `%s' " + if (!fi.exists()) warn_uncond("tag INCLUDE_PATH: include path '%s' " "does not exist\n",s); s=includePath.next(); } @@ -1486,7 +1486,7 @@ void Config::checkAndCorrect() alias=alias.stripWhiteSpace(); if (alias.find(re1)!=0 && alias.find(re2)!=0) { - err("Illegal alias format `%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n", + err("Illegal alias format '%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n", alias.data()); } s=aliasList.next(); @@ -1520,7 +1520,7 @@ void Config::checkAndCorrect() } //else if (dotImageFormat!="gif" && dotImageFormat!="png" && dotImageFormat!="jpg") //{ - // err("Invalid value for DOT_IMAGE_FORMAT: `%s'. Using the default.\n",dotImageFormat.data()); + // err("Invalid value for DOT_IMAGE_FORMAT: '%s'. Using the default.\n",dotImageFormat.data()); // dotImageFormat = "png"; //} @@ -1659,7 +1659,7 @@ void Config::checkAndCorrect() QFileInfo fi(s); if (!fi.exists()) { - warn_uncond("tag INPUT: input source `%s' does not exist\n",s); + warn_uncond("tag INPUT: input source '%s' does not exist\n",s); } s=inputSources.next(); } diff --git a/src/constexp.l b/src/constexp.l index bd42104..c9b984a 100644 --- a/src/constexp.l +++ b/src/constexp.l @@ -124,7 +124,7 @@ bool parseconstexp(const char *fileName,int lineNr,const QCString &s) constexpYYrestart( yyin, yyscanner ); printlex(yy_flex_debug, TRUE, __FILE__, fileName); - //printf("Expression: `%s'\n",s.data()); + //printf("Expression: '%s'\n",s.data()); constexpYYparse(yyscanner); diff --git a/src/declinfo.l b/src/declinfo.l index d7f8743..414dd51 100644 --- a/src/declinfo.l +++ b/src/declinfo.l @@ -198,7 +198,7 @@ ID "$"?([a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*)|(@[0-9]+) static void addType(yyscan_t yyscanner) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - //printf("addType() yyextra->type=`%s' yyextra->scope=`%s' yyextra->name=`%s'\n", + //printf("addType() yyextra->type='%s' yyextra->scope='%s' yyextra->name='%s'\n", // yyextra->type.data(),yyextra->scope.data(),yyextra->name.data()); if (yyextra->name.isEmpty() && yyextra->scope.isEmpty()) return; if (!yyextra->type.isEmpty()) yyextra->type+=" "; @@ -211,7 +211,7 @@ static void addType(yyscan_t yyscanner) static void addTypeName(yyscan_t yyscanner) { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; - //printf("addTypeName() yyextra->type=`%s' yyextra->scope=`%s' yyextra->name=`%s'\n", + //printf("addTypeName() yyextra->type='%s' yyextra->scope='%s' yyextra->name='%s'\n", // yyextra->type.data(),yyextra->scope.data(),yyextra->name.data()); if (yyextra->name.isEmpty() || yyextra->name.at(yyextra->name.length()-1)==':') // end of Objective-C keyword => append to yyextra->name not yyextra->type @@ -256,7 +256,7 @@ void parseFuncDecl(const QCString &decl,bool objC,QCString &cl,QCString &t, printlex(yy_flex_debug, TRUE, __FILE__, NULL); yyextra->inputString = decl; - //printf("Input=`%s'\n",yyextra->inputString); + //printf("Input='%s'\n",yyextra->inputString); yyextra->inputPosition = 0; yyextra->classTempListFound = FALSE; yyextra->funcTempListFound = FALSE; @@ -274,7 +274,7 @@ void parseFuncDecl(const QCString &decl,bool objC,QCString &cl,QCString &t, BEGIN( Start ); declinfoYYlex(g_yyscanner); - //printf("yyextra->type=`%s' class=`%s' yyextra->name=`%s' yyextra->args=`%s'\n", + //printf("yyextra->type='%s' class='%s' yyextra->name='%s' yyextra->args='%s'\n", // yyextra->type.data(),yyextra->scope.data(),yyextra->name.data(),yyextra->args.data()); int nb = yyextra->name.findRev('['); @@ -327,7 +327,7 @@ void parseFuncDecl(const QCString &decl,bool objC,QCString &cl,QCString &t, a.prepend(")"); t=t.left(t.length()-1); } - //printf("yyextra->type=`%s' class=`%s' yyextra->name=`%s' yyextra->args=`%s'\n", + //printf("yyextra->type='%s' class='%s' yyextra->name='%s' yyextra->args='%s'\n", // t.data(),cl.data(),n.data(),a.data()); printlex(yy_flex_debug, FALSE, __FILE__, NULL); @@ -351,8 +351,8 @@ void dumpDecl(const char *s) QCString funcTNames; msg("-----------------------------------------\n"); parseFuncDecl(s,yyextra->className,classTNames,yyextra->type,yyextra->name,yyextra->args,funcTNames); - msg("yyextra->type=`%s' class=`%s' classTempl=`%s' yyextra->name=`%s' " - "funcTemplateNames=`%s' yyextra->args=`%s'\n", + msg("yyextra->type='%s' class='%s' classTempl='%s' yyextra->name='%s' " + "funcTemplateNames='%s' yyextra->args='%s'\n", yyextra->type.data(),yyextra->className.data(),classTNames.data(), yyextra->name.data(),funcTNames.data(),yyextra->args.data() ); diff --git a/src/defargs.l b/src/defargs.l index e49ef2e..85878c1 100644 --- a/src/defargs.l +++ b/src/defargs.l @@ -367,7 +367,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" { g_curArgTypeName=removeRedundantWhiteSpace(g_curArgTypeName); g_curArgDefValue=g_curArgDefValue.stripWhiteSpace(); - //printf("curArgType=`%s' curArgDefVal=`%s'\n",g_curArgTypeName.data(),g_curArgDefValue.data()); + //printf("curArgType='%s' curArgDefVal='%s'\n",g_curArgTypeName.data(),g_curArgDefValue.data()); int l=g_curArgTypeName.length(); if (l>0) { @@ -447,7 +447,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" a->defval = g_curArgDefValue.copy(); //printf("a->type=%s a->name=%s a->defval=\"%s\"\n",a->type.data(),a->name.data(),a->defval.data()); a->docs = g_curArgDocs.stripWhiteSpace(); - //printf("Argument `%s' `%s' adding docs=`%s'\n",a->type.data(),a->name.data(),a->docs.data()); + //printf("Argument '%s' '%s' adding docs='%s'\n",a->type.data(),a->name.data(),a->docs.data()); g_argList->append(a); } g_curArgAttrib.resize(0); @@ -479,7 +479,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" g_curArgTypeName+=" []"; g_curArgArray.resize(0); } - //printf("resolveName `%s'->`%s'\n",yytext,name.data()); + //printf("resolveName '%s'->'%s'\n",yytext,name.data()); g_curArgTypeName+=name; } . { diff --git a/src/defgen.cpp b/src/defgen.cpp index 6601f6e..d0553f7 100644 --- a/src/defgen.cpp +++ b/src/defgen.cpp @@ -262,7 +262,7 @@ void generateDEFForMember(MemberDef *md, t << memPrefix << "referenceto = {" << endl; t << refPrefix << "id = '" << rmd->getBodyDef()->getOutputFileBase() - << "_1" // encoded `:' character (see util.cpp:convertNameToFile) + << "_1" // encoded ':' character (see util.cpp:convertNameToFile) << rmd->anchor() << "';" << endl; t << refPrefix << "line = '" @@ -295,7 +295,7 @@ void generateDEFForMember(MemberDef *md, t << memPrefix << "referenceby = {" << endl; t << refPrefix << "id = '" << rmd->getBodyDef()->getOutputFileBase() - << "_1" // encoded `:' character (see util.cpp:convertNameToFile) + << "_1" // encoded ':' character (see util.cpp:convertNameToFile) << rmd->anchor() << "';" << endl; t << refPrefix << "line = '" @@ -576,13 +576,13 @@ void generateDEF() dir.setPath(QDir::currentDirPath()); if (!dir.mkdir(outputDirectory)) { - err("tag OUTPUT_DIRECTORY: Output directory `%s' does not " + err("tag OUTPUT_DIRECTORY: Output directory '%s' does not " "exist and cannot be created\n",outputDirectory.data()); exit(1); } else { - msg("Notice: Output directory `%s' does not exist. " + msg("Notice: Output directory '%s' does not exist. " "I have created it for you.\n", outputDirectory.data()); } dir.cd(outputDirectory); diff --git a/src/definition.cpp b/src/definition.cpp index b9c40f6..3b5fea1 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -231,7 +231,7 @@ static void addToMap(const char *name,Definition *d) if (!vhdlOpt && index!=-1) symbolName=symbolName.mid(index+2); if (!symbolName.isEmpty()) { - //printf("******* adding symbol `%s' (%p)\n",symbolName.data(),d); + //printf("******* adding symbol '%s' (%p)\n",symbolName.data(),d); DefinitionIntf *di=Doxygen::symbolMap->find(symbolName); //printf(" addToMap(%p): looking for symbol %s: %p\n",d,symbolName.data(),di); if (di==0) // new Symbol @@ -275,7 +275,7 @@ static void removeFromMap(Definition *d) QCString symbolName = d->_symbolName(); if (!symbolName.isEmpty()) { - //printf("******* removing symbol `%s' (%p)\n",symbolName.data(),d); + //printf("******* removing symbol '%s' (%p)\n",symbolName.data(),d); DefinitionIntf *di=Doxygen::symbolMap->find(symbolName); if (di) { @@ -438,7 +438,7 @@ void DefinitionImpl::addSectionsToDefinition(QList *anchorList) SectionInfo *si; for (;(si=it.current());++it) { - //printf("Add section `%s' to definition `%s'\n", + //printf("Add section '%s' to definition '%s'\n", // si->label.data(),name().data()); SectionInfo *gsi=Doxygen::sectionDict->find(si->label); //printf("===== label=%s gsi=%p\n",si->label.data(),gsi); @@ -594,7 +594,7 @@ void DefinitionImpl::_setDocumentation(const char *d,const char *docFile,int doc } if (!_docsAlreadyAdded(doc,m_impl->docSignatures)) { - //printf("setting docs for %s: `%s'\n",name().data(),m_doc.data()); + //printf("setting docs for %s: '%s'\n",name().data(),m_doc.data()); if (m_impl->details==0) { m_impl->details = new DocInfo; @@ -913,7 +913,7 @@ bool readCodeFragment(const char *fileName, int pc=0; while ((c=*p++)!='{' && c!=':' && c!=0) { - //printf("parsing char `%c'\n",c); + //printf("parsing char '%c'\n",c); if (c=='\n') { lineNr++,col=0; @@ -1277,7 +1277,7 @@ void DefinitionImpl::writeInlineCode(OutputList &ol,const char *scopeName) const // codeFragment.data(),m_impl->defFileExt.data()); ParserInterface *pIntf = Doxygen::parserManager->getParser(m_impl->defFileExt); pIntf->resetCodeParserState(); - //printf("Read:\n`%s'\n\n",codeFragment.data()); + //printf("Read:\n'%s'\n\n",codeFragment.data()); const MemberDef *thisMd = 0; if (definitionType()==TypeMember) thisMd = dynamic_cast (this); diff --git a/src/diagram.cpp b/src/diagram.cpp index 06480fc..08b49ca 100644 --- a/src/diagram.cpp +++ b/src/diagram.cpp @@ -1165,7 +1165,7 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path, t << " /boxwidth boxwidth str stringwidth pop max def\n"; t << "} def\n"; t << "\n"; - t << "/box % draws a box with text `arg1' at grid pos (arg2,arg3)\n"; + t << "/box % draws a box with text 'arg1' at grid pos (arg2,arg3)\n"; t << "{ gsave\n"; t << " 2 setlinewidth\n"; t << " newpath\n"; @@ -1267,7 +1267,7 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path, t << " stroke\n"; t << "} def\n"; t << "\n"; - t << "/conn % connections the blocks from col `arg1' to `arg2' of row `arg3'\n"; + t << "/conn % connections the blocks from col 'arg1' to 'arg2' of row 'arg3'\n"; t << "{\n"; t << " /ys exch def\n"; t << " /xe exch def\n"; @@ -1337,7 +1337,7 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path, QCString epstopdfArgs(4096); epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"", epsBaseName.data(),epsBaseName.data()); - //printf("Converting eps using `%s'\n",epstopdfArgs.data()); + //printf("Converting eps using '%s'\n",epstopdfArgs.data()); portable_sysTimerStart(); if (portable_system("epstopdf",epstopdfArgs)!=0) { diff --git a/src/docparser.cpp b/src/docparser.cpp index 90ace3f..8860bec 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -419,7 +419,7 @@ static void checkArgumentName(const QCString &name,bool isParam) { QCString aName=name.mid(i,l); if (lang==SrcLangExt_Fortran) aName=aName.lower(); - //printf("aName=`%s'\n",aName.data()); + //printf("aName='%s'\n",aName.data()); ArgumentListIterator ali(*al); const Argument *a; bool found=FALSE; @@ -428,7 +428,7 @@ static void checkArgumentName(const QCString &name,bool isParam) QCString argName = g_memberDef->isDefine() ? a->type : a->name; if (lang==SrcLangExt_Fortran) argName=argName.lower(); argName=argName.stripWhiteSpace(); - //printf("argName=`%s' aName=%s\n",argName.data(),aName.data()); + //printf("argName='%s' aName=%s\n",argName.data(),aName.data()); if (argName.right(3)=="...") argName=argName.left(argName.length()-3); if (aName==argName && isParam) { @@ -696,7 +696,7 @@ static bool findDocsForMemberOrCompound(const char *commandName, const GroupDef *gd=0; const PageDef *pd=0; bool found = getDefs( - g_context.find('.')==-1?g_context.data():"", // `find('.') is a hack to detect files + g_context.find('.')==-1?g_context.data():"", // find('.') is a hack to detect files name, args.isEmpty()?0:args.data(), md,cd,fd,nd,gd,FALSE,0,TRUE); @@ -718,7 +718,7 @@ static bool findDocsForMemberOrCompound(const char *commandName, { fullName.prepend(g_context.left(scopeOffset)+"::"); } - //printf("Trying fullName=`%s'\n",fullName.data()); + //printf("Trying fullName='%s'\n",fullName.data()); // try class, namespace, group, page, file reference cd = Doxygen::classSDict->find(fullName); @@ -1860,7 +1860,7 @@ DocAnchor::DocAnchor(DocNode *parent,const QCString &id,bool newAnchor) } else { - warn_doc_error(g_fileName,doctokenizerYYlineno,"Invalid cite anchor id `%s'",qPrint(id)); + warn_doc_error(g_fileName,doctokenizerYYlineno,"Invalid cite anchor id '%s'",qPrint(id)); m_anchor = "invalid"; m_file = "invalid"; } @@ -1885,7 +1885,7 @@ DocAnchor::DocAnchor(DocNode *parent,const QCString &id,bool newAnchor) } else { - warn_doc_error(g_fileName,doctokenizerYYlineno,"Invalid anchor id `%s'",qPrint(id)); + warn_doc_error(g_fileName,doctokenizerYYlineno,"Invalid anchor id '%s'",qPrint(id)); m_anchor = "invalid"; m_file = "invalid"; } @@ -2530,7 +2530,7 @@ DocRef::DocRef(DocNode *parent,const QCString &target,const QCString &context) : } } m_text = target; - warn_doc_error(g_fileName,doctokenizerYYlineno,"unable to resolve reference to `%s' for \\ref command", + warn_doc_error(g_fileName,doctokenizerYYlineno,"unable to resolve reference to '%s' for \\ref command", qPrint(target)); } @@ -2628,7 +2628,7 @@ DocCite::DocCite(DocNode *parent,const QCString &target,const QCString &) //cont } else if (cite==0) { - warn_doc_error(g_fileName,doctokenizerYYlineno,"unable to resolve reference to `%s' for \\cite command", + warn_doc_error(g_fileName,doctokenizerYYlineno,"unable to resolve reference to '%s' for \\cite command", qPrint(target)); } else @@ -2671,7 +2671,7 @@ DocLink::DocLink(DocNode *parent,const QCString &target) } // bogus link target - warn_doc_error(g_fileName,doctokenizerYYlineno,"unable to resolve link to `%s' for \\link command", + warn_doc_error(g_fileName,doctokenizerYYlineno,"unable to resolve link to '%s' for \\link command", qPrint(target)); } @@ -3274,7 +3274,7 @@ DocHtmlCaption::DocHtmlCaption(DocNode *parent,const HtmlAttribList &attribs) } else { - warn_doc_error(g_fileName,doctokenizerYYlineno,"Invalid caption id `%s'",qPrint(opt->value)); + warn_doc_error(g_fileName,doctokenizerYYlineno,"Invalid caption id '%s'",qPrint(opt->value)); } } else // copy attribute @@ -5399,7 +5399,7 @@ int DocPara::handleCommand(const QCString &cmdName, const int tok) { case CMD_UNKNOWN: m_children.append(new DocWord(this,TK_COMMAND_CHAR(tok) + cmdName)); - warn_doc_error(g_fileName,doctokenizerYYlineno,"Found unknown command `\\%s'",qPrint(cmdName)); + warn_doc_error(g_fileName,doctokenizerYYlineno,"Found unknown command '\\%s'",qPrint(cmdName)); break; case CMD_EMPHASIS: m_children.append(new DocStyleChange(this,g_nodeStack.count(),DocStyleChange::Italic,TRUE)); @@ -7040,7 +7040,7 @@ void DocText::parse() m_children.append(new DocSymbol(this,DocSymbol::Sym_Equal)); break; default: - warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected command `%s' found", + warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected command '%s' found", qPrint(g_token->name)); break; } @@ -7125,7 +7125,7 @@ void DocRoot::parse() } else { - warn_doc_error(g_fileName,doctokenizerYYlineno,"Invalid section id `%s'; ignoring section",qPrint(g_token->sectionId)); + warn_doc_error(g_fileName,doctokenizerYYlineno,"Invalid section id '%s'; ignoring section",qPrint(g_token->sectionId)); retval = 0; } } diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 5346c0a..52370ac 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -157,7 +157,7 @@ static int computeIndent(const char *str,int length) static void processSection() { - //printf("%s: found section/anchor with name `%s'\n",g_fileName.data(),g_secLabel.data()); + //printf("%s: found section/anchor with name '%s'\n",g_fileName.data(),g_secLabel.data()); QCString file; if (g_memberGroup) { @@ -1343,7 +1343,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} BEGIN(St_Sections); } . { - warn(g_fileName,yylineno,"Unexpected character `%s' while looking for section label or title",yytext); + warn(g_fileName,yylineno,"Unexpected character '%s' while looking for section label or title",yytext); } [^\n]+ | @@ -1358,12 +1358,12 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} warn(g_fileName,yylineno,"Unexpected new line character"); } <*>[\\@<>&$#%~"=] { /* unescaped special character */ - //warn(g_fileName,yylineno,"Unexpected character `%s', assuming command \\%s was meant.",yytext,yytext); + //warn(g_fileName,yylineno,"Unexpected character '%s', assuming command \\%s was meant.",yytext,yytext); g_token->name = yytext; return TK_COMMAND_SEL(); } <*>. { - warn(g_fileName,yylineno,"Unexpected character `%s'",yytext); + warn(g_fileName,yylineno,"Unexpected character '%s'",yytext); } %% @@ -1375,7 +1375,7 @@ void doctokenizerYYFindSections(const char *input,Definition *d, if (input==0) return; printlex(yy_flex_debug, TRUE, __FILE__, fileName); g_inputString = input; - //printf("parsing --->`%s'<---\n",input); + //printf("parsing --->'%s'<---\n",input); g_inputPos = 0; g_definition = d; g_memberGroup = mg; diff --git a/src/dot.cpp b/src/dot.cpp index 5aca277..9201624 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -694,7 +694,7 @@ static void checkDotResult(const char *imgExt, const char *imgName) { if (!(data[1]=='P' && data[2]=='N' && data[3]=='G')) { - err("Image `%s' produced by dot is not a valid PNG!\n" + err("Image '%s' produced by dot is not a valid PNG!\n" "You should either select a different format " "(DOT_IMAGE_FORMAT in the config file) or install a more " "recent version of graphviz (1.7+)\n",imgName @@ -703,13 +703,13 @@ static void checkDotResult(const char *imgExt, const char *imgName) } else { - err("Could not read image `%s' generated by dot!\n",imgName); + err("Could not read image '%s' generated by dot!\n",imgName); } fclose(f); } else { - err("Could not open image `%s' generated by dot!\n",imgName); + err("Could not open image '%s' generated by dot!\n",imgName); } } } @@ -2311,7 +2311,7 @@ void DotNode::renumberNodes(int &number) const DotNode *DotNode::findDocNode() const { if (!m_url.isEmpty()) return this; - //printf("findDocNode(): `%s'\n",m_label.data()); + //printf("findDocNode(): '%s'\n",m_label.data()); if (m_parents) { QListIterator dnli(*m_parents); @@ -2473,7 +2473,7 @@ void DotGfxHierarchyTable::writeGraph(FTextStream &out, void DotGfxHierarchyTable::addHierarchy(DotNode *n,const ClassDef *cd,bool hideSuper) { - //printf("addHierarchy `%s' baseClasses=%d\n",cd->name().data(),cd->baseClasses()->count()); + //printf("addHierarchy '%s' baseClasses=%d\n",cd->name().data(),cd->baseClasses()->count()); if (cd->subClasses()) { BaseClassListIterator bcli(*cd->subClasses()); @@ -2481,11 +2481,11 @@ void DotGfxHierarchyTable::addHierarchy(DotNode *n,const ClassDef *cd,bool hideS for ( ; (bcd=bcli.current()) ; ++bcli ) { ClassDef *bClass=bcd->classDef; - //printf(" Trying sub class=`%s' usedNodes=%d\n",bClass->name().data(),m_usedNodes->count()); + //printf(" Trying sub class='%s' usedNodes=%d\n",bClass->name().data(),m_usedNodes->count()); if (bClass->isVisibleInHierarchy() && hasVisibleRoot(bClass->baseClasses())) { DotNode *bn; - //printf(" Node `%s' Found visible class=`%s'\n",n->m_label.data(), + //printf(" Node '%s' Found visible class='%s'\n",n->m_label.data(), // bClass->name().data()); if ((bn=m_usedNodes->find(bClass->name()))) // node already present { @@ -2695,7 +2695,7 @@ void DotClassGraph::addClass(const ClassDef *cd,DotNode *n,int prot, { className=cd->displayName(); } - //printf("DotClassGraph::addClass(class=`%s',parent=%s,prot=%d,label=%s,dist=%d,usedName=%s,templSpec=%s,base=%d)\n", + //printf("DotClassGraph::addClass(class='%s',parent=%s,prot=%d,label=%s,dist=%d,usedName=%s,templSpec=%s,base=%d)\n", // className.data(),n->m_label.data(),prot,label,distance,usedName,templSpec,base); DotNode *bn = m_usedNodes->find(className); if (bn) // class already inserted @@ -2746,7 +2746,7 @@ void DotClassGraph::addClass(const ClassDef *cd,DotNode *n,int prot, } bn->setDistance(distance); m_usedNodes->insert(className,bn); - //printf(" add new child node `%s' to %s hidden=%d url=%s\n", + //printf(" add new child node '%s' to %s hidden=%d url=%s\n", // className.data(),n->m_label.data(),cd->isHidden(),tmp_url.data()); buildGraph(cd,bn,base,distance+1); @@ -2901,7 +2901,7 @@ void DotClassGraph::buildGraph(const ClassDef *cd,DotNode *n,bool base,int dista BaseClassDef *bcd; for ( ; (bcd=bcli.current()) ; ++bcli ) { - //printf("-------- inheritance relation %s->%s templ=`%s'\n", + //printf("-------- inheritance relation %s->%s templ='%s'\n", // cd->name().data(),bcd->classDef->name().data(),bcd->templSpecifiers.data()); addClass(bcd->classDef,n,bcd->prot,0,bcd->usedName, bcd->templSpecifiers,base,distance); @@ -3022,7 +3022,7 @@ void DotClassGraph::buildGraph(const ClassDef *cd,DotNode *n,bool base,int dista DotClassGraph::DotClassGraph(const ClassDef *cd,DotNode::GraphType t) { - //printf("--------------- DotClassGraph::DotClassGraph `%s'\n",cd->displayName().data()); + //printf("--------------- DotClassGraph::DotClassGraph '%s'\n",cd->displayName().data()); m_graphType = t; QCString tmp_url=""; if (cd->isLinkable() && !cd->isHidden()) @@ -3390,7 +3390,7 @@ void DotInclDepGraph::buildGraph(DotNode *n,const FileDef *fd,int distance) { const FileDef *bfd = ii->fileDef; QCString in = ii->includeName; - //printf(">>>> in=`%s' bfd=%p\n",ii->includeName.data(),bfd); + //printf(">>>> in='%s' bfd=%p\n",ii->includeName.data(),bfd); bool doc=TRUE,src=FALSE; if (bfd) { diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 30c2001..964d9e1 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -804,7 +804,7 @@ static void buildFileList(Entry *root) { const char *fn = root->fileName.data(); QCString text(4096); - text.sprintf("the name `%s' supplied as " + text.sprintf("the name '%s' supplied as " "the argument in the \\file statement ", qPrint(root->name)); if (ambig) // name is ambiguous @@ -857,7 +857,7 @@ static void addIncludeFile(ClassDef *cd,FileDef *ifd,Entry *root) ) { // explicit request QCString text; - text.sprintf("the name `%s' supplied as " + text.sprintf("the name '%s' supplied as " "the argument of the \\class, \\struct, \\union, or \\include command ", qPrint(includeFile) ); @@ -1287,7 +1287,7 @@ static void addClassToContext(Entry *root) QCString namespaceName; extractNamespaceName(fullName,className,namespaceName); - //printf("New class: fullname %s namespace `%s' name=`%s' brief=`%s' docs=`%s'\n", + //printf("New class: fullname %s namespace '%s' name='%s' brief='%s' docs='%s'\n", // fullName.data(),namespaceName.data(),className.data(),root->brief.data(),root->doc.data()); QCString tagName; @@ -1320,7 +1320,7 @@ static void addClassToContext(Entry *root) } cd=createClassDef(tagInfo?tagName:root->fileName,root->startLine,root->startColumn, fullName,sec,tagName,refFileName,TRUE,root->spec&Entry::Enum); - Debug::print(Debug::Classes,0," New class `%s' (sec=0x%08x)! #tArgLists=%d tagInfo=%p\n", + Debug::print(Debug::Classes,0," New class '%s' (sec=0x%08x)! #tArgLists=%d tagInfo=%p\n", qPrint(fullName),sec,root->tArgLists ? (int)root->tArgLists->count() : -1, tagInfo); cd->setDocumentation(root->doc,root->docFile,root->docLine); // copy docs to definition cd->setBriefDescription(root->brief,root->briefFile,root->briefLine); @@ -1368,7 +1368,7 @@ static void addClassToContext(Entry *root) } if (fd && (root->section & Entry::COMPOUND_MASK)) { - //printf(">> Inserting class `%s' in file `%s' (root->fileName=`%s')\n", + //printf(">> Inserting class '%s' in file '%s' (root->fileName='%s')\n", // cd->name().data(), // fd->name().data(), // root->fileName.data() @@ -1862,7 +1862,7 @@ static const NamespaceDef *findUsedNamespace(const NamespaceSDict *unl, { QCString uScope=und->name()+"::"; usingNd = getResolvedNamespace(uScope+name); - //printf("Also trying with scope=`%s' usingNd=%p\n",(uScope+name).data(),usingNd); + //printf("Also trying with scope='%s' usingNd=%p\n",(uScope+name).data(),usingNd); } } return usingNd; @@ -1899,7 +1899,7 @@ static void findUsingDirectives(Entry *root) } } - // find the scope in which the `using' namespace is defined by prepending + // find the scope in which the 'using' namespace is defined by prepending // the possible scopes in which the using statement was found, starting // with the most inner scope and going to the most outer scope (i.e. // file scope). @@ -1909,7 +1909,7 @@ static void findUsingDirectives(Entry *root) QCString scope=scopeOffset>0 ? nsName.left(scopeOffset)+"::" : QCString(); usingNd = getResolvedNamespace(scope+name); - //printf("Trying with scope=`%s' usingNd=%p\n",(scope+name).data(),usingNd); + //printf("Trying with scope='%s' usingNd=%p\n",(scope+name).data(),usingNd); if (scopeOffset==0) { scopeOffset=-1; @@ -2058,7 +2058,7 @@ static void findUsingDeclarations(Entry *root) } // Assume the using statement was used to import a class. - // Find the scope in which the `using' namespace is defined by prepending + // Find the scope in which the 'using' namespace is defined by prepending // the possible scopes in which the using statement was found, starting // with the most inner scope and going to the most outer scope (i.e. // file scope). @@ -2079,7 +2079,7 @@ static void findUsingDeclarations(Entry *root) //printf("%s -> %p\n",root->name.data(),usingCd); if (usingCd==0) // definition not in the input => add an artificial class { - Debug::print(Debug::Classes,0," New using class `%s' (sec=0x%08x)! #tArgLists=%d\n", + Debug::print(Debug::Classes,0," New using class '%s' (sec=0x%08x)! #tArgLists=%d\n", qPrint(name),root->section,root->tArgLists ? (int)root->tArgLists->count() : -1); usingCd = createClassDef( "",1,1, @@ -2266,7 +2266,7 @@ static MemberDef *addVariableToClass( } Debug::print(Debug::Variables,0, " class variable:\n" - " `%s' `%s'::`%s' `%s' prot=`%d ann=%d init=`%s'\n", + " '%s' '%s'::'%s' '%s' prot=%d ann=%d init='%s'\n", qPrint(root->type), qPrint(qualScope), qPrint(name), @@ -2434,7 +2434,7 @@ static MemberDef *addVariableToFile( { Debug::print(Debug::Variables,0, " global variable:\n" - " file='%s' type=`%s' scope=`%s' name=`%s' args=`%s' prot=`%d mtype=%d lang=%d\n", + " file='%s' type='%s' scope='%s' name='%s' args='%s' prot=`%d mtype=%d lang=%d\n", qPrint(root->fileName), qPrint(root->type), qPrint(scope), @@ -2835,7 +2835,7 @@ static void addVariable(Entry *root,int isFuncPtr=-1) Debug::print(Debug::Variables,0, "VARIABLE_SEC: \n" - " type=`%s' name=`%s' args=`%s' bodyLine=`%d' mGrpId=%d relates=%s\n", + " type='%s' name='%s' args='%s' bodyLine=%d mGrpId=%d relates='%s'\n", qPrint(root->type), qPrint(root->name), qPrint(root->args), @@ -2861,7 +2861,7 @@ static void addVariable(Entry *root,int isFuncPtr=-1) root->name=root->args.mid(i,l); root->args=root->args.mid(i+l,root->args.find(')',i+l)-i-l); } - //printf("new: type=`%s' name=`%s' args=`%s'\n", + //printf("new: type='%s' name='%s' args='%s'\n", // root->type.data(),root->name.data(),root->args.data()); } else @@ -3016,7 +3016,7 @@ static void addVariable(Entry *root,int isFuncPtr=-1) } } - //printf("name=`%s' scope=%s scope.right=%s\n", + //printf("name='%s' scope=%s scope.right=%s\n", // name.data(),scope.data(), // scope.right(scope.length()-si).data()); addVariableToClass(root, // entry @@ -3199,8 +3199,8 @@ static void addInterfaceOrServiceToServiceOrSingleton( Debug::print(Debug::Functions,0, " Interface Member:\n" - " `%s' `%s' proto=%d\n" - " def=`%s'\n", + " '%s' '%s' proto=%d\n" + " def='%s'\n", qPrint(root->type), qPrint(rname), root->proto, @@ -3242,7 +3242,7 @@ static void buildInterfaceAndServiceList(Entry *root) { Debug::print(Debug::Functions,0, "EXPORTED_INTERFACE_SEC:\n" - " `%s' `%s'::`%s' `%s' relates=`%s' relatesType=`%d' file=`%s' line=`%d' bodyLine=`%d' #tArgLists=%d mGrpId=%d spec=%lld proto=%d docFile=%s\n", + " '%s' '%s'::'%s' '%s' relates='%s' relatesType='%d' file='%s' line='%d' bodyLine='%d' #tArgLists=%d mGrpId=%d spec=%lld proto=%d docFile=%s\n", qPrint(root->type), qPrint(root->parent()->name), qPrint(root->name), @@ -3345,7 +3345,7 @@ static void addMethodToClass(Entry *root,ClassDef *cd, fileName = root->tagInfo->tagName; } - //printf("root->name=`%s; root->args=`%s' root->argList=`%s'\n", + //printf("root->name='%s; root->args='%s' root->argList='%s'\n", // root->name.data(),root->args.data(),argListToString(root->argList).data() // ); @@ -3446,8 +3446,8 @@ static void addMethodToClass(Entry *root,ClassDef *cd, Debug::print(Debug::Functions,0, " Func Member:\n" - " `%s' `%s'::`%s' `%s' proto=%d\n" - " def=`%s'\n", + " '%s' '%s'::'%s' '%s' proto=%d\n" + " def='%s'\n", qPrint(root->type), qPrint(qualScope), qPrint(rname), @@ -3487,7 +3487,7 @@ static void buildFunctionList(Entry *root) { Debug::print(Debug::Functions,0, "FUNCTION_SEC:\n" - " `%s' `%s'::`%s' `%s' relates=`%s' relatesType=`%d' file=`%s' line=`%d' bodyLine=`%d' #tArgLists=%d mGrpId=%d spec=%lld proto=%d docFile=%s\n", + " '%s' '%s'::'%s' '%s' relates='%s' relatesType='%d' file='%s' line='%d' bodyLine='%d' #tArgLists=%d mGrpId=%d spec=%lld proto=%d docFile=%s\n", qPrint(root->type), qPrint(root->parent()->name), qPrint(root->name), @@ -3747,7 +3747,7 @@ static void buildFunctionList(Entry *root) if (!found) /* global function is unique with respect to the file */ { Debug::print(Debug::Functions,0," --> new function %s found!\n",qPrint(rname)); - //printf("New function type=`%s' name=`%s' args=`%s' bodyLine=%d\n", + //printf("New function type='%s' name='%s' args='%s' bodyLine=%d\n", // root->type.data(),rname.data(),root->args.data(),root->bodyLine); // new global function @@ -3825,8 +3825,8 @@ static void buildFunctionList(Entry *root) } Debug::print(Debug::Functions,0, " Global Function:\n" - " `%s' `%s'::`%s' `%s' proto=%d\n" - " def=`%s'\n", + " '%s' '%s'::'%s' '%s' proto=%d\n" + " def='%s'\n", qPrint(root->type), qPrint(root->parent()->name), qPrint(rname), @@ -3892,7 +3892,7 @@ static void buildFunctionList(Entry *root) } } - //printf("unrelated function %d `%s' `%s' `%s'\n", + //printf("unrelated function %d '%s' '%s' '%s'\n", // root->parent->section,root->type.data(),rname.data(),root->args.data()); } else @@ -3919,7 +3919,7 @@ static void findFriends() MemberName *fn; for (;(fn=fnli.current());++fnli) // for each global function name { - //printf("Function name=`%s'\n",fn->memberName()); + //printf("Function name='%s'\n",fn->memberName()); MemberName *mn; if ((mn=Doxygen::memberNameSDict->find(fn->memberName()))) { // there are members with the same name @@ -4146,7 +4146,7 @@ static void transferRelatedFunctionDocumentation() /* find a matching function declaration and definition for this function */ for (mni.toFirst();(md=mni.current());++mni) // for each global function { - //printf(" Function `%s'\n",md->name().data()); + //printf(" Function '%s'\n",md->name().data()); MemberName *rmn; if ((rmn=Doxygen::memberNameSDict->find(md->name()))) // check if there is a member with the same name { @@ -4155,7 +4155,7 @@ static void transferRelatedFunctionDocumentation() MemberNameIterator rmni(*rmn); for (rmni.toFirst();(rmd=rmni.current());++rmni) // for each member with the same name { - //printf(" Member found: related=`%d'\n",rmd->isRelated()); + //printf(" Member found: related='%d'\n",rmd->isRelated()); if ((rmd->isRelated() || rmd->isForeign()) && // related function !md->isAlias() && !rmd->isAlias() && matchArguments2( md->getOuterScope(), md->getFileDef(), md->argumentList(), @@ -4164,7 +4164,7 @@ static void transferRelatedFunctionDocumentation() ) ) { - //printf(" Found related member `%s'\n",md->name().data()); + //printf(" Found related member '%s'\n",md->name().data()); if (rmd->relatedAlso()) md->setRelatedAlso(rmd->relatedAlso()); else if (rmd->isForeign()) @@ -4344,7 +4344,7 @@ static void findUsedClassesForClass(Entry *root, if (arg->name==usedName) // type is a template argument { found=TRUE; - Debug::print(Debug::Classes,0," New used class `%s'\n", qPrint(usedName)); + Debug::print(Debug::Classes,0," New used class '%s'\n", qPrint(usedName)); ClassDef *usedCd = Doxygen::hiddenClasses->find(usedName); if (usedCd==0) @@ -4361,7 +4361,7 @@ static void findUsedClassesForClass(Entry *root, Doxygen::hiddenClasses->append(usedName,usedCd); } if (isArtificial) usedCd->setArtificial(TRUE); - Debug::print(Debug::Classes,0," Adding used class `%s' (1)\n", qPrint(usedCd->name())); + Debug::print(Debug::Classes,0," Adding used class '%s' (1)\n", qPrint(usedCd->name())); instanceCd->addUsedClass(usedCd,md->name(),md->protection()); usedCd->addUsedByClass(instanceCd,md->name(),md->protection()); } @@ -4377,7 +4377,7 @@ static void findUsedClassesForClass(Entry *root, if (usedCd) { found=TRUE; - Debug::print(Debug::Classes,0," Adding used class `%s' (2)\n", qPrint(usedCd->name())); + Debug::print(Debug::Classes,0," Adding used class '%s' (2)\n", qPrint(usedCd->name())); instanceCd->addUsedClass(usedCd,md->name(),md->protection()); // class exists usedCd->addUsedByClass(instanceCd,md->name(),md->protection()); } @@ -4397,7 +4397,7 @@ static void findUsedClassesForClass(Entry *root, { type+=md->argsString(); } - Debug::print(Debug::Classes,0," New undocumented used class `%s'\n", qPrint(type)); + Debug::print(Debug::Classes,0," New undocumented used class '%s'\n", qPrint(type)); usedCd = createClassDef( masterCd->getDefFileName(),masterCd->getDefLine(), masterCd->getDefColumn(), @@ -4409,7 +4409,7 @@ static void findUsedClassesForClass(Entry *root, if (usedCd) { if (isArtificial) usedCd->setArtificial(TRUE); - Debug::print(Debug::Classes,0," Adding used class `%s' (3)\n", qPrint(usedCd->name())); + Debug::print(Debug::Classes,0," Adding used class '%s' (3)\n", qPrint(usedCd->name())); instanceCd->addUsedClass(usedCd,md->name(),md->protection()); usedCd->addUsedByClass(instanceCd,md->name(),md->protection()); } @@ -4673,7 +4673,7 @@ static bool findClassRelation( QCString biName=bi->name; bool explicitGlobalScope=FALSE; - //printf("findClassRelation: biName=`%s'\n",biName.data()); + //printf("findClassRelation: biName='%s'\n",biName.data()); if (biName.left(2)=="::") // explicit global scope { biName=biName.right(biName.length()-2); @@ -4689,7 +4689,7 @@ static bool findClassRelation( int scopeOffset=explicitGlobalScope ? 0 : scopeName.length(); do // try all parent scope prefixes, starting with the largest scope { - //printf("scopePrefix=`%s' biName=`%s'\n", + //printf("scopePrefix='%s' biName='%s'\n", // scopeName.left(scopeOffset).data(),biName.data()); QCString baseClassName=biName; @@ -4713,7 +4713,7 @@ static bool findClassRelation( ); //printf("baseClassName=%s baseClass=%p cd=%p explicitGlobalScope=%d\n", // baseClassName.data(),baseClass,cd,explicitGlobalScope); - //printf(" scope=`%s' baseClassName=`%s' baseClass=%s templSpec=%s\n", + //printf(" scope='%s' baseClassName='%s' baseClass=%s templSpec=%s\n", // cd ? cd->name().data():"", // baseClassName.data(), // baseClass?baseClass->name().data():"", @@ -4844,7 +4844,7 @@ static bool findClassRelation( //printf("3. found=%d\n",found); if (found) { - Debug::print(Debug::Classes,0," Documented base class `%s' templSpec=%s\n",qPrint(biName),qPrint(templSpec)); + Debug::print(Debug::Classes,0," Documented base class '%s' templSpec=%s\n",qPrint(biName),qPrint(templSpec)); // add base class to this class // if templSpec is not empty then we should "instantiate" @@ -4899,7 +4899,7 @@ static bool findClassRelation( else if (mode==Undocumented && (scopeOffset==0 || isATemplateArgument)) { Debug::print(Debug::Classes,0, - " New undocumented base class `%s' baseClassName=%s templSpec=%s isArtificial=%d\n", + " New undocumented base class '%s' baseClassName=%s templSpec=%s isArtificial=%d\n", qPrint(biName),qPrint(baseClassName),qPrint(templSpec),isArtificial ); baseClass=0; @@ -4959,7 +4959,7 @@ static bool findClassRelation( } else { - Debug::print(Debug::Classes,0," Base class `%s' not found\n",qPrint(biName)); + Debug::print(Debug::Classes,0," Base class '%s' not found\n",qPrint(biName)); } } else @@ -4984,7 +4984,7 @@ static bool findClassRelation( { scopeOffset=0; } - //printf("new scopeOffset=`%d'",scopeOffset); + //printf("new scopeOffset='%d'",scopeOffset); } while (scopeOffset>=0); if (parentNode==0) @@ -5329,8 +5329,8 @@ static void generateXRefPages() } //---------------------------------------------------------------------- -// Copy the documentation in entry `root' to member definition `md' and -// set the function declaration of the member to `funcDecl'. If the boolean +// Copy the documentation in entry 'root' to member definition 'md' and +// set the function declaration of the member to 'funcDecl'. If the boolean // over_load is set the standard overload text is added. static void addMemberDocs(Entry *root, @@ -5340,7 +5340,7 @@ static void addMemberDocs(Entry *root, NamespaceSDict * ) { - //printf("addMemberDocs: `%s'::`%s' `%s' funcDecl=`%s' mSpec=%d\n", + //printf("addMemberDocs: '%s'::'%s' '%s' funcDecl='%s' mSpec=%d\n", // root->parent->name.data(),md->name().data(),md->argsString(),funcDecl,root->spec); QCString fDecl=funcDecl; // strip extern specifier @@ -5485,9 +5485,9 @@ static ClassDef *findClassDefinition(FileDef *fd,NamespaceDef *nd, //---------------------------------------------------------------------- -// Adds the documentation contained in `root' to a global function -// with name `name' and argument list `args' (for overloading) and -// function declaration `decl' to the corresponding member definition. +// Adds the documentation contained in 'root' to a global function +// with name 'name' and argument list 'args' (for overloading) and +// function declaration 'decl' to the corresponding member definition. static bool findGlobalMember(Entry *root, const QCString &namespaceName, @@ -5542,10 +5542,10 @@ static bool findGlobalMember(Entry *root, if ((namespaceName.isEmpty() && nd==0) || // not in a namespace (nd && nd->name()==namespaceName) || // or in the same namespace - viaUsingDirective // member in `using' namespace + viaUsingDirective // member in 'using' namespace ) { - Debug::print(Debug::FindMembers,0,"4. Try to add member `%s' to scope `%s'\n", + Debug::print(Debug::FindMembers,0,"4. Try to add member '%s' to scope '%s'\n", qPrint(md->name()),qPrint(namespaceName)); NamespaceDef *rnd = 0; @@ -5641,7 +5641,7 @@ static bool findGlobalMember(Entry *root, ) { warn(root->fileName,root->startLine, - "documented symbol `%s' was not declared or defined.",decl + "documented symbol '%s' was not declared or defined.",decl ); } } @@ -5822,7 +5822,7 @@ static void findMember(Entry *root, ) { Debug::print(Debug::FindMembers,0, - "findMember(root=%p,funcDecl=`%s',related=`%s',overload=%d," + "findMember(root=%p,funcDecl='%s',related='%s',overload=%d," "isFunc=%d mGrpId=%d tArgList=%p (#=%d) " "spec=%lld lang=%x\n", root,qPrint(funcDecl),qPrint(root->relates),overloaded,isFunc,root->mGrpId, @@ -5891,7 +5891,7 @@ static void findMember(Entry *root, " ::","::" ).stripWhiteSpace(); - //printf("funcDecl=`%s'\n",funcDecl.data()); + //printf("funcDecl='%s'\n",funcDecl.data()); if (isFriend && funcDecl.left(6)=="class ") { //printf("friend class\n"); @@ -5910,14 +5910,14 @@ static void findMember(Entry *root, funcArgs,funcTempList,exceptions ); } - //printf("scopeName=`%s' funcType=`%s' funcName=`%s' funcArgs=`%s'\n", + //printf("scopeName='%s' funcType='%s' funcName='%s' funcArgs='%s'\n", // scopeName.data(),funcType.data(),funcName.data(),funcArgs.data()); // the class name can also be a namespace name, we decide this later. // if a related class name is specified and the class name could // not be derived from the function declaration, then use the // related field. - //printf("scopeName=`%s' className=`%s' namespaceName=`%s'\n", + //printf("scopeName='%s' className='%s' namespaceName='%s'\n", // scopeName.data(),className.data(),namespaceName.data()); if (!root->relates.isEmpty()) { // related member, prefix user specified scope @@ -5993,13 +5993,13 @@ static void findMember(Entry *root, // split scope into a namespace and a class part extractNamespaceName(scopeName,className,namespaceName,TRUE); - //printf("scopeName=`%s' className=`%s' namespaceName=`%s'\n", + //printf("scopeName='%s' className='%s' namespaceName='%s'\n", // scopeName.data(),className.data(),namespaceName.data()); //namespaceName=removeAnonymousScopes(namespaceName); if (namespaceName.find('@')!=-1) return; // skip stuff in anonymous namespace... - //printf("namespaceName=`%s' className=`%s'\n",namespaceName.data(),className.data()); + //printf("namespaceName='%s' className='%s'\n",namespaceName.data(),className.data()); // merge class and namespace scopes again scopeName.resize(0); if (!namespaceName.isEmpty()) @@ -6022,7 +6022,7 @@ static void findMember(Entry *root, { scopeName=className; } - //printf("new scope=`%s'\n",scopeName.data()); + //printf("new scope='%s'\n",scopeName.data()); QCString tempScopeName=scopeName; ClassDef *cd=getClass(scopeName); @@ -6041,7 +6041,7 @@ static void findMember(Entry *root, //printf("scopeName=%s cd=%p root->tArgLists=%p result=%s\n", // scopeName.data(),cd,root->tArgLists,tempScopeName.data()); - //printf("scopeName=`%s' className=`%s'\n",scopeName.data(),className.data()); + //printf("scopeName='%s' className='%s'\n",scopeName.data(),className.data()); // rebuild the function declaration (needed to get the scope right). if (!scopeName.isEmpty() && !isRelated && !isFriend && !Config_getBool(HIDE_SCOPE_NAMES)) { @@ -6062,7 +6062,7 @@ static void findMember(Entry *root, { funcDecl=tempScopeName+"::"+funcName+funcTempList; } - else // variable => add `argument' list + else // variable => add 'argument' list { funcDecl=tempScopeName+"::"+funcName+funcArgs; } @@ -6076,7 +6076,7 @@ static void findMember(Entry *root, { funcDecl=funcType+" "+funcName+funcTempList; } - else // variable => add `argument' list + else // variable => add 'argument' list { funcDecl=funcType+" "+funcName+funcArgs; } @@ -6099,16 +6099,16 @@ static void findMember(Entry *root, Debug::print(Debug::FindMembers,0, "findMember() Parse results:\n" - " namespaceName=`%s'\n" + " namespaceName='%s'\n" " className=`%s`\n" - " funcType=`%s'\n" - " funcSpec=`%s'\n" - " funcName=`%s'\n" - " funcArgs=`%s'\n" - " funcTempList=`%s'\n" - " funcDecl=`%s'\n" - " related=`%s'\n" - " exceptions=`%s'\n" + " funcType='%s'\n" + " funcSpec='%s'\n" + " funcName='%s'\n" + " funcArgs='%s'\n" + " funcTempList='%s'\n" + " funcDecl='%s'\n" + " related='%s'\n" + " exceptions='%s'\n" " isRelated=%d\n" " isMemberOf=%d\n" " isFriend=%d\n" @@ -6123,7 +6123,7 @@ static void findMember(Entry *root, if (!funcName.isEmpty()) // function name is valid { Debug::print(Debug::FindMembers,0, - "1. funcName=`%s'\n",funcName.data()); + "1. funcName='%s'\n",funcName.data()); if (funcName.left(9)=="operator ") // strip class scope from cast operator { funcName = substitute(funcName,className+"::",""); @@ -6154,7 +6154,7 @@ static void findMember(Entry *root, ClassDef *cd=md->getClassDef(); Debug::print(Debug::FindMembers,0, "3. member definition found, " - "scope needed=`%s' scope=`%s' args=`%s' fileName=%s\n", + "scope needed='%s' scope='%s' args='%s' fileName=%s\n", qPrint(scopeName),cd ? qPrint(cd->name()) : "", qPrint(md->argsString()), qPrint(root->fileName)); @@ -6223,7 +6223,7 @@ static void findMember(Entry *root, } Debug::print(Debug::FindMembers,0, - "5. matching `%s'<=>`%s' className=%s namespaceName=%s\n", + "5. matching '%s'<=>'%s' className=%s namespaceName=%s\n", qPrint(argListToString(argList,TRUE)),qPrint(argListToString(root->argList,TRUE)), qPrint(className),qPrint(namespaceName) ); @@ -6477,7 +6477,7 @@ static void findMember(Entry *root, declMd ? declMd->protection() : root->protection, root->virt,root->stat,Member, mtype,tArgList,root->argList,root->metaData); - //printf("new specialized member %s args=`%s'\n",md->name().data(),funcArgs.data()); + //printf("new specialized member %s args='%s'\n",md->name().data(),funcArgs.data()); md->setTagInfo(root->tagInfo); md->setLanguage(root->lang); md->setId(root->id); @@ -6540,7 +6540,7 @@ static void findMember(Entry *root, // new overloaded member function ArgumentList *tArgList = getTemplateArgumentsFromName(cd->name()+"::"+funcName,root->tArgLists); - //printf("new related member %s args=`%s'\n",md->name().data(),funcArgs.data()); + //printf("new related member %s args='%s'\n",md->name().data(),funcArgs.data()); MemberDef *md=createMemberDef( root->fileName,root->startLine,root->startColumn, funcType,funcName,funcArgs,exceptions, @@ -6595,7 +6595,7 @@ static void findMember(Entry *root, " scopeName=%s className=%s\n",qPrint(scopeName),qPrint(className)); if (className.isEmpty()) className=root->relates; ClassDef *cd; - //printf("scopeName=`%s' className=`%s'\n",scopeName.data(),className.data()); + //printf("scopeName='%s' className='%s'\n",scopeName.data(),className.data()); if ((cd=getClass(scopeName))) { bool newMember=TRUE; // assume we have a new member @@ -6668,7 +6668,7 @@ static void findMember(Entry *root, funcDecl=funcType + " " + funcName; } - //printf("New related name `%s' `%d'\n",funcName.data(), + //printf("New related name '%s' '%d'\n",funcName.data(), // root->argList ? (int)root->argList->count() : -1); // first note that we pass: @@ -6709,7 +6709,7 @@ static void findMember(Entry *root, - //printf("Related member name=`%s' decl=`%s' bodyLine=`%d'\n", + //printf("Related member name='%s' decl='%s' bodyLine='%d'\n", // funcName.data(),funcDecl.data(),root->bodyLine); // try to find the matching line number of the body from the @@ -6805,7 +6805,7 @@ static void findMember(Entry *root, else { warn_undoc(root->fileName,root->startLine, - "class `%s' for related function `%s' is not " + "class '%s' for related function '%s' is not " "documented.", className.data(),funcName.data() ); @@ -6815,12 +6815,12 @@ static void findMember(Entry *root, { localObjCMethod: ClassDef *cd; - //printf("scopeName=`%s' className=`%s'\n",scopeName.data(),className.data()); + //printf("scopeName='%s' className='%s'\n",scopeName.data(),className.data()); if (Config_getBool(EXTRACT_LOCAL_METHODS) && (cd=getClass(scopeName))) { Debug::print(Debug::FindMembers,0,"4. Local objective C method %s\n" " scopeName=%s className=%s\n",qPrint(root->name),qPrint(scopeName),qPrint(className)); - //printf("Local objective C method `%s' of class `%s' found\n",root->name.data(),cd->name().data()); + //printf("Local objective C method '%s' of class '%s' found\n",root->name.data(),cd->name().data()); MemberDef *md=createMemberDef( root->fileName,root->startLine,root->startColumn, funcType,funcName,funcArgs,exceptions, @@ -6872,14 +6872,14 @@ localObjCMethod: if (className.isEmpty() && !globMem) { warn(root->fileName,root->startLine, - "class for member `%s' cannot " + "class for member '%s' cannot " "be found.", funcName.data() ); } else if (!className.isEmpty() && !globMem) { warn(root->fileName,root->startLine, - "member `%s' of class `%s' cannot be found", + "member '%s' of class '%s' cannot be found", funcName.data(),className.data()); } } @@ -6901,7 +6901,7 @@ static void filterMemberDocumentation(Entry *root) { int i=-1,l; Debug::print(Debug::FindMembers,0, - "findMemberDocumentation(): root->type=`%s' root->inside=`%s' root->name=`%s' root->args=`%s' section=%x root->spec=%lld root->mGrpId=%d\n", + "findMemberDocumentation(): root->type='%s' root->inside='%s' root->name='%s' root->args='%s' section=%x root->spec=%lld root->mGrpId=%d\n", qPrint(root->type),qPrint(root->inside),qPrint(root->name),qPrint(root->args),root->section,root->spec,root->mGrpId ); //printf("root->parent()->name=%s\n",root->parent()->name.data()); @@ -6935,7 +6935,7 @@ static void filterMemberDocumentation(Entry *root) //printf("Member %s isFunc=%d\n",root->name.data(),isFunc); if (root->section==Entry::MEMBERDOC_SEC) { - //printf("Documentation for inline member `%s' found args=`%s'\n", + //printf("Documentation for inline member '%s' found args='%s'\n", // root->name.data(),root->args.data()); //if (root->relates.length()) printf(" Relates %s\n",root->relates.data()); if (root->type.isEmpty()) @@ -6963,7 +6963,7 @@ static void filterMemberDocumentation(Entry *root) ) ) { - //printf("Documentation for member `%s' found args=`%s' excp=`%s'\n", + //printf("Documentation for member '%s' found args='%s' excp='%s'\n", // root->name.data(),root->args.data(),root->exception.data()); //if (root->relates.length()) printf(" Relates %s\n",root->relates.data()); //printf("Inside=%s\n Relates=%s\n",root->inside.data(),root->relates.data()); @@ -7087,7 +7087,7 @@ static void findEnums(Entry *root) bool isGlobal; bool isRelated=FALSE; bool isMemberOf=FALSE; - //printf("Found enum with name `%s' relates=%s\n",root->name.data(),root->relates.data()); + //printf("Found enum with name '%s' relates=%s\n",root->name.data(),root->relates.data()); int i; QCString name; @@ -7124,7 +7124,7 @@ static void findEnums(Entry *root) if (cd && !name.isEmpty()) // found a enum inside a compound { - //printf("Enum `%s'::`%s'\n",cd->name().data(),name.data()); + //printf("Enum '%s'::'%s'\n",cd->name().data(),name.data()); fd=0; mnsd=Doxygen::memberNameSDict; isGlobal=FALSE; @@ -7265,7 +7265,7 @@ static void addEnumValuesToEnums(Entry *root) MemberNameSDict *mnsd=0; bool isGlobal; bool isRelated=FALSE; - //printf("Found enum with name `%s' relates=%s\n",root->name.data(),root->relates.data()); + //printf("Found enum with name '%s' relates=%s\n",root->name.data(),root->relates.data()); int i; QCString name; @@ -7301,21 +7301,21 @@ static void addEnumValuesToEnums(Entry *root) if (cd && !name.isEmpty()) // found a enum inside a compound { - //printf("Enum in class `%s'::`%s'\n",cd->name().data(),name.data()); + //printf("Enum in class '%s'::'%s'\n",cd->name().data(),name.data()); fd=0; mnsd=Doxygen::memberNameSDict; isGlobal=FALSE; } else if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@') // found enum inside namespace { - //printf("Enum in namespace `%s'::`%s'\n",nd->name().data(),name.data()); + //printf("Enum in namespace '%s'::'%s'\n",nd->name().data(),name.data()); mnsd=Doxygen::functionNameSDict; isGlobal=TRUE; } else // found a global enum { fd=root->fileDef(); - //printf("Enum in file `%s': `%s'\n",fd->name().data(),name.data()); + //printf("Enum in file '%s': '%s'\n",fd->name().data(),name.data()); mnsd=Doxygen::functionNameSDict; isGlobal=TRUE; } @@ -7482,7 +7482,7 @@ static void findEnumDocumentation(Entry *root) && root->name.at(0)!='@' // skip anonymous enums ) { - //printf("Found docs for enum with name `%s' in context %s\n", + //printf("Found docs for enum with name '%s' in context %s\n", // root->name.data(),root->parent->name.data()); int i; QCString name; @@ -7491,7 +7491,7 @@ static void findEnumDocumentation(Entry *root) { name=root->name.right(root->name.length()-i-2); // extract name scope=root->name.left(i); // extract scope - //printf("Scope=`%s' Name=`%s'\n",scope.data(),name.data()); + //printf("Scope='%s' Name='%s'\n",scope.data(),name.data()); } else // just the name { @@ -7511,7 +7511,7 @@ static void findEnumDocumentation(Entry *root) bool found=FALSE; if (cd) { - //printf("Enum: scope=`%s' name=`%s'\n",cd->name(),name.data()); + //printf("Enum: scope='%s' name='%s'\n",cd->name(),name.data()); QCString className=cd->name().copy(); MemberName *mn=Doxygen::memberNameSDict->find(name); if (mn) @@ -7602,7 +7602,7 @@ static void findEnumDocumentation(Entry *root) if (!found) { warn(root->fileName,root->startLine, - "Documentation for undefined enum `%s' found.", + "Documentation for undefined enum '%s' found.", name.data() ); } @@ -7728,9 +7728,9 @@ static void vhdlCorrectMemberProperties() //---------------------------------------------------------------------- -// computes the relation between all members. For each member `m' -// the members that override the implementation of `m' are searched and -// the member that `m' overrides is searched. +// computes the relation between all members. For each member 'm' +// the members that override the implementation of 'm' are searched and +// the member that 'm' overrides is searched. static void computeMemberRelations() { @@ -7750,7 +7750,7 @@ static void computeMemberRelations() if (mcd && mcd->baseClasses()) { const ClassDef *bmcd = bmd->getClassDef(); - //printf("Check relation between `%s'::`%s' (%p) and `%s'::`%s' (%p)\n", + //printf("Check relation between '%s'::'%s' (%p) and '%s'::'%s' (%p)\n", // mcd->name().data(),md->name().data(),md, // bmcd->name().data(),bmd->name().data(),bmd // ); @@ -7768,7 +7768,7 @@ static void computeMemberRelations() //printf(" derived scope\n"); ArgumentList *bmdAl = bmd->argumentList(); ArgumentList *mdAl = md->argumentList(); - //printf(" Base argList=`%s'\n Super argList=`%s'\n", + //printf(" Base argList='%s'\n Super argList='%s'\n", // argListToString(bmdAl.pointer()).data(), // argListToString(mdAl.pointer()).data() // ); @@ -8097,7 +8097,7 @@ static void addSourceReferences() (fd->generateSourceFile() || Doxygen::parseSourcesNeeded) ) { - //printf("Found member `%s' in file `%s' at line `%d' def=%s\n", + //printf("Found member '%s' in file '%s' at line '%d' def=%s\n", // md->name().data(),fd->name().data(),md->getStartBodyLine(),md->getOuterScope()->name().data()); fd->addSourceRef(md->getStartBodyLine(),md->getOuterScope(),md); } @@ -8122,7 +8122,7 @@ static void addSourceReferences() (fd->generateSourceFile() || Doxygen::parseSourcesNeeded) ) { - //printf("Found member `%s' in file `%s' at line `%d' def=%s\n", + //printf("Found member '%s' in file '%s' at line '%d' def=%s\n", // md->name().data(),fd->name().data(),md->getStartBodyLine(),md->getOuterScope()->name().data()); fd->addSourceRef(md->getStartBodyLine(),md->getOuterScope(),md); } @@ -8302,7 +8302,7 @@ static void inheritDocumentation() MemberDef *md; for (;(md=mni.current());++mni) { - //printf("%04d Member `%s'\n",count++,md->name().data()); + //printf("%04d Member '%s'\n",count++,md->name().data()); if (md->documentation().isEmpty() && md->briefDescription().isEmpty()) { // no documentation yet MemberDef *bmd = md->reimplements(); @@ -8595,7 +8595,7 @@ static void findDefineDocumentation(Entry *root) root->section==Entry::DEFINE_SEC) && !root->name.isEmpty() ) { - //printf("found define `%s' `%s' brief=`%s' doc=`%s'\n", + //printf("found define '%s' '%s' brief='%s' doc='%s'\n", // root->name.data(),root->args.data(),root->brief.data(),root->doc.data()); if (root->tagInfo && !root->name.isEmpty()) // define read from a tag file @@ -8605,7 +8605,7 @@ static void findDefineDocumentation(Entry *root) Public,Normal,FALSE,Member,MemberType_Define,0,0,""); md->setTagInfo(root->tagInfo); md->setLanguage(root->lang); - //printf("Searching for `%s' fd=%p\n",filePathName.data(),fd); + //printf("Searching for '%s' fd=%p\n",filePathName.data(),fd); md->setFileDef(root->parent()->fileDef()); //printf("Adding member=%s\n",md->name().data()); MemberName *mn; @@ -8950,7 +8950,7 @@ static void resolveUserReferences() SectionInfo *si; for (;(si=sdi.current());++sdi) { - //printf("si->label=`%s' si->definition=%s si->fileName=`%s'\n", + //printf("si->label='%s' si->definition=%s si->fileName='%s'\n", // si->label.data(),si->definition?si->definition->name().data():"", // si->fileName.data()); PageDef *pd=0; @@ -9252,7 +9252,7 @@ static void generateConfigFile(const char *configFile,bool shortList, { if (!updateOnly) { - msg("\n\nConfiguration file `%s' created.\n\n",configFile); + msg("\n\nConfiguration file '%s' created.\n\n",configFile); msg("Now edit the configuration file and enter\n\n"); if (qstrcmp(configFile,"Doxyfile") || qstrcmp(configFile,"doxyfile")) msg(" doxygen %s\n\n",configFile); @@ -9262,7 +9262,7 @@ static void generateConfigFile(const char *configFile,bool shortList, } else { - msg("\n\nConfiguration file `%s' updated.\n\n",configFile); + msg("\n\nConfiguration file '%s' updated.\n\n",configFile); } } } @@ -9325,15 +9325,15 @@ static void readTagFile(Entry *root,const char *tl) QFileInfo fi(fileName); if (!fi.exists() || !fi.isFile()) { - err("Tag file `%s' does not exist or is not a file. Skipping it...\n", + err("Tag file '%s' does not exist or is not a file. Skipping it...\n", fileName.data()); return; } if (!destName.isEmpty()) - msg("Reading tag file `%s', location `%s'...\n",fileName.data(),destName.data()); + msg("Reading tag file '%s', location '%s'...\n",fileName.data(),destName.data()); else - msg("Reading tag file `%s'...\n",fileName.data()); + msg("Reading tag file '%s'...\n",fileName.data()); parseTagFile(root,fi.absFilePath().utf8()); } @@ -9692,8 +9692,8 @@ static QCString resolveSymlink(QCString path) static QDict g_pathsVisited(1009); //---------------------------------------------------------------------------- -// Read all files matching at least one pattern in `patList' in the -// directory represented by `fi'. +// Read all files matching at least one pattern in 'patList' in the +// directory represented by 'fi'. // The directory is read iff the recusiveFlag is set. // The contents of all files is append to the input string @@ -9803,7 +9803,7 @@ int readDir(QFileInfo *fi, //---------------------------------------------------------------------------- // read a file or all files in a directory and append their contents to the -// input string. The names of the files are appended to the `fiList' list. +// input string. The names of the files are appended to the 'fiList' list. int readFileOrDirectory(const char *s, FileNameList *fnList, @@ -10033,7 +10033,7 @@ void readAliases() { QCString name=alias.left(i).stripWhiteSpace(); QCString value=alias.right(alias.length()-i-1); - //printf("Alias: found name=`%s' value=`%s'\n",name.data(),value.data()); + //printf("Alias: found name='%s' value='%s'\n",name.data(),value.data()); if (!name.isEmpty()) { QCString *dn=Doxygen::aliasDict[name]; @@ -10150,13 +10150,13 @@ static void usage(const char *name) msg(" %s -f emoji outputFileName\n\n",name); msg(" If - is used for outputFileName doxygen will write to standard output.\n\n"); msg("If -s is specified the comments of the configuration items in the config file will be omitted.\n"); - msg("If configName is omitted `Doxyfile' will be used as a default.\n\n"); + msg("If configName is omitted 'Doxyfile' will be used as a default.\n\n"); msg("-v print version string\n"); } //---------------------------------------------------------------------------- -// read the argument of option `c' from the comment argument list and -// update the option index `optind'. +// read the argument of option 'c' from the comment argument list and +// update the option index 'optind'. static const char *getArg(int argc,char **argv,int &optind) { @@ -11143,14 +11143,14 @@ void parseInput() dir.setPath(QDir::currentDirPath()); if (!dir.mkdir(outputDirectory)) { - err("tag OUTPUT_DIRECTORY: Output directory `%s' does not " + err("tag OUTPUT_DIRECTORY: Output directory '%s' does not " "exist and cannot be created\n",outputDirectory.data()); cleanUpDoxygen(); exit(1); } else { - msg("Notice: Output directory `%s' does not exist. " + msg("Notice: Output directory '%s' does not exist. " "I have created it for you.\n", outputDirectory.data()); } dir.cd(outputDirectory); diff --git a/src/filedef.cpp b/src/filedef.cpp index f721c9f..dc8aa12 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -1394,7 +1394,7 @@ void FileDefImpl::insertMember(MemberDef *md) break; default: err("FileDefImpl::insertMembers(): " - "member `%s' with class scope `%s' inserted in file scope `%s'!\n", + "member '%s' with class scope '%s' inserted in file scope '%s'!\n", md->name().data(), md->getClassDef() ? md->getClassDef()->name().data() : "", name().data()); diff --git a/src/filename.cpp b/src/filename.cpp index ae3b596..637fe33 100644 --- a/src/filename.cpp +++ b/src/filename.cpp @@ -70,7 +70,7 @@ void FileName::generateDiskNames() QCString path = fd->getPath(); if (!fd->isReference()) { - //printf("i=%d j=%d fd->path=`%s' fd->name=`%s'\n",i,j,fd->path.left(i).data(),fd->name().data()); + //printf("i=%d j=%d fd->path='%s' fd->name='%s'\n",i,j,fd->path.left(i).data(),fd->name().data()); if (i==(int)path.length()) { //warning("Input file %s found multiple times!\n" diff --git a/src/fortrancode.l b/src/fortrancode.l index 926a3ff..0712afd 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -269,7 +269,7 @@ static void endCodeLine() g_code->endCodeLine(); } -/*! write a code fragment `text' that may span multiple lines, inserting +/*! write a code fragment 'text' that may span multiple lines, inserting * line numbers for each line. */ static void codifyLines(char *text) diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 0ad03e3..bbbdcf0 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -32,7 +32,7 @@ * * - Do not like constructs like aa{BS} or {BS}bb. Should try to handle blank space * with separate rule?: It seems it is often necessary, because we may parse something like - * "functionA" or "MyInterface". So constructs like `(^|[ \t])interface({BS_}{ID})?/[ \t\n]' + * "functionA" or "MyInterface". So constructs like '(^|[ \t])interface({BS_}{ID})?/[ \t\n]' * are desired. * * - Must track yyLineNr when using REJECT, unput() or similar commands. diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 01c4cc4..8b73910 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -532,7 +532,7 @@ bool GroupDefImpl::insertMember(MemberDef *md,bool docOnly) break; default: err("GroupDefImpl::insertMembers(): " - "member `%s' (typeid=%d) with scope `%s' inserted in group scope `%s'!\n", + "member '%s' (typeid=%d) with scope '%s' inserted in group scope '%s'!\n", md->name().data(),md->memberType(), md->getClassDef() ? md->getClassDef()->name().data() : "", name().data()); @@ -650,7 +650,7 @@ bool GroupDefImpl::findGroup(const GroupDef *def) const void GroupDefImpl::addGroup(const GroupDef *def) { - //printf("adding group `%s' to group `%s'\n",def->name().data(),name().data()); + //printf("adding group '%s' to group '%s'\n",def->name().data(),name().data()); //if (Config_getBool(SORT_MEMBER_DOCS)) // groupList->inSort(def); //else @@ -1485,7 +1485,7 @@ void addNamespaceToGroups(Entry *root,NamespaceDef *nd) for (;(g=gli.current());++gli) { GroupDef *gd=0; - //printf("group `%s'\n",s->data()); + //printf("group '%s'\n",s->data()); if (!g->groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g->groupname))) { if (gd->addNamespace(nd)) nd->makePartOfGroup(gd); @@ -1502,7 +1502,7 @@ void addDirToGroups(Entry *root,DirDef *dd) for (;(g=gli.current());++gli) { GroupDef *gd=0; - //printf("group `%s'\n",g->groupname.data()); + //printf("group '%s'\n",g->groupname.data()); if (!g->groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g->groupname))) { gd->addDir(dd); diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index e7d9d57..a059a86 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -775,7 +775,7 @@ void HtmlDocVisitor::visit(DocInclude *inc) void HtmlDocVisitor::visit(DocIncOperator *op) { - //printf("DocIncOperator: type=%d first=%d, last=%d text=`%s'\n", + //printf("DocIncOperator: type=%d first=%d, last=%d text='%s'\n", // op->type(),op->isFirst(),op->isLast(),op->text().data()); if (op->isFirst()) { diff --git a/src/index.cpp b/src/index.cpp index a577d9a..d563053 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -619,7 +619,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv (tocExpand && // or toc expand and dd->getFiles() && dd->getFiles()->count()>0 // there are files ); - //printf("gd=`%s': pageDict=%d\n",gd->name().data(),gd->pageDict->count()); + //printf("gd='%s': pageDict=%d\n",gd->name().data(),gd->pageDict->count()); if (addToIndex) { Doxygen::indexList->addContentsItem(isDir,dd->shortName(),dd->getReference(),dd->getOutputFileBase(),0,TRUE,TRUE); @@ -4005,7 +4005,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp* } bool isDir = hasSubGroups || hasSubPages || numSubItems>0; - //printf("gd=`%s': pageDict=%d\n",gd->name().data(),gd->pageDict->count()); + //printf("gd='%s': pageDict=%d\n",gd->name().data(),gd->pageDict->count()); if (addToIndex) { Doxygen::indexList->addContentsItem(isDir,gd->groupTitle(),gd->getReference(),gd->getOutputFileBase(),0,isDir,TRUE); diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp index 2e979bd..57a4b09 100644 --- a/src/latexdocvisitor.cpp +++ b/src/latexdocvisitor.cpp @@ -557,7 +557,7 @@ void LatexDocVisitor::visit(DocInclude *inc) void LatexDocVisitor::visit(DocIncOperator *op) { - //printf("DocIncOperator: type=%d first=%d, last=%d text=`%s'\n", + //printf("DocIncOperator: type=%d first=%d, last=%d text='%s'\n", // op->type(),op->isFirst(),op->isLast(),op->text().data()); if (op->isFirst()) { diff --git a/src/layout.cpp b/src/layout.cpp index a5df6f4..890ac1a 100644 --- a/src/layout.cpp +++ b/src/layout.cpp @@ -1395,7 +1395,7 @@ class LayoutParser : public QXmlDefaultHandler } else { - err("Unexpected start tag `%s' found in scope='%s'!\n", + err("Unexpected start tag '%s' found in scope='%s'!\n", name.data(),m_scope.data()); } return TRUE; diff --git a/src/mandocvisitor.cpp b/src/mandocvisitor.cpp index 5c98c6f..a94883c 100644 --- a/src/mandocvisitor.cpp +++ b/src/mandocvisitor.cpp @@ -368,7 +368,7 @@ void ManDocVisitor::visit(DocInclude *inc) void ManDocVisitor::visit(DocIncOperator *op) { SrcLangExt langExt = getLanguageFromFileName(m_langExt); - //printf("DocIncOperator: type=%d first=%d, last=%d text=`%s'\n", + //printf("DocIncOperator: type=%d first=%d, last=%d text='%s'\n", // op->type(),op->isFirst(),op->isLast(),op->text().data()); if (op->isFirst()) { diff --git a/src/markdown.cpp b/src/markdown.cpp index c73324a..d992ca9 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -979,7 +979,7 @@ static int processCodeSpan(GrowBuf &out, const char *data, int /*offset*/, int s nl++; } else if (data[end]=='\'' && nb==1 && (end==size-1 || (endisDocsForDefinition()) ? md->argumentList() : md->declArgumentList(); - //printf("writeDefArgumentList `%s' isDocsForDefinition()=%d\n",md->name().data(),md->isDocsForDefinition()); + //printf("writeDefArgumentList '%s' isDocsForDefinition()=%d\n",md->name().data(),md->isDocsForDefinition()); if (defArgList==0 || md->isProperty()) { return FALSE; // member has no function like argument list @@ -1042,7 +1042,7 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me } if (hasFuncPtrType) // argument type is a function pointer { - //printf("a->type=`%s' a->name=`%s'\n",a->type.data(),a->name.data()); + //printf("a->type='%s' a->name='%s'\n",a->type.data(),a->name.data()); QCString n=a->type.left(vp); if (hasFuncPtrType) n=a->type.left(wp); if (md->isObjCMethod()) { n.prepend("("); n.append(")"); } @@ -1559,7 +1559,7 @@ void MemberDefImpl::IMPL::init(Definition *def, * \param e A string representing the throw clause of the members. * \param p The protection context of the member, possible values are: * \c Public, \c Protected, \c Private. - * \param v The degree of `virtualness' of the member, possible values are: + * \param v The degree of 'virtualness' of the member, possible values are: * \c Normal, \c Virtual, \c Pure. * \param s A boolean that is true iff the member is static. * \param r The relationship between the class and the member. @@ -2102,13 +2102,13 @@ ClassDef *MemberDefImpl::getClassDefOfAnonymousType() const cname=getNamespaceDef()->name(); } QCString ltype(m_impl->type); - // strip `static' keyword from ltype + // strip 'static' keyword from ltype //if (ltype.left(7)=="static ") ltype=ltype.right(ltype.length()-7); - // strip `friend' keyword from ltype + // strip 'friend' keyword from ltype ltype.stripPrefix("friend "); static QRegExp r("@[0-9]+"); int l,i=r.match(ltype,0,&l); - //printf("ltype=`%s' i=%d\n",ltype.data(),i); + //printf("ltype='%s' i=%d\n",ltype.data(),i); // search for the last anonymous scope in the member type ClassDef *annoClassDef=0; if (i!=-1) // found anonymous scope in type @@ -2250,7 +2250,7 @@ QCString MemberDefImpl::getDeclType() const { ltype="using"; } - // strip `friend' keyword from ltype + // strip 'friend' keyword from ltype ltype.stripPrefix("friend "); if (ltype=="@") // rename type from enum values { @@ -2359,7 +2359,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol, { ltype="using"; } - // strip `friend' keyword from ltype + // strip 'friend' keyword from ltype ltype.stripPrefix("friend "); static QRegExp r("@[0-9]+"); @@ -2367,7 +2367,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol, int l,i=r.match(ltype,0,&l); if (i!=-1) // member has an anonymous type { - //printf("annoClassDef=%p annMemb=%p scopeName=`%s' anonymous=`%s'\n", + //printf("annoClassDef=%p annMemb=%p scopeName='%s' anonymous='%s'\n", // annoClassDef,annMemb,cname.data(),ltype.mid(i,l).data()); if (annoClassDef) // type is an anonymous compound @@ -2384,7 +2384,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol, ol.writeNonBreakableSpace(3); } QCString varName=ltype.right(ltype.length()-ir).stripWhiteSpace(); - //printf(">>>>>> ltype=`%s' varName=`%s'\n",ltype.data(),varName.data()); + //printf(">>>>>> ltype='%s' varName='%s'\n",ltype.data(),varName.data()); ol.docify("}"); if (varName.isEmpty() && (name().isEmpty() || name().at(0)=='@')) { @@ -3381,7 +3381,7 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml, bool inFile = container->definitionType()==Definition::TypeFile; bool hasDocs = isDetailedSectionVisible(inGroup,inFile); - //printf("MemberDefImpl::writeDocumentation(): name=`%s' hasDocs=`%d' containerType=%d inGroup=%d sectionLinkable=%d\n", + //printf("MemberDefImpl::writeDocumentation(): name='%s' hasDocs='%d' containerType=%d inGroup=%d sectionLinkable=%d\n", // name().data(),hasDocs,container->definitionType(),inGroup,isDetailedSectionLinkable()); //if ( !hasDocs ) return; @@ -3423,7 +3423,7 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml, QCString ldef = definition(); QCString title = name(); - //printf("member `%s' def=`%s'\n",name().data(),ldef.data()); + //printf("member '%s' def='%s'\n",name().data(),ldef.data()); if (isEnumerate()) { if (title.at(0)=='@') @@ -3497,7 +3497,7 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml, } if (!found) // anonymous compound { - //printf("Anonymous compound `%s'\n",cname.data()); + //printf("Anonymous compound '%s'\n",cname.data()); ol.startDoxyAnchor(cfname,cname,memAnchor,doxyName,doxyArgs); ol.startMemberDoc(ciname,name(),memAnchor,name(),memCount,memTotal,showInline); // search for the last anonymous compound name in the definition @@ -3748,7 +3748,7 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml, // ) ) { - //printf("md=%s initLines=%d init=`%s'\n",name().data(),initLines,init.data()); + //printf("md=%s initLines=%d init='%s'\n",name().data(),initLines,init.data()); ol.startBold(); if (m_impl->mtype==MemberType_Define) ol.parseText(theTranslator->trDefineValue()); @@ -6052,7 +6052,7 @@ void combineDeclarationAndDefinition(MemberDef *mdec,MemberDef *mdef) ) ) /* match found */ { - //printf("Found member %s: definition in %s (doc=`%s') and declaration in %s (doc=`%s')\n", + //printf("Found member %s: definition in %s (doc='%s') and declaration in %s (doc='%s')\n", // mn->memberName(), // mdef->getFileDef()->name().data(),mdef->documentation().data(), // mdec->getFileDef()->name().data(),mdec->documentation().data() diff --git a/src/membergroup.cpp b/src/membergroup.cpp index 04689b4..a5852e4 100644 --- a/src/membergroup.cpp +++ b/src/membergroup.cpp @@ -59,7 +59,7 @@ MemberGroup::MemberGroup(const Definition *parent, m_docFile = docFile; m_docLine = docLine; m_xrefListItems = 0; - //printf("Member group docs=`%s'\n",doc.data()); + //printf("Member group docs='%s'\n",doc.data()); } MemberGroup::~MemberGroup() diff --git a/src/memberlist.cpp b/src/memberlist.cpp index 94bb916..1869808 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -183,7 +183,7 @@ void MemberList::countDecMembers() m_numDecMembers++; break; default: - err("Unknown member type found for member `%s'\n!",md->name().data()); + err("Unknown member type found for member '%s'\n!",md->name().data()); } } } @@ -433,7 +433,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, MemberListIterator mli(*this); for ( ; (md=mli.current()); ++mli ) { - //printf(">>> Member `%s' type=%d visible=%d\n", + //printf(">>> Member '%s' type=%d visible=%d\n", // md->name().data(),md->memberType(),md->isBriefSectionVisible()); if ((inheritedFrom==0 || !md->isReimplementedBy(inheritedFrom)) && md->isBriefSectionVisible()) @@ -612,7 +612,7 @@ void MemberList::writeDeclarations(OutputList &ol, if (ctx==0 && gd) ctx = gd; if (ctx==0 && fd) ctx = fd; - //printf("%p: MemberList::writeDeclaration(title=`%s',subtitle=`%s')=%d inheritedFrom=%p\n", + //printf("%p: MemberList::writeDeclaration(title='%s',subtitle='%s')=%d inheritedFrom=%p\n", // this,title,subtitle,numDecMembers(),inheritedFrom); int num = numDecMembers(); diff --git a/src/msc.cpp b/src/msc.cpp index 29f96ac..a7c08fd 100644 --- a/src/msc.cpp +++ b/src/msc.cpp @@ -50,7 +50,7 @@ static bool convertMapFile(FTextStream &t,const char *mapName,const QCString rel bool isRef = FALSE; int numBytes = f.readLine(buf,maxLineLen); buf[numBytes-1]='\0'; - //printf("ReadLine `%s'\n",buf); + //printf("ReadLine '%s'\n",buf); if (qstrncmp(buf,"rect",4)==0) { // obtain the url and the coordinates in the order used by graphviz-1.5 diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index 1e526ae..38e5c04 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -518,7 +518,7 @@ void NamespaceDefImpl::insertMember(MemberDef *md) break; default: err("NamespaceDefImpl::insertMembers(): " - "member `%s' with class scope `%s' inserted in namespace scope `%s'!\n", + "member '%s' with class scope '%s' inserted in namespace scope '%s'!\n", md->name().data(), md->getClassDef() ? md->getClassDef()->name().data() : "", name().data()); diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp index 3813c56..11f1640 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -749,7 +749,7 @@ void PerlModDocVisitor::visit(DocInclude *inc) void PerlModDocVisitor::visit(DocIncOperator *) { #if 0 - //printf("DocIncOperator: type=%d first=%d, last=%d text=`%s'\n", + //printf("DocIncOperator: type=%d first=%d, last=%d text='%s'\n", // op->type(),op->isFirst(),op->isLast(),op->text().data()); if (op->isFirst()) { @@ -2283,13 +2283,13 @@ bool PerlModGenerator::createOutputDir(QDir &perlModDir) dir.setPath(QDir::currentDirPath()); if (!dir.mkdir(outputDirectory)) { - err("tag OUTPUT_DIRECTORY: Output directory `%s' does not " + err("tag OUTPUT_DIRECTORY: Output directory '%s' does not " "exist and cannot be created\n",outputDirectory.data()); exit(1); } else { - msg("Notice: Output directory `%s' does not exist. " + msg("Notice: Output directory '%s' does not exist. " "I have created it for you.\n", outputDirectory.data()); } dir.cd(outputDirectory); diff --git a/src/pre.l b/src/pre.l index c2954ab..564dc27 100644 --- a/src/pre.l +++ b/src/pre.l @@ -693,7 +693,7 @@ static QCString stringize(const QCString &s) } } } - //printf("stringize `%s'->`%s'\n",s.data(),result.data()); + //printf("stringize '%s'->'%s'\n",s.data(),result.data()); return result; } @@ -704,19 +704,19 @@ static QCString stringize(const QCString &s) */ static void processConcatOperators(QCString &expr) { - //printf("processConcatOperators: in=`%s'\n",expr.data()); + //printf("processConcatOperators: in='%s'\n",expr.data()); QRegExp r("[ \\t\\n]*##[ \\t\\n]*"); int l,n,i=0; if (expr.isEmpty()) return; while ((n=r.match(expr,i,&l))!=-1) { - //printf("Match: `%s'\n",expr.data()+i); + //printf("Match: '%s'\n",expr.data()+i); if (n+l+1<(int)expr.length() && expr.at(n+l)=='@' && expr.at(n+l+1)=='-') { // remove no-rescan marker after ID l+=2; } - //printf("found `%s'\n",expr.mid(n,l).data()); + //printf("found '%s'\n",expr.mid(n,l).data()); // remove the ## operator and the surrounding whitespace expr=expr.left(n)+expr.right(expr.length()-n-l); int k=n-1; @@ -729,7 +729,7 @@ static void processConcatOperators(QCString &expr) } i=n; } - //printf("processConcatOperators: out=`%s'\n",expr.data()); + //printf("processConcatOperators: out='%s'\n",expr.data()); } static void yyunput (int c,char *buf_ptr ); @@ -774,7 +774,7 @@ static bool replaceFunctionMacro(const QCString &expr,QCString *rest,int pos,int unputChar(expr,rest,j,' '); return FALSE; } - getNextChar(expr,rest,j); // eat the `(' character + getNextChar(expr,rest,j); // eat the '(' character QDict argTable; // list of arguments argTable.setAutoDelete(TRUE); @@ -954,13 +954,13 @@ static bool replaceFunctionMacro(const QCString &expr,QCString *rest,int pos,int if (key.length()>1 && (subst=argTable[key])) { QCString substArg=*subst; - //printf("substArg=`%s'\n",substArg.data()); + //printf("substArg='%s'\n",substArg.data()); // only if no ## operator is before or after the argument // marker we do macro expansion. if (!hash) expandExpression(substArg,0,0); if (inString) { - //printf("`%s'=stringize(`%s')\n",stringize(*subst).data(),subst->data()); + //printf("'%s'=stringize('%s')\n",stringize(*subst).data(),subst->data()); // if the marker is inside a string (because a # was put // before the macro name) we must escape " and \ characters @@ -999,7 +999,7 @@ static bool replaceFunctionMacro(const QCString &expr,QCString *rest,int pos,int } len=j-pos; result=resExpr; - //printf("result after substitution `%s' expr=`%s'\n", + //printf("result after substitution '%s' expr='%s'\n", // result.data(),expr.mid(pos,len).data()); return TRUE; } @@ -1098,7 +1098,7 @@ static void expandExpression(QCString &expr,QCString *rest,int pos) else if (def && def->nargs==-1) // simple macro { // substitute the definition of the macro - //printf("macro `%s'->`%s'\n",macroName.data(),def->definition.data()); + //printf("macro '%s'->'%s'\n",macroName.data(),def->definition.data()); if (g_nospaces) { expMacro=def->definition.stripWhiteSpace(); @@ -1110,7 +1110,7 @@ static void expandExpression(QCString &expr,QCString *rest,int pos) //expMacro=def->definition.stripWhiteSpace(); replaced=TRUE; len=l; - //printf("simple macro expansion=`%s'->`%s'\n",macroName.data(),expMacro.data()); + //printf("simple macro expansion='%s'->'%s'\n",macroName.data(),expMacro.data()); } else if (def && def->nargs>=0) // function macro { @@ -1125,7 +1125,7 @@ static void expandExpression(QCString &expr,QCString *rest,int pos) if (replaced) // expand the macro and rescan the expression { - //printf("replacing `%s'->`%s'\n",expr.mid(p,len).data(),expMacro.data()); + //printf("replacing '%s'->'%s'\n",expr.mid(p,len).data(),expMacro.data()); QCString resultExpr=expMacro; QCString restExpr=expr.right(expr.length()-len-p); processConcatOperators(resultExpr); @@ -1236,7 +1236,7 @@ QCString removeIdsAndMarkers(const char *s) { p = processUntilMatchingTerminator(p,result); } - else if (c=='d' && !inNum) // identifier starting with a `d' + else if (c=='d' && !inNum) // identifier starting with a 'd' { if (qstrncmp(p,"defined ",8)==0 || qstrncmp(p,"defined(",8)==0) // defined keyword @@ -1387,10 +1387,10 @@ bool computeExpression(const QCString &expr) { QCString e=expr; expandExpression(e,0,0); - //printf("after expansion `%s'\n",e.data()); + //printf("after expansion '%s'\n",e.data()); e = removeIdsAndMarkers(e); if (e.isEmpty()) return FALSE; - //printf("parsing `%s'\n",e.data()); + //printf("parsing '%s'\n",e.data()); return parseconstexp(g_yyFileName,g_yyLineNr,e); } @@ -1403,7 +1403,7 @@ QCString expandMacro(const QCString &name) QCString n=name; expandExpression(n,0,0); n=removeMarkers(n); - //printf("expandMacro `%s'->`%s'\n",name.data(),n.data()); + //printf("expandMacro '%s'->'%s'\n",name.data(),n.data()); return n; } @@ -1420,7 +1420,7 @@ Define *newDefine() def->varArgs = g_defVarArgs; //printf("newDefine: %s %s file: %s\n",def->name.data(),def->definition.data(), // def->fileDef ? def->fileDef->name().data() : def->fileName.data()); - //printf("newDefine: `%s'->`%s'\n",def->name.data(),def->definition.data()); + //printf("newDefine: '%s'->'%s'\n",def->name.data(),def->definition.data()); if (!def->name.isEmpty() && Doxygen::expandAsDefinedDict[def->name]) { def->isPredefined=TRUE; @@ -1444,11 +1444,11 @@ void addDefine() if (!g_defArgsStr.isEmpty()) { ArgumentList *argList = new ArgumentList; - //printf("addDefine() g_defName=`%s' g_defArgsStr=`%s'\n",g_defName.data(),g_defArgsStr.data()); + //printf("addDefine() g_defName='%s' g_defArgsStr='%s'\n",g_defName.data(),g_defArgsStr.data()); stringToArgumentList(g_defArgsStr,argList); md->setArgumentList(argList); } - //printf("Setting initializer for `%s' to `%s'\n",g_defName.data(),g_defText.data()); + //printf("Setting initializer for '%s' to '%s'\n",g_defName.data(),g_defText.data()); int l=g_defLitText.find('\n'); if (l>0 && g_defLitText.left(l).stripWhiteSpace()=="\\") { @@ -1528,7 +1528,7 @@ static void readIncludeFile(const QCString &inc) QCString oldFileName = g_yyFileName; FileDef *oldFileDef = g_yyFileDef; int oldLineNr = g_yyLineNr; - //printf("Searching for `%s'\n",incFileName.data()); + //printf("Searching for '%s'\n",incFileName.data()); // absIncFileName avoids difficulties for incFileName starting with "../" (bug 641336) QCString absIncFileName = incFileName; @@ -2017,7 +2017,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) if (g_roundCount==0) { QCString result=expandMacro(g_defArgsStr); - //printf("g_defArgsStr=`%s'->`%s'\n",g_defArgsStr.data(),result.data()); + //printf("g_defArgsStr='%s'->'%s'\n",g_defArgsStr.data(),result.data()); if (g_findDefArgContext==CopyLine) { outputArray(result,result.length()); @@ -2224,7 +2224,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) . { g_guardExpr+=*yytext; } \n { unput(*yytext); - //printf("Guard: `%s'\n", + //printf("Guard: '%s'\n", // g_guardExpr.data()); bool guard=computeExpression(g_guardExpr); setCaseDone(guard); @@ -2378,7 +2378,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) . { } {ID}/("\\\n")*"(" { // define with argument - //printf("Define() `%s'\n",yytext); + //printf("Define() '%s'\n",yytext); delete g_argDict; g_argDict = new QDict(31); g_argDict->setAutoDelete(TRUE); @@ -2392,7 +2392,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) BEGIN(DefineArg); } {ID}{B}+"1"/[ \r\t\n] { // special case: define with 1 -> can be "guard" - //printf("Define `%s'\n",yytext); + //printf("Define '%s'\n",yytext); delete g_argDict; g_argDict=0; g_defArgs = -1; g_defArgsStr.resize(0); @@ -2450,7 +2450,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) g_expectGuard=FALSE; } {ID}/{B}* { // define with content - //printf("Define `%s'\n",yytext); + //printf("Define '%s'\n",yytext); delete g_argDict; g_argDict=0; g_defArgs = -1; g_defArgsStr.resize(0); @@ -2852,7 +2852,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) } outputChar('\n'); Define *def=0; - //printf("Define name=`%s' text=`%s' litTexti=`%s'\n",g_defName.data(),g_defText.data(),g_defLitText.data()); + //printf("Define name='%s' text='%s' litTexti='%s'\n",g_defName.data(),g_defText.data(),g_defLitText.data()); if (g_includeStack.isEmpty() || g_curlyCount>0) { addDefine(); @@ -3198,7 +3198,7 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output) DefineManager::instance().addDefine(g_yyFileName,def); } - //printf("#define `%s' `%s' #nargs=%d\n", + //printf("#define '%s' '%s' #nargs=%d\n", // def->name.data(),def->definition.data(),def->nargs); } else if ((i_obrace==-1 || i_obrace>i_equals) && @@ -3233,7 +3233,7 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output) delete def; } - //printf("#define `%s' `%s' #nargs=%d\n", + //printf("#define '%s' '%s' #nargs=%d\n", // def->name.data(),def->definition.data(),def->nargs); } } diff --git a/src/pycode.l b/src/pycode.l index 1a87bca..614f8c7 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -376,7 +376,7 @@ static void startCodeLine() g_searchingForBody = TRUE; g_realScope = d->name().copy(); g_classScope = d->name().copy(); - //printf("Real scope: `%s'\n",g_realScope.data()); + //printf("Real scope: '%s'\n",g_realScope.data()); g_bodyCurlyCount = 0; QCString lineAnchor; lineAnchor.sprintf("l%05d",g_yyLineNr); @@ -549,7 +549,7 @@ static bool getLinkInScope(const QCString &c, // scope const FileDef *fd = 0; const NamespaceDef *nd = 0; const GroupDef *gd = 0; - //printf("Trying `%s'::`%s'\n",c.data(),m.data()); + //printf("Trying '%s'::'%s'\n",c.data(),m.data()); if (getDefs(c,m,"()",md,cd,fd,nd,gd,FALSE,g_sourceFileDef) && md->isLinkable()) { @@ -571,7 +571,7 @@ static bool getLinkInScope(const QCString &c, // scope { addDocCrossReference(g_currentMemberDef,const_cast(md)); } - //printf("d->getReference()=`%s' d->getOutputBase()=`%s' name=`%s' member name=`%s'\n",d->getReference().data(),d->getOutputFileBase().data(),d->name().data(),md->name().data()); + //printf("d->getReference()='%s' d->getOutputBase()='%s' name='%s' member name='%s'\n",d->getReference().data(),d->getOutputFileBase().data(),d->name().data(),md->name().data()); writeMultiLineCodeLink(ol,md, text ? text : memberText); addToSearchIndex(text ? text : memberText); @@ -753,7 +753,7 @@ static void generateFunctionLink(CodeOutputInterface &ol,char *funcName) locScope=locFunc.left(i); locFunc=locFunc.right(locFunc.length()-i-2).stripWhiteSpace(); } - //printf("generateFunctionLink(%s) classScope=`%s'\n",locFunc.data(),locScope.data()); + //printf("generateFunctionLink(%s) classScope='%s'\n",locFunc.data(),locScope.data()); if (!locScope.isEmpty() && (ccd=g_codeClassSDict[locScope])) { //printf("using classScope %s\n",g_classScope.data()); diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index 55c03a5..cdf5b57 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -529,7 +529,7 @@ void RTFDocVisitor::visit(DocInclude *inc) void RTFDocVisitor::visit(DocIncOperator *op) { - //printf("DocIncOperator: type=%d first=%d, last=%d text=`%s'\n", + //printf("DocIncOperator: type=%d first=%d, last=%d text='%s'\n", // op->type(),op->isFirst(),op->isLast(),op->text().data()); DBG_RTF("{\\comment RTFDocVisitor::visit(DocIncOperator)}\n"); SrcLangExt langExt = getLanguageFromFileName(m_langExt); diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp index bb2075b..e223de7 100644 --- a/src/rtfgen.cpp +++ b/src/rtfgen.cpp @@ -1532,7 +1532,7 @@ void RTFGenerator::startMemberDoc(const char *clname, t << rtf_Style_Reset << rtf_Style[showInline ? "Heading5" : "Heading4"]->reference; //styleStack.push(rtf_Style_Heading4); t << "{" << endl; - //printf("RTFGenerator::startMemberDoc() `%s'\n",rtf_Style["Heading4"]->reference); + //printf("RTFGenerator::startMemberDoc() '%s'\n",rtf_Style["Heading4"]->reference); startBold(); t << endl; } @@ -1541,7 +1541,7 @@ void RTFGenerator::endMemberDoc(bool) { DBG_RTF(t << "{\\comment endMemberDoc}" << endl) //const char *style = styleStack.pop(); - //printf("RTFGenerator::endMemberDoc() `%s'\n",style); + //printf("RTFGenerator::endMemberDoc() '%s'\n",style); //ASSERT(style==rtf_Style["Heading4"]->reference); endBold(); t << "}" << endl; diff --git a/src/scanner.l b/src/scanner.l index 2634485..15d0693 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -2655,7 +2655,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } */ {ID} { - //printf("Define `%s' without args\n",yytext); + //printf("Define '%s' without args\n",yytext); if (insideCpp || insideObjC) { current->id = ClangParser::instance()->lookup(yyLineNr,yytext); @@ -2926,7 +2926,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) BEGIN(GCopyCurly); } [;,] { - //printf(">> initializer `%s' <<\n",current->initializer.data()); + //printf(">> initializer '%s' <<\n",current->initializer.data()); if (*yytext==';' && (current_root->spec&Entry::Enum)) { current->fileName = yyFileName; @@ -3820,7 +3820,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } [^\n]* "," { - //printf("adding `%s' `%s' `%s' to enum `%s' (mGrpId=%d)\n", + //printf("adding '%s' '%s' '%s' to enum '%s' (mGrpId=%d)\n", // current->type.data(), current->name.data(), // current->args.data(), current_root->name.data(),current->mGrpId); if (!current->name.isEmpty()) @@ -3966,7 +3966,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } QCString &cn = current->name; QCString rn = current_root->name.copy(); - //printf("cn=`%s' rn=`%s' isTypedef=%d\n",cn.data(),rn.data(),isTypedef); + //printf("cn='%s' rn='%s' isTypedef=%d\n",cn.data(),rn.data(),isTypedef); if (!cn.isEmpty() && !rn.isEmpty()) { prependScope(); @@ -3987,7 +3987,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) // was: current->args.simplifyWhiteSpace(); current->type = current->type.simplifyWhiteSpace(); current->name = current->name.stripWhiteSpace(); - //printf("adding `%s' `%s' `%s' brief=%s insideObjC=%d %x\n",current->type.data(),current->name.data(),current->args.data(),current->brief.data(),insideObjC,current->section); + //printf("adding '%s' '%s' '%s' brief=%s insideObjC=%d %x\n",current->type.data(),current->name.data(),current->args.data(),current->brief.data(),insideObjC,current->section); if (insideObjC && ((current->spec&Entry::Interface) || (current->spec==Entry::Category)) ) // method definition follows @@ -4133,7 +4133,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) { // see if the compound does not have a name or is inside another // anonymous compound. If so we insert a - // special `anonymous' variable. + // special 'anonymous' variable. //Entry *p=current_root; Entry *p=current; while (p) @@ -4141,7 +4141,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) // only look for class scopes, not namespace scopes if ((p->section & Entry::COMPOUND_MASK) && !p->name.isEmpty()) { - //printf("Trying scope `%s'\n",p->name.data()); + //printf("Trying scope '%s'\n",p->name.data()); int i=p->name.findRev("::"); int pi = (i==-1) ? 0 : i+2; if (p->name.at(pi)=='@') @@ -4226,7 +4226,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } } - //printf("Add: type=`%s',name=`%s',args=`%s' brief=%s doc=%s\n", + //printf("Add: type='%s',name='%s',args='%s' brief=%s doc=%s\n", // varEntry->type.data(),varEntry->name.data(), // varEntry->args.data(),varEntry->brief.data(),varEntry->doc.data()); current_root->addSubEntry(varEntry); @@ -4328,7 +4328,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } } . { - //printf("error: FuncPtr `%c' unexpected at line %d of %s\n",*yytext,yyLineNr,yyFileName); + //printf("error: FuncPtr '%c' unexpected at line %d of %s\n",*yytext,yyLineNr,yyFileName); } "("{BN}*")"{BN}*/"(" { current->name += yytext; @@ -4582,7 +4582,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) BEGIN( SkipCxxComment ); } */ - /* `)' followed by a special comment */ + /* ')' followed by a special comment */ ")"{BN}*("/*"[*!]|"//"[/!])"<" { lineCount(); if (currentArgumentContext==DefineEnd) @@ -5113,7 +5113,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) if (!current->type.isEmpty() && (!isFunction || current->type.left(8)=="typedef ")) { - //printf("Scanner.l: found in class variable: `%s' `%s' `%s'\n", current->type.data(),current->name.data(),current->args.data()); + //printf("Scanner.l: found in class variable: '%s' '%s' '%s'\n", current->type.data(),current->name.data(),current->args.data()); if (isTypedef && current->type.left(8)!="typedef ") { current->type.prepend("typedef "); @@ -5122,14 +5122,14 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } else { - //printf("Scanner.l: found in class function: `%s' `%s' `%s'\n", current->type.data(),current->name.data(),current->args.data()); + //printf("Scanner.l: found in class function: '%s' '%s' '%s'\n", current->type.data(),current->name.data(),current->args.data()); current->section = Entry::FUNCTION_SEC ; current->proto = *yytext==';'; } } else // a global function prototype or function variable { - //printf("Scanner.l: prototype? type=`%s' name=`%s' args=`%s'\n",current->type.data(),current->name.data(),current->args.data()); + //printf("Scanner.l: prototype? type='%s' name='%s' args='%s'\n",current->type.data(),current->name.data(),current->args.data()); if (!current->type.isEmpty() && (current->type.find(re,0)!=-1 || current->type.left(8)=="typedef ")) { @@ -5147,7 +5147,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) current->proto = TRUE; } } - //printf("Adding entry `%s'\n",current->name.data()); + //printf("Adding entry '%s'\n",current->name.data()); if ( insidePHP) { if (findAndRemoveWord(current->type,"final")) @@ -5555,7 +5555,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) current->name=current->name.left(current->name.length()-1).stripWhiteSpace(); //printf("template class declaration for %s!\n",current->name.data()); QCString rn = current_root->name.copy(); - //printf("cn=`%s' rn=`%s' isTypedef=%d\n",cn.data(),rn.data(),isTypedef); + //printf("cn='%s' rn='%s' isTypedef=%d\n",cn.data(),rn.data(),isTypedef); if (!current->name.isEmpty() && !rn.isEmpty()) { prependScope(); diff --git a/src/tagreader.cpp b/src/tagreader.cpp index da2f3f1..56dbe7d 100644 --- a/src/tagreader.cpp +++ b/src/tagreader.cpp @@ -384,7 +384,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unknown compound attribute `%s' found!",kind.data()); + warn("Unknown compound attribute '%s' found!",kind.data()); m_state = Invalid; } if (isObjC=="yes" && m_curClass) @@ -412,7 +412,7 @@ class TagFileParser : public QXmlDefaultHandler case InPackage: m_tagFilePackages.append(m_curPackage); m_curPackage=0; break; default: - warn("tag `compound' was not expected!"); + warn("tag 'compound' was not expected!"); } } @@ -458,7 +458,7 @@ class TagFileParser : public QXmlDefaultHandler case InNamespace: m_curNamespace->members.append(m_curMember); break; case InGroup: m_curGroup->members.append(m_curMember); break; case InPackage: m_curPackage->members.append(m_curMember); break; - default: warn("Unexpected tag `member' found"); break; + default: warn("Unexpected tag 'member' found"); break; } } @@ -476,7 +476,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Found `enumvalue' tag outside of member tag"); + warn("Found 'enumvalue' tag outside of member tag"); } } @@ -504,7 +504,7 @@ class TagFileParser : public QXmlDefaultHandler case InMember: m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; case InPackage: m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; case InDir: m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; - default: warn("Unexpected tag `docanchor' found"); break; + default: warn("Unexpected tag 'docanchor' found"); break; } } @@ -517,7 +517,7 @@ class TagFileParser : public QXmlDefaultHandler case InNamespace: m_curNamespace->classList.append(m_curString); break; case InGroup: m_curGroup->classList.append(m_curString); break; case InPackage: m_curPackage->classList.append(m_curString); break; - default: warn("Unexpected tag `class' found"); break; + default: warn("Unexpected tag 'class' found"); break; } } @@ -528,7 +528,7 @@ class TagFileParser : public QXmlDefaultHandler case InNamespace: m_curNamespace->classList.append(m_curString); break; case InFile: m_curFile->namespaceList.append(m_curString); break; case InGroup: m_curGroup->namespaceList.append(m_curString); break; - default: warn("Unexpected tag `namespace' found"); break; + default: warn("Unexpected tag 'namespace' found"); break; } } @@ -538,7 +538,7 @@ class TagFileParser : public QXmlDefaultHandler { case InGroup: m_curGroup->fileList.append(m_curString); break; case InDir: m_curDir->fileList.append(m_curString); break; - default: warn("Unexpected tag `file' found"); break; + default: warn("Unexpected tag 'file' found"); break; } } @@ -547,7 +547,7 @@ class TagFileParser : public QXmlDefaultHandler switch(m_state) { case InGroup: m_curGroup->fileList.append(m_curString); break; - default: warn("Unexpected tag `page' found"); break; + default: warn("Unexpected tag 'page' found"); break; } } @@ -556,7 +556,7 @@ class TagFileParser : public QXmlDefaultHandler switch(m_state) { case InDir: m_curDir->subdirList.append(m_curString); break; - default: warn("Unexpected tag `dir' found"); break; + default: warn("Unexpected tag 'dir' found"); break; } } @@ -580,7 +580,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unexpected tag `type' found"); + warn("Unexpected tag 'type' found"); } } @@ -596,7 +596,7 @@ class TagFileParser : public QXmlDefaultHandler case InDir: m_curDir->name = m_curString; break; case InMember: m_curMember->name = m_curString; break; case InPackage: m_curPackage->name = m_curString; break; - default: warn("Unexpected tag `name' found"); break; + default: warn("Unexpected tag 'name' found"); break; } } @@ -630,7 +630,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unexpected tag `base' found"); + warn("Unexpected tag 'base' found"); } } @@ -642,7 +642,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unexpected tag `base' found"); + warn("Unexpected tag 'base' found"); } } @@ -659,7 +659,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unexpected tag `includes' found"); + warn("Unexpected tag 'includes' found"); } m_curString=""; } @@ -682,7 +682,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unexpected tag `templarg' found"); + warn("Unexpected tag 'templarg' found"); } } @@ -697,7 +697,7 @@ class TagFileParser : public QXmlDefaultHandler case InPage: m_curPage->filename = m_curString; break; case InPackage: m_curPackage->filename = m_curString; break; case InDir: m_curDir->filename = m_curString; break; - default: warn("Unexpected tag `filename' found"); break; + default: warn("Unexpected tag 'filename' found"); break; } } @@ -707,7 +707,7 @@ class TagFileParser : public QXmlDefaultHandler { case InFile: m_curFile->path = m_curString; break; case InDir: m_curDir->path = m_curString; break; - default: warn("Unexpected tag `path' found"); break; + default: warn("Unexpected tag 'path' found"); break; } } @@ -723,7 +723,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unexpected tag `anchor' found"); + warn("Unexpected tag 'anchor' found"); } } @@ -743,7 +743,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unexpected tag `clangid' found"); + warn("Unexpected tag 'clangid' found"); } } @@ -757,7 +757,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unexpected tag `anchorfile' found"); + warn("Unexpected tag 'anchorfile' found"); } } @@ -769,7 +769,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unexpected tag `arglist' found"); + warn("Unexpected tag 'arglist' found"); } } void endTitle() @@ -778,7 +778,7 @@ class TagFileParser : public QXmlDefaultHandler { case InGroup: m_curGroup->title = m_curString; break; case InPage: m_curPage->title = m_curString; break; - default: warn("Unexpected tag `title' found"); break; + default: warn("Unexpected tag 'title' found"); break; } } @@ -790,7 +790,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unexpected tag `subgroup' found"); + warn("Unexpected tag 'subgroup' found"); } } @@ -877,7 +877,7 @@ class TagFileParser : public QXmlDefaultHandler bool startElement( const QString&, const QString&, const QString&name, const QXmlAttributes& attrib ) { - //printf("startElement `%s'\n",name.data()); + //printf("startElement '%s'\n",name.data()); StartElementHandler *handler = m_startElementHandlers[name.utf8()]; if (handler) { @@ -885,14 +885,14 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unknown tag `%s' found!",name.data()); + warn("Unknown tag '%s' found!",name.data()); } return TRUE; } bool endElement( const QString&, const QString&, const QString& name ) { - //printf("endElement `%s'\n",name.data()); + //printf("endElement '%s'\n",name.data()); EndElementHandler *handler = m_endElementHandlers[name.utf8()]; if (handler) { @@ -900,7 +900,7 @@ class TagFileParser : public QXmlDefaultHandler } else { - warn("Unknown tag `%s' found!",name.data()); + warn("Unknown tag '%s' found!",name.data()); } return TRUE; } @@ -986,8 +986,8 @@ void TagFileParser::dump() TagClassInfo *cd; for (;(cd=lci.current());++lci) { - msg("class `%s'\n",cd->name.data()); - msg(" filename `%s'\n",cd->filename.data()); + msg("class '%s'\n",cd->name.data()); + msg(" filename '%s'\n",cd->filename.data()); if (cd->bases) { QListIterator bii(*cd->bases); @@ -1003,10 +1003,10 @@ void TagFileParser::dump() for (;(md=mci.current());++mci) { msg(" member:\n"); - msg(" kind: `%s'\n",md->kind.data()); - msg(" name: `%s'\n",md->name.data()); - msg(" anchor: `%s'\n",md->anchor.data()); - msg(" arglist: `%s'\n",md->arglist.data()); + msg(" kind: '%s'\n",md->kind.data()); + msg(" name: '%s'\n",md->name.data()); + msg(" anchor: '%s'\n",md->anchor.data()); + msg(" arglist: '%s'\n",md->arglist.data()); } } //============== NAMESPACES @@ -1014,8 +1014,8 @@ void TagFileParser::dump() TagNamespaceInfo *nd; for (;(nd=lni.current());++lni) { - msg("namespace `%s'\n",nd->name.data()); - msg(" filename `%s'\n",nd->filename.data()); + msg("namespace '%s'\n",nd->name.data()); + msg(" filename '%s'\n",nd->filename.data()); QCStringList::Iterator it; for ( it = nd->classList.begin(); it != nd->classList.end(); ++it ) @@ -1028,10 +1028,10 @@ void TagFileParser::dump() for (;(md=mci.current());++mci) { msg(" member:\n"); - msg(" kind: `%s'\n",md->kind.data()); - msg(" name: `%s'\n",md->name.data()); - msg(" anchor: `%s'\n",md->anchor.data()); - msg(" arglist: `%s'\n",md->arglist.data()); + msg(" kind: '%s'\n",md->kind.data()); + msg(" name: '%s'\n",md->name.data()); + msg(" anchor: '%s'\n",md->anchor.data()); + msg(" arglist: '%s'\n",md->arglist.data()); } } //============== FILES @@ -1039,8 +1039,8 @@ void TagFileParser::dump() TagFileInfo *fd; for (;(fd=lfi.current());++lfi) { - msg("file `%s'\n",fd->name.data()); - msg(" filename `%s'\n",fd->filename.data()); + msg("file '%s'\n",fd->name.data()); + msg(" filename '%s'\n",fd->filename.data()); QCStringList::Iterator it; for ( it = fd->namespaceList.begin(); it != fd->namespaceList.end(); ++it ) @@ -1058,10 +1058,10 @@ void TagFileParser::dump() for (;(md=mci.current());++mci) { msg(" member:\n"); - msg(" kind: `%s'\n",md->kind.data()); - msg(" name: `%s'\n",md->name.data()); - msg(" anchor: `%s'\n",md->anchor.data()); - msg(" arglist: `%s'\n",md->arglist.data()); + msg(" kind: '%s'\n",md->kind.data()); + msg(" name: '%s'\n",md->name.data()); + msg(" anchor: '%s'\n",md->anchor.data()); + msg(" arglist: '%s'\n",md->arglist.data()); } QListIterator mii(fd->includes); @@ -1077,8 +1077,8 @@ void TagFileParser::dump() TagGroupInfo *gd; for (;(gd=lgi.current());++lgi) { - msg("group `%s'\n",gd->name.data()); - msg(" filename `%s'\n",gd->filename.data()); + msg("group '%s'\n",gd->name.data()); + msg(" filename '%s'\n",gd->filename.data()); QCStringList::Iterator it; for ( it = gd->namespaceList.begin(); it != gd->namespaceList.end(); ++it ) @@ -1111,10 +1111,10 @@ void TagFileParser::dump() for (;(md=mci.current());++mci) { msg(" member:\n"); - msg(" kind: `%s'\n",md->kind.data()); - msg(" name: `%s'\n",md->name.data()); - msg(" anchor: `%s'\n",md->anchor.data()); - msg(" arglist: `%s'\n",md->arglist.data()); + msg(" kind: '%s'\n",md->kind.data()); + msg(" name: '%s'\n",md->name.data()); + msg(" anchor: '%s'\n",md->anchor.data()); + msg(" arglist: '%s'\n",md->arglist.data()); } } //============== PAGES @@ -1122,17 +1122,17 @@ void TagFileParser::dump() TagPageInfo *pd; for (;(pd=lpi.current());++lpi) { - msg("page `%s'\n",pd->name.data()); - msg(" title `%s'\n",pd->title.data()); - msg(" filename `%s'\n",pd->filename.data()); + msg("page '%s'\n",pd->name.data()); + msg(" title '%s'\n",pd->title.data()); + msg(" filename '%s'\n",pd->filename.data()); } //============== DIRS QListIterator ldi(m_tagFileDirs); TagDirInfo *dd; for (;(dd=ldi.current());++ldi) { - msg("dir `%s'\n",dd->name.data()); - msg(" path `%s'\n",dd->path.data()); + msg("dir '%s'\n",dd->name.data()); + msg(" path '%s'\n",dd->path.data()); QCStringList::Iterator it; for ( it = dd->fileList.begin(); it != dd->fileList.end(); ++it ) @@ -1527,7 +1527,7 @@ void TagFileParser::addIncludes() TagIncludeInfo *ii; for (;(ii=mii.current());++mii) { - //printf("ii->name=`%s'\n",ii->name.data()); + //printf("ii->name='%s'\n",ii->name.data()); FileName *ifn = Doxygen::inputNameDict->find(ii->name); ASSERT(ifn!=0); if (ifn) diff --git a/src/template.cpp b/src/template.cpp index b1435ce..228da4d 100644 --- a/src/template.cpp +++ b/src/template.cpp @@ -2832,7 +2832,7 @@ template class TemplateNodeCreator : public TemplateNode rootDir.setPath(QDir::currentDirPath()); if (!rootDir.mkdir(outputDir)) { - err("tag OUTPUT_DIRECTORY: Output directory `%s' does not " + err("tag OUTPUT_DIRECTORY: Output directory '%s' does not " "exist and cannot be created\n",outputDir.data()); return; } diff --git a/src/util.cpp b/src/util.cpp index a6ae004..944ce6a 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -184,7 +184,7 @@ QCString removeAnonymousScopes(const QCString &s) p=i+l; } result+=s.right(sl-p); - //printf("removeAnonymousScopes(`%s')=`%s'\n",s.data(),result.data()); + //printf("removeAnonymousScopes('%s')='%s'\n",s.data(),result.data()); return result; } @@ -210,7 +210,7 @@ QCString replaceAnonymousScopes(const QCString &s,const char *replacement) p=i+l; } result+=s.right(sl-p); - //printf("replaceAnonymousScopes(`%s')=`%s'\n",s.data(),result.data()); + //printf("replaceAnonymousScopes('%s')='%s'\n",s.data(),result.data()); return result; } @@ -241,7 +241,7 @@ QCString stripAnonymousNamespaceScope(const QCString &s) p=i+l; } done: - //printf("stripAnonymousNamespaceScope(`%s')=`%s'\n",s.data(),newScope.data()); + //printf("stripAnonymousNamespaceScope('%s')='%s'\n",s.data(),newScope.data()); return newScope; } @@ -383,7 +383,7 @@ QCString resolveTypeDef(const Definition *context,const QCString &qualifiedName, { // split-off scope part QCString resScopeName = qualifiedName.left(scopeIndex); - //printf("resScopeName=`%s'\n",resScopeName.data()); + //printf("resScopeName='%s'\n",resScopeName.data()); // look-up scope in context int is,ps=0; @@ -394,7 +394,7 @@ QCString resolveTypeDef(const Definition *context,const QCString &qualifiedName, QCString tmp = resolveTypeDef(mContext,qualScopePart); if (!tmp.isEmpty()) qualScopePart=tmp; resScope = resScope->findInnerCompound(qualScopePart); - //printf("qualScopePart=`%s' resScope=%p\n",qualScopePart.data(),resScope); + //printf("qualScopePart='%s' resScope=%p\n",qualScopePart.data(),resScope); if (resScope==0) break; ps=is+l; } @@ -444,7 +444,7 @@ QCString resolveTypeDef(const Definition *context,const QCString &qualifiedName, // step 3: get the member's type if (md) { - //printf(">>resolveTypeDef: Found typedef name `%s' in scope `%s' value=`%s' args='%s'\n", + //printf(">>resolveTypeDef: Found typedef name '%s' in scope '%s' value='%s' args='%s'\n", // qualifiedName.data(),context->name().data(),md->typeString(),md->argsString() // ); result=md->typeString(); @@ -461,7 +461,7 @@ QCString resolveTypeDef(const Definition *context,const QCString &qualifiedName, } else { - //printf(">>resolveTypeDef: Typedef `%s' not found in scope `%s'!\n", + //printf(">>resolveTypeDef: Typedef '%s' not found in scope '%s'!\n", // qualifiedName.data(),context ? context->name().data() : ""); } return result; @@ -2015,7 +2015,7 @@ void linkifyText(const TextGeneratorIntf &out, const Definition *scope, const char *text, bool autoBreak,bool external, bool keepSpaces,int indentLevel) { - //printf("linkify=`%s'\n",text); + //printf("linkify='%s'\n",text); static QRegExp regExp("[a-z_A-Z\\x80-\\xFF][~!a-z_A-Z0-9$\\\\.:\\x80-\\xFF]*"); static QRegExp regExpSplit("(?!:),"); QCString txtStr=text; @@ -2559,7 +2559,7 @@ QCString fileToString(const char *name,bool filter,bool isSourceCode) QFileInfo fi(name); if (!fi.exists() || !fi.isFile()) { - err("file `%s' not found\n",name); + err("file '%s' not found\n",name); return ""; } BufStr buf(fi.size()); @@ -2577,7 +2577,7 @@ QCString fileToString(const char *name,bool filter,bool isSourceCode) } if (!fileOpened) { - err("cannot open file `%s' for reading\n",name); + err("cannot open file '%s' for reading\n",name); } return ""; } @@ -2634,7 +2634,7 @@ QCString yearToString() //---------------------------------------------------------------------- // recursive function that returns the number of branches in the -// inheritance tree that the base class `bcd' is below the class `cd' +// inheritance tree that the base class 'bcd' is below the class 'cd' int minClassDistance(const ClassDef *cd,const ClassDef *bcd,int level) { @@ -2705,7 +2705,7 @@ exit: // printf("("); // for (;(a=ali.current());++ali) // { -// printf("t=`%s' n=`%s' v=`%s' ",a->type.data(),!a->name.isEmpty()>0?a->name.data():"",!a->defval.isEmpty()>0?a->defval.data():""); +// printf("t='%s' n='%s' v='%s' ",a->type.data(),!a->name.isEmpty()>0?a->name.data():"",!a->defval.isEmpty()>0?a->defval.data():""); // } // printf(")"); //} @@ -2851,7 +2851,7 @@ static QCString trimScope(const QCString &name,const QCString &s) { QCString tmp; QCString scope=name.left(scopeOffset)+"::"; - //printf("Trying with scope=`%s'\n",scope.data()); + //printf("Trying with scope='%s'\n",scope.data()); int i,p=0,l; while ((i=findScopePattern(scope,result,p,&l))!=-1) // for each occurrence @@ -2871,7 +2871,7 @@ static QCString trimScope(const QCString &name,const QCString &s) void trimBaseClassScope(BaseClassList *bcl,QCString &s,int level=0) { - //printf("trimBaseClassScope level=%d `%s'\n",level,s.data()); + //printf("trimBaseClassScope level=%d '%s'\n",level,s.data()); BaseClassListIterator bcli(*bcl); BaseClassDef *bcd; for (;(bcd=bcli.current());++bcli) @@ -2885,7 +2885,7 @@ void trimBaseClassScope(BaseClassList *bcl,QCString &s,int level=0) s.length()-spos-cd->name().length()-2 ); } - //printf("base class `%s'\n",cd->name().data()); + //printf("base class '%s'\n",cd->name().data()); if (cd->baseClasses()) trimBaseClassScope(cd->baseClasses(),s,level+1); } @@ -3042,7 +3042,7 @@ static bool matchArgument(const Argument *srcA,const Argument *dstA, NamespaceSDict *usingNamespaces, SDict *usingClasses) { - //printf("match argument start `%s|%s' <-> `%s|%s' using nsp=%p class=%p\n", + //printf("match argument start '%s|%s' <-> '%s|%s' using nsp=%p class=%p\n", // srcA->type.data(),srcA->name.data(), // dstA->type.data(),dstA->name.data(), // usingNamespaces, @@ -3104,7 +3104,7 @@ static bool matchArgument(const Argument *srcA,const Argument *dstA, //srcAType=stripTemplateSpecifiersFromScope(srcAType,FALSE); //dstAType=stripTemplateSpecifiersFromScope(dstAType,FALSE); - //printf("srcA=`%s|%s' dstA=`%s|%s'\n",srcAType.data(),srcAName.data(), + //printf("srcA='%s|%s' dstA='%s|%s'\n",srcAType.data(),srcAName.data(), // dstAType.data(),dstAName.data()); if (srcA->array!=dstA->array) // nomatch for char[] against char @@ -3129,7 +3129,7 @@ static bool matchArgument(const Argument *srcA,const Argument *dstA, { srcAType=trimScope(className,srcAType); dstAType=trimScope(className,dstAType); - //printf("trimScope: `%s' <=> `%s'\n",srcAType.data(),dstAType.data()); + //printf("trimScope: '%s' <=> '%s'\n",srcAType.data(),dstAType.data()); ClassDef *cd; if (!namespaceName.isEmpty()) cd=getClass(namespaceName+"::"+className); @@ -3140,7 +3140,7 @@ static bool matchArgument(const Argument *srcA,const Argument *dstA, trimBaseClassScope(cd->baseClasses(),srcAType); trimBaseClassScope(cd->baseClasses(),dstAType); } - //printf("trimBaseClassScope: `%s' <=> `%s'\n",srcAType.data(),dstAType.data()); + //printf("trimBaseClassScope: '%s' <=> '%s'\n",srcAType.data(),dstAType.data()); } if (!namespaceName.isEmpty()) { @@ -3233,7 +3233,7 @@ static bool matchArgument(const Argument *srcA,const Argument *dstA, while (dstPos> match argument: %s::`%s|%s' (%s) <-> %s::`%s|%s' (%s)\n", + //printf(">> match argument: %s::'%s|%s' (%s) <-> %s::'%s|%s' (%s)\n", // srcScope ? srcScope->name().data() : "", // srcA->type.data(),srcA->name.data(),srcA->canType.data(), // dstScope ? dstScope->name().data() : "", @@ -3857,7 +3857,7 @@ bool matchArguments2(const Definition *srcScope,const FileDef *srcFileScope,cons // pre: the types of the arguments in the list should match. void mergeArguments(ArgumentList *srcAl,ArgumentList *dstAl,bool forceNameOverwrite) { - //printf("mergeArguments `%s', `%s'\n", + //printf("mergeArguments '%s', '%s'\n", // argListToString(srcAl).data(),argListToString(dstAl).data()); if (srcAl==0 || dstAl==0 || srcAl->count()!=dstAl->count()) @@ -3871,12 +3871,12 @@ void mergeArguments(ArgumentList *srcAl,ArgumentList *dstAl,bool forceNameOverwr { if (srcA->defval.isEmpty() && !dstA->defval.isEmpty()) { - //printf("Defval changing `%s'->`%s'\n",srcA->defval.data(),dstA->defval.data()); + //printf("Defval changing '%s'->'%s'\n",srcA->defval.data(),dstA->defval.data()); srcA->defval=dstA->defval.copy(); } else if (!srcA->defval.isEmpty() && dstA->defval.isEmpty()) { - //printf("Defval changing `%s'->`%s'\n",dstA->defval.data(),srcA->defval.data()); + //printf("Defval changing '%s'->'%s'\n",dstA->defval.data(),srcA->defval.data()); dstA->defval=srcA->defval.copy(); } @@ -3898,15 +3898,15 @@ void mergeArguments(ArgumentList *srcAl,ArgumentList *dstAl,bool forceNameOverwr //printf("1. merging %s:%s <-> %s:%s\n",srcA->type.data(),srcA->name.data(),dstA->type.data(),dstA->name.data()); if (srcA->name.isEmpty() && !dstA->name.isEmpty()) { - //printf("type: `%s':=`%s'\n",srcA->type.data(),dstA->type.data()); - //printf("name: `%s':=`%s'\n",srcA->name.data(),dstA->name.data()); + //printf("type: '%s':='%s'\n",srcA->type.data(),dstA->type.data()); + //printf("name: '%s':='%s'\n",srcA->name.data(),dstA->name.data()); srcA->type = dstA->type.copy(); srcA->name = dstA->name.copy(); } else if (!srcA->name.isEmpty() && dstA->name.isEmpty()) { - //printf("type: `%s':=`%s'\n",dstA->type.data(),srcA->type.data()); - //printf("name: `%s':=`%s'\n",dstA->name.data(),srcA->name.data()); + //printf("type: '%s':='%s'\n",dstA->type.data(),srcA->type.data()); + //printf("name: '%s':='%s'\n",dstA->name.data(),srcA->name.data()); dstA->type = srcA->type.copy(); dstA->name = dstA->name.copy(); } @@ -3960,15 +3960,15 @@ void mergeArguments(ArgumentList *srcAl,ArgumentList *dstAl,bool forceNameOverwr j2=dstA->type.length()-i2-2; if (i1!=-1 && i2==-1 && srcA->type.right(j1)==dstA->type) { - //printf("type: `%s':=`%s'\n",dstA->type.data(),srcA->type.data()); - //printf("name: `%s':=`%s'\n",dstA->name.data(),srcA->name.data()); + //printf("type: '%s':='%s'\n",dstA->type.data(),srcA->type.data()); + //printf("name: '%s':='%s'\n",dstA->name.data(),srcA->name.data()); dstA->type = srcA->type.left(i1+2)+dstA->type; dstA->name = dstA->name.copy(); } else if (i1==-1 && i2!=-1 && dstA->type.right(j2)==srcA->type) { - //printf("type: `%s':=`%s'\n",srcA->type.data(),dstA->type.data()); - //printf("name: `%s':=`%s'\n",dstA->name.data(),srcA->name.data()); + //printf("type: '%s':='%s'\n",srcA->type.data(),dstA->type.data()); + //printf("name: '%s':='%s'\n",dstA->name.data(),srcA->name.data()); srcA->type = dstA->type.left(i2+2)+srcA->type; srcA->name = dstA->name.copy(); } @@ -3980,7 +3980,7 @@ void mergeArguments(ArgumentList *srcAl,ArgumentList *dstAl,bool forceNameOverwr { dstA->docs = srcA->docs.copy(); } - //printf("Merge argument `%s|%s' `%s|%s'\n", + //printf("Merge argument '%s|%s' '%s|%s'\n", // srcA->type.data(),srcA->name.data(), // dstA->type.data(),dstA->name.data()); } @@ -3994,7 +3994,7 @@ static void findMembersWithSpecificName(MemberName *mn, const char *forceTagFile, QList &members) { - //printf(" Function with global scope name `%s' args=`%s'\n", + //printf(" Function with global scope name '%s' args='%s'\n", // mn->memberName(),args); MemberNameIterator mli(*mn); const MemberDef *md = 0; @@ -4002,7 +4002,7 @@ static void findMembersWithSpecificName(MemberName *mn, { const FileDef *fd=md->getFileDef(); const GroupDef *gd=md->getGroupDef(); - //printf(" md->name()=`%s' md->args=`%s' fd=%p gd=%p current=%p ref=%s\n", + //printf(" md->name()='%s' md->args='%s' fd=%p gd=%p current=%p ref=%s\n", // md->name().data(),args,fd,gd,currentFile,md->getReference().data()); if ( ((gd && gd->isLinkable()) || (fd && fd->isLinkable()) || md->isReference()) && @@ -4034,11 +4034,11 @@ static void findMembersWithSpecificName(MemberName *mn, } /*! - * Searches for a member definition given its name `memberName' as a string. + * Searches for a member definition given its name 'memberName' as a string. * memberName may also include a (partial) scope to indicate the scope * in which the member is located. * - * The parameter `scName' is a string representing the name of the scope in + * The parameter 'scName' is a string representing the name of the scope in * which the link was found. * * In case of a function args contains a string representation of the @@ -4047,12 +4047,12 @@ static void findMembersWithSpecificName(MemberName *mn, * * The function returns TRUE if the member is known and documented or * FALSE if it is not. - * If TRUE is returned parameter `md' contains a pointer to the member - * definition. Furthermore exactly one of the parameter `cd', `nd', or `fd' + * If TRUE is returned parameter 'md' contains a pointer to the member + * definition. Furthermore exactly one of the parameter 'cd', 'nd', or 'fd' * will be non-zero: - * - if `cd' is non zero, the member was found in a class pointed to by cd. - * - if `nd' is non zero, the member was found in a namespace pointed to by nd. - * - if `fd' is non zero, the member was found in the global namespace of + * - if 'cd' is non zero, the member was found in a class pointed to by cd. + * - if 'nd' is non zero, the member was found in a namespace pointed to by nd. + * - if 'fd' is non zero, the member was found in the global namespace of * file fd. */ bool getDefs(const QCString &scName, @@ -4107,7 +4107,7 @@ bool getDefs(const QCString &scName, // handle special the case where both scope name and member scope are equal if (mScope==scopeName) scopeName.resize(0); - //printf("mScope=`%s' mName=`%s'\n",mScope.data(),mName.data()); + //printf("mScope='%s' mName='%s'\n",mScope.data(),mName.data()); MemberName *mn = Doxygen::memberNameSDict->find(mName); //printf("mName=%s mn=%p\n",mName.data(),mn); @@ -4308,7 +4308,7 @@ bool getDefs(const QCString &scName, // maybe an namespace, file or group member ? - //printf("Testing for global symbol scopeName=`%s' mScope=`%s' :: mName=`%s'\n", + //printf("Testing for global symbol scopeName='%s' mScope='%s' :: mName='%s'\n", // scopeName.data(),mScope.data(),mName.data()); if ((mn=Doxygen::functionNameSDict->find(mName))) // name is known { @@ -4332,7 +4332,7 @@ bool getDefs(const QCString &scName, fnd->isLinkable() ) { - //printf("Symbol inside existing namespace `%s' count=%d\n", + //printf("Symbol inside existing namespace '%s' count=%d\n", // namespaceName.data(),mn->count()); bool found=FALSE; MemberNameIterator mmli(*mn); @@ -4473,8 +4473,8 @@ bool getDefs(const QCString &scName, MemberNameIterator mni(*mn); for (mni.toLast();(md=mni.current());--mni) { - //printf("Found member `%s'\n",md->name().data()); - //printf("member is linkable md->name()=`%s'\n",md->name().data()); + //printf("Found member '%s'\n",md->name().data()); + //printf("member is linkable md->name()='%s'\n",md->name().data()); fd=md->getFileDef(); gd=md->getGroupDef(); const MemberDef *tmd = md->getEnumScope(); @@ -4547,7 +4547,7 @@ static bool getScopeDefs(const char *docScope,const char *scope, cd=0;nd=0; QCString scopeName=scope; - //printf("getScopeDefs: docScope=`%s' scope=`%s'\n",docScope,scope); + //printf("getScopeDefs: docScope='%s' scope='%s'\n",docScope,scope); if (scopeName.isEmpty()) return FALSE; bool explicitGlobalScope=FALSE; @@ -4808,10 +4808,10 @@ QCString linkToText(SrcLangExt lang,const char *link,bool isFileName) #if 0 /* * generate a reference to a class, namespace or member. - * `scName' is the name of the scope that contains the documentation + * 'scName' is the name of the scope that contains the documentation * string that is returned. - * `name' is the name that we want to link to. - * `name' may have five formats: + * 'name' is the name that we want to link to. + * 'name' may have the following formats: * 1) "ScopeName" * 2) "memberName()" one of the (overloaded) function or define * with name memberName. @@ -4983,8 +4983,8 @@ bool resolveLink(/* in */ const char *scName, //---------------------------------------------------------------------- // General function that generates the HTML code for a reference to some -// file, class or member from text `lr' within the context of class `clName'. -// This link has the text 'lt' (if not 0), otherwise `lr' is used as a +// file, class or member from text 'lr' within the context of class 'clName'. +// This link has the text 'lt' (if not 0), otherwise 'lr' is used as a // basis for the link's text. // returns TRUE if a link could be generated. @@ -5719,7 +5719,7 @@ done: className=namespaceName.copy(); namespaceName.resize(0); } - //printf("extractNamespace `%s' => `%s|%s'\n",scopeName.data(), + //printf("extractNamespace '%s' => '%s|%s'\n",scopeName.data(), // className.data(),namespaceName.data()); if (/*className.right(2)=="-g" ||*/ className.right(2)=="-p") { @@ -5740,7 +5740,7 @@ QCString insertTemplateSpecifierInScope(const QCString &scope,const QCString &te ((cd=getClass(scope.left(si)))==0 || cd->templateArguments()==0) ) { - //printf("Tried `%s'\n",(scope.left(si)+templ).data()); + //printf("Tried '%s'\n",(scope.left(si)+templ).data()); pi=si+2; } if (si==-1) // not nested => append template specifier @@ -5752,7 +5752,7 @@ QCString insertTemplateSpecifierInScope(const QCString &scope,const QCString &te result=scope.left(si) + templ + scope.right(scope.length()-si); } } - //printf("insertTemplateSpecifierInScope(`%s',`%s')=%s\n", + //printf("insertTemplateSpecifierInScope('%s','%s')=%s\n", // scope.data(),templ.data(),result.data()); return result; } @@ -6672,7 +6672,7 @@ PageDef *addRelatedPage(const char *name,const QCString &ptitle, { // append documentation block to the page. pd->setDocumentation(doc,fileName,startLine); - //printf("Adding page docs `%s' pi=%p name=%s\n",doc.data(),pd,name); + //printf("Adding page docs '%s' pi=%p name=%s\n",doc.data(),pd,name); // append (x)refitems to the page. pd->setRefItems(sli); } @@ -6696,7 +6696,7 @@ PageDef *addRelatedPage(const char *name,const QCString &ptitle, pd->setFileName(tagInfo->fileName); } - //printf("Appending page `%s'\n",baseName.data()); + //printf("Appending page '%s'\n",baseName.data()); Doxygen::pageSDict->append(baseName,pd); if (gd) gd->addPage(pd); @@ -6731,7 +6731,7 @@ PageDef *addRelatedPage(const char *name,const QCString &ptitle, { si=new SectionInfo( file,-1,pd->name(),pd->title(),SectionInfo::Page,0,pd->getReference()); - //printf("si->label=`%s' si->definition=%s si->fileName=`%s'\n", + //printf("si->label='%s' si->definition=%s si->fileName='%s'\n", // si->label.data(),si->definition?si->definition->name().data():"", // si->fileName.data()); //printf(" SectionInfo: sec=%p sec->fileName=%s\n",si,si->fileName.data()); @@ -8129,8 +8129,8 @@ QCString filterTitle(const QCString &title) } //---------------------------------------------------------------------------- -// returns TRUE if the name of the file represented by `fi' matches -// one of the file patterns in the `patList' list. +// returns TRUE if the name of the file represented by 'fi' matches +// one of the file patterns in the 'patList' list. bool patternMatch(const QFileInfo &fi,const QStrList *patList) { @@ -8164,7 +8164,7 @@ bool patternMatch(const QFileInfo &fi,const QStrList *patList) re.match(fp)!=-1 || re.match(afp)!=-1; if (found) break; - //printf("Matching `%s' against pattern `%s' found=%d\n", + //printf("Matching '%s' against pattern '%s' found=%d\n", // fi->fileName().data(),pattern.data(),found); } } diff --git a/src/vhdlcode.l b/src/vhdlcode.l index 7c6cfa4..5f668c6 100644 --- a/src/vhdlcode.l +++ b/src/vhdlcode.l @@ -347,7 +347,7 @@ static void writeWord(const char *word,const char* curr_class=0,bool classLink=F }// writeWord -/*! write a code fragment `text' that may span multiple lines, inserting +/*! write a code fragment 'text' that may span multiple lines, inserting * line numbers for each line. */ static void codifyLines(const char *text,const char *cl=0,bool classlink=FALSE,bool comment=FALSE) diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp index 1005719..5e190da 100644 --- a/src/xmldocvisitor.cpp +++ b/src/xmldocvisitor.cpp @@ -404,7 +404,7 @@ void XmlDocVisitor::visit(DocInclude *inc) void XmlDocVisitor::visit(DocIncOperator *op) { - //printf("DocIncOperator: type=%d first=%d, last=%d text=`%s'\n", + //printf("DocIncOperator: type=%d first=%d, last=%d text='%s'\n", // op->type(),op->isFirst(),op->isLast(),op->text().data()); if (op->isFirst()) { diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index fe324be..cdb0f02 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -566,7 +566,7 @@ static void generateXMLForMember(const MemberDef *md,FTextStream &ti,FTextStream { t << memberOutputFileBase(md); } - t << "_1" // encoded `:' character (see util.cpp:convertNameToFile) + t << "_1" // encoded ':' character (see util.cpp:convertNameToFile) << md->anchor(); t << "\" prot=\""; switch(md->protection()) -- cgit v0.12