summaryrefslogtreecommitdiffstats
path: root/src/layout.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2021-04-23 18:47:24 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2021-04-23 18:47:24 (GMT)
commitd8e447d81fc5b95c59428743585993811d792b66 (patch)
treea649a077d540af6ce7f08c29ae5d5dc91478fbdb /src/layout.cpp
parentf4222fde7a6fbccf33a9f5c7dabf701bcb47610f (diff)
downloadDoxygen-d8e447d81fc5b95c59428743585993811d792b66.zip
Doxygen-d8e447d81fc5b95c59428743585993811d792b66.tar.gz
Doxygen-d8e447d81fc5b95c59428743585993811d792b66.tar.bz2
Fix problem comparing a QCString with a const char * null pointer
Diffstat (limited to 'src/layout.cpp')
-rw-r--r--src/layout.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/layout.cpp b/src/layout.cpp
index 49405aa..7c368be 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp
@@ -110,7 +110,7 @@ LayoutNavEntry *LayoutNavEntry::find(LayoutNavEntry::Kind kind,
// root in case an entry is in the tree twice
result = entry->find(kind,file);
if (result) return result;
- if (entry->kind()==kind && (file==0 || entry->baseFile()==file))
+ if (entry->kind()==kind && (file==QCString() || entry->baseFile()==file))
{
return entry.get();
}
@@ -1559,7 +1559,7 @@ void LayoutDocManager::init()
XMLParser parser(handlers);
layoutParser.setDocumentLocator(&parser);
QCString layout_default = ResourceMgr::instance().getAsString("layout_default.xml");
- parser.parse("layout_default.xml",qPrint(layout_default),Debug::isFlagSet(Debug::Lex));
+ parser.parse("layout_default.xml",layout_default.data(),Debug::isFlagSet(Debug::Lex));
}
LayoutDocManager::~LayoutDocManager()