From 51bb9d5957e984efc64d2ceb189ad00c01ed6d16 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sun, 20 Dec 2020 12:45:12 +0100 Subject: Remove some build warnings Removing some build warnings like: ``` D:\a\doxygen\doxygen\src\groupdef.cpp(628): warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data D:\a\doxygen\doxygen\src\index.cpp(3950): warning C4267: '+=': conversion from 'size_t' to 'int', possible loss of data ``` --- src/groupdef.cpp | 8 ++++---- src/groupdef.h | 2 +- src/index.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 5dfc0ae..715ab6a 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -76,7 +76,7 @@ class GroupDefImpl : public DefinitionMixin 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 82430ef..afd318a 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -3934,7 +3934,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 mli(gd->getMemberLists()); @@ -3949,7 +3949,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(gd->getDirs().size()); + numSubItems += gd->getDirs().size(); numSubItems += gd->getPages()->count(); } -- cgit v0.12 From a38256c12bafce79533d084bf2f2b72061136721 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sun, 20 Dec 2020 13:09:12 +0100 Subject: Remove some build warnings Removing messages like: ``` D:\a\doxygen\doxygen\qtools\qdatastream.cpp(806) : warning C4789: buffer 'b' of size 4 bytes will be overrun; 1 bytes will be written starting at offset 4 D:\a\doxygen\doxygen\qtools\qdatastream.cpp(805) : warning C4789: buffer 'b' of size 4 bytes will be overrun; 1 bytes will be written starting at offset 5 D:\a\doxygen\doxygen\qtools\qdatastream.cpp(804) : warning C4789: buffer 'b' of size 4 bytes will be overrun; 1 bytes will be written starting at offset 6 D:\a\doxygen\doxygen\qtools\qdatastream.cpp(803) : warning C4789: buffer 'b' of size 4 bytes will be overrun; 1 bytes will be written starting at offset 7 ``` --- qtools/qdatastream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtools/qdatastream.cpp b/qtools/qdatastream.cpp index d539daf..c169d9f 100644 --- a/qtools/qdatastream.cpp +++ b/qtools/qdatastream.cpp @@ -799,7 +799,7 @@ QDataStream &QDataStream::operator<<( Q_INT64 i ) } else { // swap bytes uchar *p = (uchar *)(&i); char b[sizeof(Q_INT64)]; - if ( sizeof(Q_INT64) == 8 ) { + if ( sizeof(b) == 8 ) { b[7] = *p++; b[6] = *p++; b[5] = *p++; -- cgit v0.12 From 07a5c7c4b5525f6e4ab73ad53db9b5a79e9717d8 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sun, 20 Dec 2020 13:25:35 +0100 Subject: Remove some build warnings Fix didn't have the expected effect --- qtools/qdatastream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtools/qdatastream.cpp b/qtools/qdatastream.cpp index c169d9f..d539daf 100644 --- a/qtools/qdatastream.cpp +++ b/qtools/qdatastream.cpp @@ -799,7 +799,7 @@ QDataStream &QDataStream::operator<<( Q_INT64 i ) } else { // swap bytes uchar *p = (uchar *)(&i); char b[sizeof(Q_INT64)]; - if ( sizeof(b) == 8 ) { + if ( sizeof(Q_INT64) == 8 ) { b[7] = *p++; b[6] = *p++; b[5] = *p++; -- cgit v0.12