diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2020-12-21 13:58:18 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-21 13:58:18 (GMT) |
commit | 1f6d112069536fd01f9d949c1ef1177ad6847104 (patch) | |
tree | 3288b2e8902a6cfe5cb1629426b963ef88e7485b /src | |
parent | 07767300c3d5bfe256d14ec5bc5a03f5f6d88e4f (diff) | |
parent | 07a5c7c4b5525f6e4ab73ad53db9b5a79e9717d8 (diff) | |
download | Doxygen-1f6d112069536fd01f9d949c1ef1177ad6847104.zip Doxygen-1f6d112069536fd01f9d949c1ef1177ad6847104.tar.gz Doxygen-1f6d112069536fd01f9d949c1ef1177ad6847104.tar.bz2 |
Merge pull request #8265 from albert-github/feature/bug_bld_warn
Remove some build warnings
Diffstat (limited to 'src')
-rw-r--r-- | src/groupdef.cpp | 8 | ||||
-rw-r--r-- | src/groupdef.h | 2 | ||||
-rw-r--r-- | src/index.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/groupdef.cpp b/src/groupdef.cpp index ed042ab..b234d9c 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -76,7 +76,7 @@ class GroupDefImpl : public DefinitionMixin<GroupDef> virtual void writeMemberPages(OutputList &ol); virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const; virtual void writeTagFile(FTextStream &); - virtual int numDocMembers() const; + virtual size_t numDocMembers() const; virtual bool isLinkableInProject() const; virtual bool isLinkable() const; virtual bool isASubGroup() const; @@ -617,7 +617,7 @@ void GroupDefImpl::countMembers() } } -int GroupDefImpl::numDocMembers() const +size_t GroupDefImpl::numDocMembers() const { return m_fileList->count()+ m_classes.size()+ @@ -775,7 +775,7 @@ void GroupDefImpl::writeDetailedDescription(OutputList &ol,const QCString &title ) { ol.pushGeneratorState(); - if (m_pageDict->count()!=(uint)numDocMembers()) // not only pages -> classical layout + if (m_pageDict->count()!=numDocMembers()) // not only pages -> classical layout { ol.pushGeneratorState(); ol.disable(OutputGenerator::Html); @@ -1817,7 +1817,7 @@ bool GroupDefImpl::hasDetailedDescription() const { static bool repeatBrief = Config_getBool(REPEAT_BRIEF); return ((!briefDescription().isEmpty() && repeatBrief) || !documentation().isEmpty() || !inbodyDocumentation().isEmpty()) && - (m_pageDict->count()!=(uint)numDocMembers()); + (m_pageDict->count()!=numDocMembers()); } // --- Cast functions diff --git a/src/groupdef.h b/src/groupdef.h index 35797e3..7109656 100644 --- a/src/groupdef.h +++ b/src/groupdef.h @@ -70,7 +70,7 @@ class GroupDef : public DefinitionMutable, public Definition virtual void writeMemberPages(OutputList &ol) = 0; virtual void writeQuickMemberLinks(OutputList &ol,const MemberDef *currentMd) const = 0; virtual void writeTagFile(FTextStream &) = 0; - virtual int numDocMembers() const = 0; + virtual size_t numDocMembers() const = 0; virtual bool isLinkableInProject() const = 0; virtual bool isLinkable() const = 0; virtual bool isASubGroup() const = 0; diff --git a/src/index.cpp b/src/index.cpp index 259dd9f..106204c 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -3767,7 +3767,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp* // write group info bool hasSubGroups = gd->getSubGroups()->count()>0; bool hasSubPages = gd->getPages()->count()>0; - int numSubItems = 0; + size_t numSubItems = 0; if (1 /*Config_getBool(TOC_EXPAND)*/) { QListIterator<MemberList> mli(gd->getMemberLists()); @@ -3782,7 +3782,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp* numSubItems += gd->getNamespaces()->count(); numSubItems += gd->getClasses().size(); numSubItems += gd->getFiles()->count(); - numSubItems += static_cast<int>(gd->getDirs().size()); + numSubItems += gd->getDirs().size(); numSubItems += gd->getPages()->count(); } |