From 5f39e377dcb1fccb403b4c516136879c18cc9380 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Nov 2020 17:54:30 +0100
Subject: [PATCH] Use std::size_t consistently

---
 id3/id3v1tag.h    |  4 ++--
 mediafileinfo.h   | 32 ++++++++++++++++----------------
 mp4/mp4track.h    |  4 ++--
 ogg/oggiterator.h |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/id3/id3v1tag.h b/id3/id3v1tag.h
index a31597f..78c6c3c 100644
--- a/id3/id3v1tag.h
+++ b/id3/id3v1tag.h
@@ -29,8 +29,8 @@ public:
     void make(std::ostream &targetStream, Diagnostics &diag);
 
 private:
-    void readValue(TagValue &value, size_t maxLength, const char *buffer);
-    void writeValue(const TagValue &value, size_t length, char *buffer, std::ostream &targetStream, Diagnostics &diag);
+    void readValue(TagValue &value, std::size_t maxLength, const char *buffer);
+    void writeValue(const TagValue &value, std::size_t length, char *buffer, std::ostream &targetStream, Diagnostics &diag);
 
     TagValue m_title;
     TagValue m_artist;
diff --git a/mediafileinfo.h b/mediafileinfo.h
index 31b1923..2792a06 100644
--- a/mediafileinfo.h
+++ b/mediafileinfo.h
@@ -133,12 +133,12 @@ public:
     void setForceFullParse(bool forceFullParse);
     bool isForcingRewrite() const;
     void setForceRewrite(bool forceRewrite);
-    size_t minPadding() const;
-    void setMinPadding(size_t minPadding);
-    size_t maxPadding() const;
-    void setMaxPadding(size_t maxPadding);
-    size_t preferredPadding() const;
-    void setPreferredPadding(size_t preferredPadding);
+    std::size_t minPadding() const;
+    void setMinPadding(std::size_t minPadding);
+    std::size_t maxPadding() const;
+    void setMaxPadding(std::size_t maxPadding);
+    std::size_t preferredPadding() const;
+    void setPreferredPadding(std::size_t preferredPadding);
     ElementPosition tagPosition() const;
     void setTagPosition(ElementPosition tagPosition);
     bool forceTagPosition() const;
@@ -183,9 +183,9 @@ private:
     std::string m_backupDirectory;
     std::string m_saveFilePath;
     std::string m_writingApplication;
-    size_t m_minPadding;
-    size_t m_maxPadding;
-    size_t m_preferredPadding;
+    std::size_t m_minPadding;
+    std::size_t m_maxPadding;
+    std::size_t m_preferredPadding;
     ElementPosition m_tagPosition;
     ElementPosition m_indexPosition;
     bool m_forceFullParse;
@@ -283,7 +283,7 @@ inline ParsingStatus MediaFileInfo::tracksParsingStatus() const
  *
  * \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);
 }
@@ -485,7 +485,7 @@ inline void MediaFileInfo::setForceRewrite(bool forceRewrite)
  * \sa tagPosition()
  * \sa setMinPadding()
  */
-inline size_t MediaFileInfo::minPadding() const
+inline std::size_t MediaFileInfo::minPadding() const
 {
     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.
  * \sa minPadding()
  */
-inline void MediaFileInfo::setMinPadding(size_t minPadding)
+inline void MediaFileInfo::setMinPadding(std::size_t minPadding)
 {
     m_minPadding = minPadding;
 }
@@ -513,7 +513,7 @@ inline void MediaFileInfo::setMinPadding(size_t minPadding)
  * \sa tagPosition()
  * \sa setMaxPadding()
  */
-inline size_t MediaFileInfo::maxPadding() const
+inline std::size_t MediaFileInfo::maxPadding() const
 {
     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.
  * \sa maxPadding()
  */
-inline void MediaFileInfo::setMaxPadding(size_t maxPadding)
+inline void MediaFileInfo::setMaxPadding(std::size_t 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
  * 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;
 }
@@ -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.
  * \sa preferredPadding()
  */
-inline void MediaFileInfo::setPreferredPadding(size_t preferredPadding)
+inline void MediaFileInfo::setPreferredPadding(std::size_t preferredPadding)
 {
     m_preferredPadding = preferredPadding;
 }
diff --git a/mp4/mp4track.h b/mp4/mp4track.h
index e0de7ad..1966093 100644
--- a/mp4/mp4track.h
+++ b/mp4/mp4track.h
@@ -166,9 +166,9 @@ protected:
 
 private:
     // 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(
-        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;
 
     Mp4Atom *m_trakAtom;
diff --git a/ogg/oggiterator.h b/ogg/oggiterator.h
index 6600605..3a786f3 100644
--- a/ogg/oggiterator.h
+++ b/ogg/oggiterator.h
@@ -37,7 +37,7 @@ public:
     void removeFilter();
     bool isLastPageFetched() const;
     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);
     bool bytesRemaining(std::size_t atLeast) const;
     bool resyncAt(std::uint64_t offset);