Release-1.8.1.2

7 files changed, 28 insertions, 28 deletions

diff --git a/addon/doxmlparser/src/basehandler.h b/addon/doxmlparser/src/basehandler.h
index b1bfe87..edb4580 100644
--- a/addon/doxmlparser/src/basehandler.h
+++ b/addon/doxmlparser/src/basehandler.h
@@ -79,7 +79,7 @@ template<class T> class ElementMapper
     typedef StartElementHandler StartElementHandlerT;
     typedef EndElementHandler   EndElementHandlerT;
 	  
-	ElementMapper() : m_startHandlers(67), m_endHandlers(67)
+    ElementMapper() : m_startHandlers(67), m_endHandlers(67)
     {
       m_startHandlers.setAutoDelete(TRUE);
       m_endHandlers.setAutoDelete(TRUE);
@@ -132,7 +132,7 @@ template<class T> class BaseHandler : public QXmlDefaultHandler,
     typedef typename ElementMapper<T>::StartElementHandlerT StartElementHandlerT;
     typedef typename ElementMapper<T>::EndElementHandlerT EndElementHandlerT;
 
-    BaseHandler() : m_delegateHandler(0), m_fallBackHandler(0)
+    BaseHandler() : m_skipCount(0), m_delegateHandler(0), m_fallBackHandler(0)
     {
     }
 
@@ -165,7 +165,7 @@ template<class T> class BaseHandler : public QXmlDefaultHandler,
         return TRUE; 
       }
 
