diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.xml | 12 | ||||
| -rw-r--r-- | src/definition.cpp | 12 | ||||
| -rw-r--r-- | src/definitionimpl.h | 2 | ||||
| -rw-r--r-- | src/docbookvisitor.cpp | 4 |
4 files changed, 18 insertions, 12 deletions
diff --git a/src/config.xml b/src/config.xml index 0ec4219..fb48c63 100644 --- a/src/config.xml +++ b/src/config.xml @@ -662,6 +662,7 @@ Go to the <a href="commands.html">next</a> section or return to the <br>Note that for custom extensions you also need to set \ref cfg_file_patterns "FILE_PATTERNS" otherwise the files are not read by doxygen. When specifying `no_extension` you should add `*` to the \ref cfg_file_patterns "FILE_PATTERNS". + <br>Note see also the list of \ref default_file_extension_mapping "default file extension mappings". ]]> </docs> </option> @@ -1404,6 +1405,8 @@ FILE_VERSION_FILTER = "cleartool desc -fmt \%Vn" Note that for custom extensions or not directly supported extensions you also need to set \ref cfg_extension_mapping "EXTENSION_MAPPING" for the extension otherwise the files are not read by doxygen.<br> + Note the list of default checked file patterns might differ from the list of + \ref default_file_extension_mapping "default file extension mappings".<br> If left blank the following patterns are tested: ]]> </docs> @@ -1438,8 +1441,6 @@ FILE_VERSION_FILTER = "cleartool desc -fmt \%Vn" <value name='*.md'/> <value name='*.mm'/> <value name='*.dox' desc='(to be provided as doxygen C comment)'/> - <value name='*.doc' desc='(to be provided as doxygen C comment)'/> - <value name='*.txt' desc='(to be provided as doxygen C comment)'/> <value name='*.py'/> <value name='*.pyw'/> <value name='*.f90'/> @@ -3690,11 +3691,14 @@ add type and arguments for attributes and methods in the UML graphs. ]]> </docs> </option> - <option type='bool' id='DOT_CLEANUP' defval='1' depends='HAVE_DOT'> + <option type='bool' id='DOT_CLEANUP' defval='1'> <docs> <![CDATA[ If the \c DOT_CLEANUP tag is set to \c YES, doxygen will -remove the intermediate dot files that are used to generate the various graphs. +remove the intermediate files that are used to generate the various graphs. + <br>Note: +This setting is not only used for dot files but also for msc and plantuml +temporary files. ]]> </docs> </option> diff --git a/src/definition.cpp b/src/definition.cpp index 8b6e6fa..615506f 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -233,9 +233,9 @@ static void addToMap(const char *name,Definition *d) } } -static void removeFromMap(Definition *d) +static void removeFromMap(const char *name,Definition *d) { - Doxygen::symbolMap.remove(d->_symbolName(),d); + Doxygen::symbolMap.remove(name,d); } DefinitionImpl::DefinitionImpl(Definition *def, @@ -301,7 +301,7 @@ DefinitionImpl::~DefinitionImpl() { if (m_impl->isSymbol) { - removeFromMap(m_impl->def); + removeFromMap(m_impl->symbolName,m_impl->def); } if (m_impl) { @@ -2179,7 +2179,7 @@ void DefinitionImpl::writeSummaryLinks(OutputList &) const //--------------------------------------------------------------------------------- DefinitionAliasImpl::DefinitionAliasImpl(Definition *def,const Definition *alias) - : m_def(def), m_alias(alias) + : m_def(def), m_symbolName(alias->_symbolName()) { } @@ -2190,12 +2190,12 @@ DefinitionAliasImpl::~DefinitionAliasImpl() void DefinitionAliasImpl::init() { //printf("%s::addToMap(%s)\n",qPrint(name()),qPrint(alias->name())); - addToMap(m_alias->name(),m_def); + addToMap(m_symbolName,m_def); } void DefinitionAliasImpl::deinit() { - removeFromMap(m_def); + removeFromMap(m_symbolName,m_def); } //--------------------------------------------------------------------------------- diff --git a/src/definitionimpl.h b/src/definitionimpl.h index 0c2f713..710611e 100644 --- a/src/definitionimpl.h +++ b/src/definitionimpl.h @@ -298,7 +298,7 @@ class DefinitionAliasImpl void deinit(); private: Definition *m_def; - const Definition *m_alias; + QCString m_symbolName; }; template<class Base> diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp index bf6c827..d444b7b 100644 --- a/src/docbookvisitor.cpp +++ b/src/docbookvisitor.cpp @@ -356,12 +356,13 @@ DB_VIS_C QFile file(baseName+".dot"); if (!file.open(IO_WriteOnly)) { - err("Could not open file %s.msc for writing\n",baseName.data()); + err("Could not open file %s.dot for writing\n",baseName.data()); } file.writeBlock( stext, stext.length() ); file.close(); writeDotFile(baseName, s); m_t << "</para>" << endl; + if (Config_getBool(DOT_CLEANUP)) file.remove(); } break; case DocVerbatim::Msc: @@ -388,6 +389,7 @@ DB_VIS_C file.close(); writeMscFile(baseName,s); m_t << "</para>" << endl; + if (Config_getBool(DOT_CLEANUP)) file.remove(); } break; case DocVerbatim::PlantUML: |