diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2008-08-19 13:23:22 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2008-08-19 13:23:22 (GMT) |
| commit | 5dfd148b5f3dfe5db7691b8dca017c828e800a3c (patch) | |
| tree | f3b6964844667670f731ee30328142b6eb54ce4f /addon | |
| parent | 6bf92c5d7efffb6a04c3ccbfc144ad944200fed2 (diff) | |
| download | Doxygen-5dfd148b5f3dfe5db7691b8dca017c828e800a3c.zip Doxygen-5dfd148b5f3dfe5db7691b8dca017c828e800a3c.tar.gz Doxygen-5dfd148b5f3dfe5db7691b8dca017c828e800a3c.tar.bz2 | |
Release-1.5.6-20080819
Diffstat (limited to 'addon')
| -rw-r--r-- | addon/doxmlparser/include/doxmlintf.h | 2 | ||||
| -rw-r--r-- | addon/doxmlparser/src/dochandler.cpp | 1 | ||||
| -rw-r--r-- | addon/doxmlparser/src/mainhandler.cpp | 6 | ||||
| -rw-r--r-- | addon/doxmlparser/src/stringimpl.h | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/addon/doxmlparser/include/doxmlintf.h b/addon/doxmlparser/include/doxmlintf.h index 79d7bc7..88cb2e3 100644 --- a/addon/doxmlparser/include/doxmlintf.h +++ b/addon/doxmlparser/include/doxmlintf.h @@ -45,6 +45,8 @@ class IString VIRTUAL_DESTRUCTOR(IString) /*! Returns a latin1 character representation of the string. */ virtual const char *latin1() const = 0; + /*! Returns a utf8 character representation of the string. */ + virtual const char *utf8() const = 0; /*! Returns a 16-bit unicode character representation of the character at * position \a index in the string. The first character is at index 0. */ diff --git a/addon/doxmlparser/src/dochandler.cpp b/addon/doxmlparser/src/dochandler.cpp index 07971c3..ce7cb3f 100644 --- a/addon/doxmlparser/src/dochandler.cpp +++ b/addon/doxmlparser/src/dochandler.cpp @@ -1118,7 +1118,6 @@ void HighlightHandler::startSpace(const QXmlAttributes&) void HighlightHandler::addTextNode() { - printf("m_curString=`%s'\n",m_curString.data()); if (!m_curString.isEmpty()) { m_children.append(new TextNode(m_curString,IDocMarkup::Normal,0)); diff --git a/addon/doxmlparser/src/mainhandler.cpp b/addon/doxmlparser/src/mainhandler.cpp index 0ac0fe9..81d7d2f 100644 --- a/addon/doxmlparser/src/mainhandler.cpp +++ b/addon/doxmlparser/src/mainhandler.cpp @@ -148,12 +148,12 @@ void MainHandler::startMember(const QXmlAttributes& attrib) void MainHandler::endMember() { - m_curCompound->memberDict.insert(m_curString,m_curMember); + m_curCompound->memberDict.insert(m_curMember->name,m_curMember); QList<CompoundEntry> *cel=0; - if ((cel=m_memberNameDict.find(m_curString))==0) + if ((cel=m_memberNameDict.find(m_curMember->name))==0) { cel = new QList<CompoundEntry>; - m_memberNameDict.insert(m_curString,cel); + m_memberNameDict.insert(m_curMember->name,cel); } cel->append(m_curCompound); m_insideMember = FALSE; diff --git a/addon/doxmlparser/src/stringimpl.h b/addon/doxmlparser/src/stringimpl.h index ac4ee12..013858f 100644 --- a/addon/doxmlparser/src/stringimpl.h +++ b/addon/doxmlparser/src/stringimpl.h @@ -16,6 +16,8 @@ class StringImpl : public QString, public IString // IString const char *latin1() const { return QString::latin1(); } + const char *utf8() const + { return QString::utf8(); } unsigned short unicodeCharAt(int index) const { return QString::unicode()[index].unicode(); } bool isEmpty() const |