From 0c28706a1e82a4ad6021ce016bc5937698cbbd3c Mon Sep 17 00:00:00 2001 From: David Hebbeker Date: Sun, 26 Apr 2020 12:08:40 +0200 Subject: Replaced DirList::count() by DirList::size(). (cherry picked from commit 38d38b225f1e8698e5813e16356e8929fcec1e81) --- src/dirdef.cpp | 4 ++-- src/dotgroupcollaboration.cpp | 2 +- src/groupdef.cpp | 4 ++-- src/index.cpp | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dirdef.cpp b/src/dirdef.cpp index 3a13b0a..d165b6e 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -35,7 +35,7 @@ class DirDefImpl : public DefinitionImpl, public DirDef virtual FileList * getFiles() const { return m_fileList; } virtual void addFile(FileDef *fd); virtual const DirList &subDirs() const { return m_subdirs; } - virtual bool isCluster() const { return m_subdirs.count()>0; } + virtual bool isCluster() const { return m_subdirs.size()>0; } virtual int level() const { return m_level; } virtual DirDef *parent() const { return m_parent; } virtual int dirCount() const { return m_dirCount; } @@ -458,7 +458,7 @@ void DirDefImpl::writeTagFile(FTextStream &tagFile) { case LayoutDocEntry::DirSubDirs: { - if (m_subdirs.count()>0) + if (m_subdirs.size()>0) { for(const auto dd : m_subdirs) { diff --git a/src/dotgroupcollaboration.cpp b/src/dotgroupcollaboration.cpp index ef04e8f..5c1f9e1 100644 --- a/src/dotgroupcollaboration.cpp +++ b/src/dotgroupcollaboration.cpp @@ -163,7 +163,7 @@ void DotGroupCollaboration::buildGraph(const GroupDef* gd) } // Add directories - if ( gd->getDirs() && gd->getDirs()->count() ) + if ( gd->getDirs() && gd->getDirs()->size() ) { for(const auto def : *(gd->getDirs())) { diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 3e95afc..bff97e0 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -1047,7 +1047,7 @@ void GroupDefImpl::writeNestedGroups(OutputList &ol,const QCString &title) void GroupDefImpl::writeDirs(OutputList &ol,const QCString &title) { // write list of directories - if (m_dirList->count()>0) + if (m_dirList->size()>0) { ol.startMemberHeader("dirs"); ol.parseText(title); @@ -1183,7 +1183,7 @@ void GroupDefImpl::writeSummaryLinks(OutputList &ol) const (lde->kind()==LayoutDocEntry::GroupNamespaces && m_namespaceSDict->declVisible()) || (lde->kind()==LayoutDocEntry::GroupFiles && m_fileList->count()>0) || (lde->kind()==LayoutDocEntry::GroupNestedGroups && m_groupList->count()>0) || - (lde->kind()==LayoutDocEntry::GroupDirs && m_dirList->count()>0) + (lde->kind()==LayoutDocEntry::GroupDirs && m_dirList->size()>0) ) { LayoutDocEntrySection *ls = (LayoutDocEntrySection*)lde; diff --git a/src/index.cpp b/src/index.cpp index 698470d..07dda3e 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -615,7 +615,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv } static bool tocExpand = TRUE; //Config_getBool(TOC_EXPAND); - bool isDir = dd->subDirs().count()>0 || // there are subdirs + bool isDir = dd->subDirs().size()>0 || // there are subdirs (tocExpand && // or toc expand and dd->getFiles() && dd->getFiles()->count()>0 // there are files ); @@ -644,7 +644,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv } // write sub directories - if (dd->subDirs().count()>0) + if (dd->subDirs().size()>0) { startIndexHierarchy(ol,level+1); for(const auto subdd : dd->subDirs()) @@ -3988,7 +3988,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp* numSubItems += gd->getNamespaces()->count(); numSubItems += gd->getClasses()->count(); numSubItems += gd->getFiles()->count(); - numSubItems += gd->getDirs()->count(); + numSubItems += gd->getDirs()->size(); numSubItems += gd->getPages()->count(); } -- cgit v0.12