diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-10-16 19:36:55 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-10-16 19:36:55 (GMT) |
commit | 3bd04d0d99b4fbc36167ee6981ce3bfb4c0eb3b2 (patch) | |
tree | 2a564179e64631fa24f403248e98a8022ee7b908 | |
parent | 560bd4f390b6f5ed3146ddd3def583bd074c35b9 (diff) | |
download | Doxygen-3bd04d0d99b4fbc36167ee6981ce3bfb4c0eb3b2.zip Doxygen-3bd04d0d99b4fbc36167ee6981ce3bfb4c0eb3b2.tar.gz Doxygen-3bd04d0d99b4fbc36167ee6981ce3bfb4c0eb3b2.tar.bz2 |
Revert "Minor code cleanup for layout files"
This reverts commit ed4515149fd0839dba1f59858aec37b73c0ac805.
-rw-r--r-- | src/doxygen.cpp | 2 | ||||
-rw-r--r-- | src/layout.cpp | 7 | ||||
-rw-r--r-- | src/layout.h | 7 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 7b3c7d9..e1d7967 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -10368,7 +10368,7 @@ void readConfiguration(int argc, char **argv) layoutName=getArg(argc,argv,optind); if (!layoutName) { layoutName="DoxygenLayout.xml"; } - LayoutDocManager::instance().writeDefault(layoutName); + writeDefaultLayoutFile(layoutName); cleanUpDoxygen(); exit(0); break; diff --git a/src/layout.cpp b/src/layout.cpp index c560147..38a55f4 100644 --- a/src/layout.cpp +++ b/src/layout.cpp @@ -265,6 +265,9 @@ class LayoutParser : public QXmlDefaultHandler m_part = -1; // invalid m_rootNav = 0; + //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + //bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); + //bool javaOpt = Config_getBool(OPTIMIZE_OUTPUT_JAVA); bool sliceOpt = Config_getBool(OPTIMIZE_OUTPUT_SLICE); // start & end handlers @@ -1546,7 +1549,9 @@ void LayoutDocManager::parse(const char *fileName) reader.parse( source ); } -void LayoutDocManager::writeDefault(const char *fileName) const +//--------------------------------------------------------------------------------- + +void writeDefaultLayoutFile(const char *fileName) { QFile f(fileName); bool ok = openOutputFile(fileName,f); diff --git a/src/layout.h b/src/layout.h index 3260a28..b1facf5 100644 --- a/src/layout.h +++ b/src/layout.h @@ -162,7 +162,8 @@ struct LayoutNavEntry QCString title() const { return m_title; } QCString intro() const { return m_intro; } QCString url() const; - bool visible() const { return m_visible; } + bool visible() { return m_visible; } + void clear() { m_children.clear(); } void addChild(LayoutNavEntry *e) { m_children.append(e); } void prependChild(LayoutNavEntry *e) { m_children.prepend(e); } const QList<LayoutNavEntry> &children() const { return m_children; } @@ -171,7 +172,6 @@ struct LayoutNavEntry private: LayoutNavEntry() : m_parent(0), m_kind(None), m_visible(FALSE) {} LayoutNavEntry *m_parent; - void clear() { m_children.clear(); } Kind m_kind; bool m_visible; QCString m_baseFile; @@ -179,7 +179,6 @@ struct LayoutNavEntry QCString m_intro; QList<LayoutNavEntry> m_children; friend class LayoutDocManager; - friend class LayoutParser; }; /** @brief Singleton providing access to the (user configurable) layout of the documentation */ @@ -204,7 +203,6 @@ class LayoutDocManager /** Parses a user provided layout */ void parse(const char *fileName); void init(); - void writeDefault(const char *fileName) const; private: void addEntry(LayoutPart p,LayoutDocEntry*e); void clear(LayoutPart p); @@ -214,6 +212,7 @@ class LayoutDocManager friend class LayoutParser; }; +void writeDefaultLayoutFile(const char *fileName); #endif |