-      StartElementHandlerT *handler = ElementMapper<T>::m_startHandlers[name];
+      StartElementHandlerT *handler = ElementMapper<T>::m_startHandlers[name.utf8()];
       if (handler)
       {
         (*handler)(attrib);
@@ -205,7 +205,7 @@ template<class T> class BaseHandler : public QXmlDefaultHandler,
       }
       else if (m_skipUntil.isEmpty())
       {
-        EndElementHandlerT *handler = ElementMapper<T>::m_endHandlers[name];
+        EndElementHandlerT *handler = ElementMapper<T>::m_endHandlers[name.utf8()];
         if (handler)
         {
           (*handler)();
@@ -301,7 +301,7 @@ template<class T> class BaseFallBackHandler : public ElementMapper<T>,
     bool handleStartElement(const QString & name, 
                                     const QXmlAttributes & attrib)
     {
-      StartElementHandlerT *handler = ElementMapper<T>::m_startHandlers[name];
+      StartElementHandlerT *handler = ElementMapper<T>::m_startHandlers[name.utf8()];
       if (handler)
       {
         (*handler)(attrib);
@@ -311,7 +311,7 @@ template<class T> class BaseFallBackHandler : public ElementMapper<T>,
     }
     bool handleEndElement(const QString &name)
     {
-      EndElementHandlerT *handler = ElementMapper<T>::m_endHandlers[name];
+      EndElementHandlerT *handler = ElementMapper<T>::m_endHandlers[name.utf8()];
       if (handler)
       {
         (*handler)();
diff --git a/addon/doxmlparser/src/compoundhandler.cpp b/addon/doxmlparser/src/compoundhandler.cpp
index 42acc0e..78fe10a 100644
--- a/addon/doxmlparser/src/compoundhandler.cpp
+++ b/addon/doxmlparser/src/compoundhandler.cpp
@@ -79,7 +79,7 @@ class CompoundIdIterator : public ICompoundIterator,
     virtual ICompound *current() const
     { 
       QString *id = QListIterator<QString>::current(); 
-      return id ? m_mainHandler->compoundById(*id) : 0;
+      return id ? m_mainHandler->compoundById(id->utf8()) : 0;
     }
     virtual void release()
     { delete this; }
@@ -92,7 +92,7 @@ class CompoundIdIterator : public ICompoundIterator,
 
 ICompound *RelatedCompound::compound() const 
 { 
-  return m_parent->m_mainHandler->compoundById(m_id); 
+  return m_parent->m_mainHandler->compoundById(m_id.utf8()); 
 }
 
 //----------------------------------------------------------------------------
@@ -149,7 +149,7 @@ class CompoundTypeMap
     }
     ICompound::CompoundKind map(const QString &s)
     {
-      int *val = m_map.find(s);
+      int *val = m_map.find(s.utf8());
       if (val==0) 
       {
         debug(1,"Warning: `%s' is an invalid compound type\n",s.data());
diff --git a/addon/doxmlparser/src/dochandler.cpp b/addon/doxmlparser/src/dochandler.cpp
index f277094..535889f 100644
--- a/addon/doxmlparser/src/dochandler.cpp
+++ b/addon/doxmlparser/src/dochandler.cpp
@@ -2043,11 +2043,11 @@ DocSectionHandler::DocSectionHandler(IBaseHandler *parent,int level)
   if (level<6) 
   {
     sectionKey.sprintf("sect%d",level+1);
-    addStartHandler(sectionKey,this,&DocSectionHandler::startSubSection);
+    addStartHandler(sectionKey.utf8(),this,&DocSectionHandler::startSubSection);
   }
   addStartHandler("internal",this,&DocSectionHandler::startInternal);
   sectionKey.sprintf("sect%d",level);
-  addEndHandler(sectionKey,this,&DocSectionHandler::endDocSection);
+  addEndHandler(sectionKey.utf8(),this,&DocSectionHandler::endDocSection);
 }
 
 DocSectionHandler::~DocSectionHandler()
@@ -2120,7 +2120,7 @@ DocInternalHandler::DocInternalHandler(IBaseHandler *parent,int level)
   addStartHandler("para",this,&DocInternalHandler::startParagraph);
   QString sectionKey;
   sectionKey.sprintf("sect%d",level+1);
-  addStartHandler(sectionKey,this,&DocInternalHandler::startSubSection);
+  addStartHandler(sectionKey.utf8(),this,&DocInternalHandler::startSubSection);
   addEndHandler("internal",this,&DocInternalHandler::endInternal);
 }
 
diff --git a/addon/doxmlparser/src/graphhandler.cpp b/addon/doxmlparser/src/graphhandler.cpp
index 7816970..de30923 100644
--- a/addon/doxmlparser/src/graphhandler.cpp
+++ b/addon/doxmlparser/src/graphhandler.cpp
@@ -64,7 +64,7 @@ void GraphHandler::startNode(const QXmlAttributes &attrib)
   NodeHandler *n = new NodeHandler(this);
   n->startNode(attrib);
   m_nodes.append(n);
-  m_nodeDict->insert(attrib.value("id"),n);
+  m_nodeDict->insert(attrib.value("id").utf8(),n);
 }
 
 INodeIterator *GraphHandler::nodes() const
@@ -74,7 +74,7 @@ INodeIterator *GraphHandler::nodes() const
 
 NodeHandler *GraphHandler::getNodeById(const QString &id) const
 {
-  return m_nodeDict->find(id);
+  return m_nodeDict->find(id.utf8());
 }
 
 //------------------------------------------------------------------------
diff --git a/addon/doxmlparser/src/mainhandler.cpp b/addon/doxmlparser/src/mainhandler.cpp
index bc211b8..1124b3d 100644
--- a/addon/doxmlparser/src/mainhandler.cpp
+++ b/addon/doxmlparser/src/mainhandler.cpp
@@ -77,7 +77,7 @@ class CompoundEntryIterator : public ICompoundIterator,
     virtual ICompound *current() const
     { 
       CompoundEntry *ch = QListIterator<CompoundEntry>::current(); 
-      return ch ? m_mainHandler->compoundById(ch->id) : 0;
+      return ch ? m_mainHandler->compoundById(ch->id.utf8()) : 0;
     }
     virtual void release()
     { delete this; }
@@ -116,7 +116,7 @@ void MainHandler::startCompound(const QXmlAttributes& attrib)
   m_curCompound = new CompoundEntry(257);
   m_curCompound->id = attrib.value("refid");
   m_compounds.append(m_curCompound);
-  m_compoundDict.insert(m_curCompound->id,m_curCompound);
+  m_compoundDict.insert(m_curCompound->id.utf8(),m_curCompound);
 }
 
 void MainHandler::startName(const QXmlAttributes& /*attrib*/)
@@ -133,7 +133,7 @@ void MainHandler::endName()
   else
   {
     m_curCompound->name = m_curString;
-    m_compoundNameDict.insert(m_curString,m_curCompound);
+    m_compoundNameDict.insert(m_curString.utf8(),m_curCompound);
   }
 }
 
@@ -143,17 +143,17 @@ void MainHandler::startMember(const QXmlAttributes& attrib)
   m_curMember = new MemberEntry;
   m_curMember->id = attrib.value("refid");
   m_curMember->compound = m_curCompound;
-  m_memberDict.insert(m_curMember->id,m_curMember);
+  m_memberDict.insert(m_curMember->id.utf8(),m_curMember);
 }
 
 void MainHandler::endMember()
 {
-  m_curCompound->memberDict.insert(m_curMember->name,m_curMember);
+  m_curCompound->memberDict.insert(m_curMember->name.utf8(),m_curMember);
   QList<CompoundEntry> *cel=0;
-  if ((cel=m_memberNameDict.find(m_curMember->name))==0)
+  if ((cel=m_memberNameDict.find(m_curMember->name.utf8()))==0)
   {
     cel = new QList<CompoundEntry>;
-    m_memberNameDict.insert(m_curMember->name,cel);
+    m_memberNameDict.insert(m_curMember->name.utf8(),cel);
   }
   cel->append(m_curCompound);
   m_insideMember = FALSE;
@@ -210,13 +210,13 @@ ICompound *MainHandler::compoundById(const char *id) const
 {
   QString ids = id;
   if (ids.isEmpty()) return 0;
-  CompoundHandler *ch = m_compoundsLoaded[ids];
+  CompoundHandler *ch = m_compoundsLoaded[ids.utf8()];
   if (ch) // compound already in memory
   {
     ch->addref(); // returning alias -> increase reference counter
     return ch->toICompound(); 
   }
-  CompoundEntry *ce = m_compoundDict.find(ids);
+  CompoundEntry *ce = m_compoundDict.find(ids.utf8());
   if (ce==0) return 0; // id not found
   // create and load a new compound
   ch = new CompoundHandler(m_xmlDirName);
@@ -249,7 +249,7 @@ ICompound *MainHandler::compoundByName(const char *name) const
   if (nameStr.isEmpty()) return 0;
   CompoundEntry *ce = m_compoundNameDict[name];
   if (ce==0) return 0; // name not found
-  return compoundById(ce->id);
+  return compoundById(ce->id.utf8());
 }
 
 ICompound *MainHandler::memberById(const char *id) const
@@ -258,7 +258,7 @@ ICompound *MainHandler::memberById(const char *id) const
   if (ids.isEmpty()) return 0;
   MemberEntry *me = m_memberDict[id];
   if (me==0) return 0; // id not found
-  return compoundById(me->compound->id);
+  return compoundById(me->compound->id.utf8());
 }
 
 ICompoundIterator *MainHandler::memberByName(const char *name) const
