Use std::size_t consistently

This commit is contained in:
Martchus 2020-11-25 17:54:30 +01:00
parent 9a5d366ce0
commit 5f39e377dc
4 changed files with 21 additions and 21 deletions

View File

@ -29,8 +29,8 @@ public:
void make(std::ostream &targetStream, Diagnostics &diag); void make(std::ostream &targetStream, Diagnostics &diag);
private: private:
void readValue(TagValue &value, size_t maxLength, const char *buffer); void readValue(TagValue &value, std::size_t maxLength, const char *buffer);
void writeValue(const TagValue &value, size_t length, char *buffer, std::ostream &targetStream, Diagnostics &diag); void writeValue(const TagValue &value, std::size_t length, char *buffer, std::ostream &targetStream, Diagnostics &diag);
TagValue m_title; TagValue m_title;
TagValue m_artist; TagValue m_artist;

View File

@ -133,12 +133,12 @@ public:
void setForceFullParse(bool forceFullParse); void setForceFullParse(bool forceFullParse);
bool isForcingRewrite() const; bool isForcingRewrite() const;
void setForceRewrite(bool forceRewrite); void setForceRewrite(bool forceRewrite);
size_t minPadding() const; std::size_t minPadding() const;
void setMinPadding(size_t minPadding); void setMinPadding(std::size_t minPadding);
size_t maxPadding() const; std::size_t maxPadding() const;
void setMaxPadding(size_t maxPadding); void setMaxPadding(std::size_t maxPadding);
size_t preferredPadding() const; std::size_t preferredPadding() const;
void setPreferredPadding(size_t preferredPadding); void setPreferredPadding(std::size_t preferredPadding);
ElementPosition tagPosition() const; ElementPosition tagPosition() const;
void setTagPosition(ElementPosition tagPosition); void setTagPosition(ElementPosition tagPosition);
bool forceTagPosition() const; bool forceTagPosition() const;
@ -183,9 +183,9 @@ private:
std::string m_backupDirectory; std::string m_backupDirectory;
std::string m_saveFilePath; std::string m_saveFilePath;
std::string m_writingApplication; std::string m_writingApplication;
size_t m_minPadding; std::size_t m_minPadding;
size_t m_maxPadding; std::size_t m_maxPadding;
size_t m_preferredPadding; std::size_t m_preferredPadding;
ElementPosition m_tagPosition; ElementPosition m_tagPosition;
ElementPosition m_indexPosition; ElementPosition m_indexPosition;
bool m_forceFullParse; bool m_forceFullParse;
@ -283,7 +283,7 @@ inline ParsingStatus MediaFileInfo::tracksParsingStatus() const
* *
* \sa parseTracks() * \sa parseTracks()
*/ */
inline size_t MediaFileInfo::trackCount() const inline std::size_t MediaFileInfo::trackCount() const
{ {
return m_singleTrack ? 1 : (m_container ? m_container->trackCount() : 0); return m_singleTrack ? 1 : (m_container ? m_container->trackCount() : 0);
} }
@ -485,7 +485,7 @@ inline void MediaFileInfo::setForceRewrite(bool forceRewrite)
* \sa tagPosition() * \sa tagPosition()
* \sa setMinPadding() * \sa setMinPadding()
*/ */
inline size_t MediaFileInfo::minPadding() const inline std::size_t MediaFileInfo::minPadding() const
{ {
return m_minPadding; return m_minPadding;
} }
@ -495,7 +495,7 @@ inline size_t MediaFileInfo::minPadding() const
* \remarks This value might be ignored if not supported by the container/tag format or the corresponding implementation. * \remarks This value might be ignored if not supported by the container/tag format or the corresponding implementation.
* \sa minPadding() * \sa minPadding()
*/ */
inline void MediaFileInfo::setMinPadding(size_t minPadding) inline void MediaFileInfo::setMinPadding(std::size_t minPadding)
{ {
m_minPadding = minPadding; m_minPadding = minPadding;
} }
@ -513,7 +513,7 @@ inline void MediaFileInfo::setMinPadding(size_t minPadding)
* \sa tagPosition() * \sa tagPosition()
* \sa setMaxPadding() * \sa setMaxPadding()
*/ */
inline size_t MediaFileInfo::maxPadding() const inline std::size_t MediaFileInfo::maxPadding() const
{ {
return m_maxPadding; return m_maxPadding;
} }
@ -523,7 +523,7 @@ inline size_t MediaFileInfo::maxPadding() const
* \remarks This value might be ignored if not supported by the container/tag format or the corresponding implementation. * \remarks This value might be ignored if not supported by the container/tag format or the corresponding implementation.
* \sa maxPadding() * \sa maxPadding()
*/ */
inline void MediaFileInfo::setMaxPadding(size_t maxPadding) inline void MediaFileInfo::setMaxPadding(std::size_t maxPadding)
{ {
m_maxPadding = maxPadding; m_maxPadding = maxPadding;
} }
@ -534,7 +534,7 @@ inline void MediaFileInfo::setMaxPadding(size_t maxPadding)
* Padding in front of the file allows adding additional fields afterwards whithout needing * Padding in front of the file allows adding additional fields afterwards whithout needing
* to rewrite the entire file or to put tag information at the end of the file. * to rewrite the entire file or to put tag information at the end of the file.
*/ */
inline size_t MediaFileInfo::preferredPadding() const inline std::size_t MediaFileInfo::preferredPadding() const
{ {
return m_preferredPadding; return m_preferredPadding;
} }
@ -544,7 +544,7 @@ inline size_t MediaFileInfo::preferredPadding() const
* \remarks This value might be ignored if not supported by the container/tag format or the corresponding implementation. * \remarks This value might be ignored if not supported by the container/tag format or the corresponding implementation.
* \sa preferredPadding() * \sa preferredPadding()
*/ */
inline void MediaFileInfo::setPreferredPadding(size_t preferredPadding) inline void MediaFileInfo::setPreferredPadding(std::size_t preferredPadding)
{ {
m_preferredPadding = preferredPadding; m_preferredPadding = preferredPadding;
} }

View File

@ -166,9 +166,9 @@ protected:
private: private:
// private helper methods // private helper methods
std::uint64_t accumulateSampleSizes(size_t &sampleIndex, size_t count, Diagnostics &diag); std::uint64_t accumulateSampleSizes(std::size_t &sampleIndex, std::size_t count, Diagnostics &diag);
void addChunkSizeEntries( void addChunkSizeEntries(
std::vector<std::uint64_t> &chunkSizeTable, size_t count, size_t &sampleIndex, std::uint32_t sampleCount, Diagnostics &diag); std::vector<std::uint64_t> &chunkSizeTable, std::size_t count, std::size_t &sampleIndex, std::uint32_t sampleCount, Diagnostics &diag);
TrackHeaderInfo verifyPresentTrackHeader() const; TrackHeaderInfo verifyPresentTrackHeader() const;
Mp4Atom *m_trakAtom; Mp4Atom *m_trakAtom;

View File

@ -37,7 +37,7 @@ public:
void removeFilter(); void removeFilter();
bool isLastPageFetched() const; bool isLastPageFetched() const;
void read(char *buffer, std::size_t count); void read(char *buffer, std::size_t count);
size_t readAll(char *buffer, std::size_t max); std::size_t readAll(char *buffer, std::size_t max);
void ignore(std::size_t count = 1); void ignore(std::size_t count = 1);
bool bytesRemaining(std::size_t atLeast) const; bool bytesRemaining(std::size_t atLeast) const;
bool resyncAt(std::uint64_t offset); bool resyncAt(std::uint64_t offset);