summaryrefslogtreecommitdiffstats
path: root/src/layout.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2012-04-08 14:16:03 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2012-04-08 14:16:03 (GMT)
commit17ee30b327bf4f07f2411a50a46f5467456beacf (patch)
treeffd092e761289b417363c0562ceb9b93b88f19a4 /src/layout.cpp
parent0039b4f79ad7e628dcab61e1d82f26fb8fa11cfe (diff)
downloadDoxygen-17ee30b327bf4f07f2411a50a46f5467456beacf.zip
Doxygen-17ee30b327bf4f07f2411a50a46f5467456beacf.tar.gz
Doxygen-17ee30b327bf4f07f2411a50a46f5467456beacf.tar.bz2
Release-1.8.0-20120408
Diffstat (limited to 'src/layout.cpp')
-rw-r--r--src/layout.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/layout.cpp b/src/layout.cpp
index b4a94f2..ecf4340 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp
@@ -937,13 +937,13 @@ class LayoutParser : public QXmlDefaultHandler
theTranslator->trFileMembersDescription(extractAll),
"globals"
},
- { "dirs",
- LayoutNavEntry::Dirs,
- theTranslator->trDirectories(),
- QCString(),
- theTranslator->trDirDescription(),
- "dirs"
- },
+ //{ "dirs",
+ // LayoutNavEntry::Dirs,
+ // theTranslator->trDirectories(),
+ // QCString(),
+ // theTranslator->trDirDescription(),
+ // "dirs"
+ //},
{ "examples",
LayoutNavEntry::Examples,
theTranslator->trExamples(),
@@ -1154,7 +1154,7 @@ class LayoutParser : public QXmlDefaultHandler
const QString& name, const QXmlAttributes& attrib )
{
//printf("startElement [%s]::[%s]\n",m_scope.data(),name.data());
- StartElementHandler *handler = m_sHandler[m_scope+name];
+ StartElementHandler *handler = m_sHandler[m_scope+name.utf8()];
if (handler)
{
(*handler)(attrib);
@@ -1170,13 +1170,13 @@ class LayoutParser : public QXmlDefaultHandler
{
//printf("endElement [%s]::[%s]\n",m_scope.data(),name.data());
EndElementHandler *handler;
- if (!m_scope.isEmpty() && m_scope.right(name.length()+1)==name+"/")
+ if (!m_scope.isEmpty() && m_scope.right(name.length()+1)==name.utf8()+"/")
{ // element ends current scope
handler = m_eHandler[m_scope.left(m_scope.length()-1)];
}
else // continue with current scope
{
- handler = m_eHandler[m_scope+name];
+ handler = m_eHandler[m_scope+name.utf8()];
}
if (handler)
{
@@ -1194,7 +1194,7 @@ class LayoutParser : public QXmlDefaultHandler
QDict<StartElementHandler> m_sHandler;
QDict<EndElementHandler> m_eHandler;
- QString m_scope;
+ QCString m_scope;
int m_part;
LayoutNavEntry *m_rootNav;
bool m_invalidEntry;