From 85191fa50a6bcb8da8f4c883f8bb01cdcf3ad106 Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Wed, 5 Mar 2025 20:31:49 +0000
Subject: [PATCH] UMPIterator: Fix misleading variable naming

---
 .../juce_audio_basics/midi/ump/juce_UMPIterator.cpp  |  4 ++--
 .../juce_audio_basics/midi/ump/juce_UMPIterator.h    | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/juce_audio_basics/midi/ump/juce_UMPIterator.cpp b/modules/juce_audio_basics/midi/ump/juce_UMPIterator.cpp
index 077e72467b..27872924ad 100644
--- a/modules/juce_audio_basics/midi/ump/juce_UMPIterator.cpp
+++ b/modules/juce_audio_basics/midi/ump/juce_UMPIterator.cpp
@@ -35,10 +35,10 @@
 namespace juce::universal_midi_packets
 {
 
-Iterator::Iterator (const uint32_t* ptr, [[maybe_unused]] size_t bytes) noexcept
+Iterator::Iterator (const uint32_t* ptr, [[maybe_unused]] size_t words) noexcept
     : view (ptr)
    #if JUCE_DEBUG
-    , bytesRemaining (bytes)
+    , wordsRemaining (words)
    #endif
 {
 }
diff --git a/modules/juce_audio_basics/midi/ump/juce_UMPIterator.h b/modules/juce_audio_basics/midi/ump/juce_UMPIterator.h
index ea042b6934..c2386b5468 100644
--- a/modules/juce_audio_basics/midi/ump/juce_UMPIterator.h
+++ b/modules/juce_audio_basics/midi/ump/juce_UMPIterator.h
@@ -52,7 +52,7 @@ public:
     Iterator() noexcept = default;
 
     /** Creates an iterator pointing at `ptr`. */
-    explicit Iterator (const uint32_t* ptr, size_t bytes) noexcept;
+    explicit Iterator (const uint32_t* ptr, size_t words) noexcept;
 
     using difference_type    = std::iterator_traits<const uint32_t*>::difference_type;
     using value_type         = View;
@@ -69,8 +69,8 @@ public:
         // If you hit this, the memory region contained a truncated or otherwise
         // malformed Universal MIDI Packet.
         // The Iterator can only be used on regions containing complete packets!
-        jassert (increment <= bytesRemaining);
-        bytesRemaining -= increment;
+        jassert (increment <= wordsRemaining);
+        wordsRemaining -= increment;
        #endif
 
         view = View (view.data() + increment);
@@ -109,20 +109,20 @@ public:
 
         The View can be queried for its size and content.
     */
-    reference operator*() noexcept { return view; }
+    reference operator*() const noexcept { return view; }
 
     /** Returns a pointer to a View of the packet currently
         pointed-to by this iterator.
 
         The View can be queried for its size and content.
     */
-    pointer operator->() noexcept { return &view; }
+    pointer operator->() const noexcept { return &view; }
 
 private:
     View view;
 
    #if JUCE_DEBUG
-    size_t bytesRemaining = 0;
+    size_t wordsRemaining = 0;
    #endif
 };