diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-04-28 18:58:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 18:58:23 (GMT) |
| commit | 200c31bf342c533de77fede161e18e395c5ce875 (patch) | |
| tree | ab3e4df7e6d88c5907d89fc8ef66fcd28738ae20 /src/layout.h | |
| parent | b95b4766c7107e9b3ff0969534fe54c131412249 (diff) | |
| parent | a9f40a48c99af952836a3871e60ff6ca17ecdecf (diff) | |
| download | Doxygen-200c31bf342c533de77fede161e18e395c5ce875.zip Doxygen-200c31bf342c533de77fede161e18e395c5ce875.tar.gz Doxygen-200c31bf342c533de77fede161e18e395c5ce875.tar.bz2 | |
Merge branch 'master' into feature/bug_formula_mj
Diffstat (limited to 'src/layout.h')
| -rw-r--r-- | src/layout.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/layout.h b/src/layout.h index 900d192..04fdf52 100644 --- a/src/layout.h +++ b/src/layout.h @@ -177,7 +177,7 @@ struct LayoutNavEntry void addChild(LayoutNavEntry *e) { m_children.push_back(std::unique_ptr<LayoutNavEntry>(e)); } void prependChild(LayoutNavEntry *e) { m_children.insert(m_children.begin(),std::unique_ptr<LayoutNavEntry>(e)); } const LayoutNavEntryList &children() const { return m_children; } - LayoutNavEntry *find(LayoutNavEntry::Kind k,const char *file=0) const; + LayoutNavEntry *find(LayoutNavEntry::Kind k,const QCString &file=QCString()) const; private: LayoutNavEntry() : m_parent(0), m_kind(None), m_visible(FALSE) {} @@ -213,7 +213,7 @@ class LayoutDocManager LayoutNavEntry *rootNavEntry() const; /** Parses a user provided layout */ - void parse(const char *fileName); + void parse(const QCString &fileName); void init(); private: void addEntry(LayoutPart p,LayoutDocEntry*e); @@ -224,7 +224,7 @@ class LayoutDocManager friend class LayoutParser; }; -void writeDefaultLayoutFile(const char *fileName); +void writeDefaultLayoutFile(const QCString &fileName); #endif |