Merge branch 'feature/bug_endblock_msg' of https://github.com/albert-github/doxygen into albert-github-feature/bug_endblock_msg

8 files changed, 33 insertions, 33 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 T> 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 0f51792..077c8fb 100644
--- a/addon/doxmlparser/src/compoundhandler.cpp
+++ b/addon/doxmlparser/src/compoundhandler.cpp
@@ -153,7 +153,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;
@@ -326,7 +326,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()
@@ -346,7 +346,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)
@@ -413,7 +413,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());
@@ -443,7 +443,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 ac56229..a1ba216 100644
--- a/addon/doxmlparser/src/mainhandler.cpp
+++ b/addon/doxmlparser/src/mainhandler.cpp
@@ -172,12 +172,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<MemberEntry> 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 075cc73..b6cc31e 100644
--- a/addon/doxmlparser/src/sectionhandler.cpp
+++ b/addon/doxmlparser/src/sectionhandler.cpp
@@ -70,7 +70,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;
@@ -112,7 +112,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)
@@ -143,7 +143,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)