diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2012-05-20 11:50:37 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-05-20 11:50:37 (GMT) |
commit | d233732e774e36b870069a3c5679588a49ebb23f (patch) | |
tree | 706106834c6681dd84b642a8140b4bdaa0801485 /src/index.cpp | |
parent | 98849cac48159a733a1b3c3ab1466f72a96f216a (diff) | |
download | Doxygen-d233732e774e36b870069a3c5679588a49ebb23f.zip Doxygen-d233732e774e36b870069a3c5679588a49ebb23f.tar.gz Doxygen-d233732e774e36b870069a3c5679588a49ebb23f.tar.bz2 |
Fixed code block render glitch for empty lines + Solaris compile issue
Diffstat (limited to 'src/index.cpp')
-rw-r--r-- | src/index.cpp | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/index.cpp b/src/index.cpp index 30a1ab0..ea240f4 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -602,22 +602,26 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv { bool doc,src; doc = fileVisibleInIndex(fd,src); + QCString reference; + QCString outputBase; + if (doc) + { + reference = fd->getReference(); + outputBase = fd->getOutputFileBase(); + } if (doc || src) { ol.startIndexListItem(); - ol.startIndexItem(doc ? fd->getReference() : 0, - doc ? fd->getOutputFileBase() : 0); + ol.startIndexItem(reference,outputBase); ol.parseText(fd->displayName()); - ol.endIndexItem(doc ? fd->getReference() : 0, - doc ? fd->getOutputFileBase() : 0); + ol.endIndexItem(reference,outputBase); ol.endIndexListItem(); if (ftv) { ftv->addContentsItem(FALSE, fd->displayName(), - doc ? fd->getReference() : 0, - doc ? fd->getOutputFileBase() : 0,0, - FALSE,FALSE,fd); + reference,outputBase, + 0,FALSE,FALSE,fd); } } fd=fileList->next(); @@ -689,13 +693,17 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex) { bool doc,src; doc = fileVisibleInIndex(fd,src); + QCString reference,outputBase; + if (doc) + { + reference = fd->getReference(); + outputBase = fd->getOutputFileBase(); + } static bool fullPathNames = Config_getBool("FULL_PATH_NAMES"); if ((!fullPathNames || fd->getDirDef()==0) && (doc || src)) { ftv->addContentsItem(FALSE,fd->displayName(), - doc ? fd->getReference() : 0, - doc ? fd->getOutputFileBase() : 0, - 0, + reference, outputBase, 0, FALSE,FALSE,fd); if (addToIndex) { |