diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-01-05 15:06:50 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2021-01-05 15:06:50 (GMT) |
| commit | 9884d11f94d6c0ea00c6962a38c608ce7f21ed9b (patch) | |
| tree | e63eb535d2dbf4f590c33fd8784a54ed52dab4ec | |
| parent | c5b4375d22dc3b0f97c63df3fdecae7f79a96e62 (diff) | |
| parent | 55b5dfca66d887dc4782ff12e36ed36a3d1c985a (diff) | |
| download | Doxygen-9884d11f94d6c0ea00c6962a38c608ce7f21ed9b.zip Doxygen-9884d11f94d6c0ea00c6962a38c608ce7f21ed9b.tar.gz Doxygen-9884d11f94d6c0ea00c6962a38c608ce7f21ed9b.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/dotdirdeps.cpp | 5 | ||||
| -rw-r--r-- | src/markdown.cpp | 2 | ||||
| -rw-r--r-- | src/util.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/dotdirdeps.cpp b/src/dotdirdeps.cpp index e188a80..da6364f 100644 --- a/src/dotdirdeps.cpp +++ b/src/dotdirdeps.cpp @@ -81,7 +81,7 @@ void writeDotDirDepGraph(FTextStream &t,const DirDef *dd,bool linkRelations) // draw all directories which have `dd->parent()` as parent and `dd` as dependent const auto newEnd = std::remove_if(usedDirsNotDrawn.begin(), usedDirsNotDrawn.end(), [&](const DirDef *const usedDir) { - if (dd!=usedDir && dd->parent()==usedDir->parent() && !usedDir->isParentOf(dd)) + if (dd!=usedDir && dd->parent()==usedDir->parent()) { drawDirectory(t, usedDir, usedDir->isCluster() && !Config_getBool(DOT_TRANSPARENT), dirsInGraph); return true; @@ -136,8 +136,7 @@ void writeDotDirDepGraph(FTextStream &t,const DirDef *dd,bool linkRelations) // shortName().data(), // !usedDir->isParentOf(this) // ); - if (dir!=usedDir && dir->parent()==usedDir->parent() && - !usedDir->isParentOf(dd)) + if (dir!=usedDir && dir->parent()==usedDir->parent()) // include if both have the same parent (or no parent) { drawDirectory(t, usedDir, usedDir->isCluster() && !Config_getBool(DOT_TRANSPARENT), dirsInGraph); diff --git a/src/markdown.cpp b/src/markdown.cpp index 340ac99..93d143d 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -2734,8 +2734,8 @@ void MarkdownOutlineParser::parseInput(const char *fileName, if (id.startsWith("autotoc_md")) id = ""; int indentLevel=title.isEmpty() ? 0 : -1; markdown.setIndentLevel(indentLevel); - QCString titleFn = QFileInfo(fileName).baseName().utf8(); QCString fn = QFileInfo(fileName).fileName().utf8(); + QCString titleFn = stripExtensionGeneral(fn,getFileNameExtension(fn)); QCString mdfileAsMainPage = Config_getString(USE_MDFILE_AS_MAINPAGE); bool wasEmpty = id.isEmpty(); if (wasEmpty) id = markdownFileNameToId(fileName); diff --git a/src/util.cpp b/src/util.cpp index 665df8b..0c6d8fd 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1072,7 +1072,7 @@ void linkifyText(const TextGeneratorIntf &out, const Definition *scope, void writeExamples(OutputList &ol,const ExampleList &list) { - QCString exampleLine=theTranslator->trWriteList(list.size()); + QCString exampleLine=theTranslator->trWriteList((int)list.size()); //bool latexEnabled = ol.isEnabled(OutputGenerator::Latex); //bool manEnabled = ol.isEnabled(OutputGenerator::Man); |