diff --git a/addon/doxmlparser/src/memberhandler.cpp b/addon/doxmlparser/src/memberhandler.cpp
index 1b87a2c..303e556 100644
--- a/addon/doxmlparser/src/memberhandler.cpp
+++ b/addon/doxmlparser/src/memberhandler.cpp
@@ -45,7 +45,7 @@ class MemberTypeMap
     }
     IMember::MemberKind map(const QString &s)
     {
-      int *val = m_map.find(s);
+      int *val = m_map.find(s.utf8());
       if (val==0) 
       {
         debug(1,"Warning: `%s' is an invalid member type\n",s.data());
@@ -312,7 +312,7 @@ void MemberHandler::startLocation(const QXmlAttributes& attrib)
 {
   m_defFile = attrib.value("file");
   m_bodyFile = attrib.value("bodyfile");
-  QCString s;
+  QString s;
   s = attrib.value("line");
   if (!s.isEmpty()) m_defLine=s.toInt();
   s = attrib.value("bodystart");
diff --git a/addon/doxmlparser/src/sectionhandler.cpp b/addon/doxmlparser/src/sectionhandler.cpp
index f9bf147..8b3d9f2 100644
--- a/addon/doxmlparser/src/sectionhandler.cpp
+++ b/addon/doxmlparser/src/sectionhandler.cpp
@@ -65,7 +65,7 @@ class SectionTypeMap
     }
     ISection::SectionKind map(const QString &s)
     {
-      int *val = m_map.find(s);
+      int *val = m_map.find(s.utf8());
       if (val==0) 
       {
         debug(1,"Warning: `%s' is an invalid section type\n",s.data());