From: Moritz Bunkus <moritz@bunkus.org>
Date: Mon, 22 Jun 2020 08:33:53 +0000 (+0200)
Subject: [clang-tidy] make parameter names match those in function declarations
X-Git-Tag: release-1.6.0~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6542b719ca31a0d34a72dc410999866725df97f;p=libmatroska

[clang-tidy] make parameter names match those in function declarations
---

diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp
index 41ff4a2..03aa4e0 100644
--- a/src/KaxBlock.cpp
+++ b/src/KaxBlock.cpp
@@ -1008,9 +1008,9 @@ bool KaxBlockBlob::AddFrameAuto(const KaxTrackEntry & track, uint64 timecode, Da
   return bResult;
 }
 
-void KaxBlockBlob::SetParent(KaxCluster & parent_clust)
+void KaxBlockBlob::SetParent(KaxCluster & aParentCluster)
 {
-  ParentCluster = &parent_clust;
+  ParentCluster = &aParentCluster;
 }
 
 void KaxBlockBlob::SetBlockDuration(uint64 TimeLength)
diff --git a/src/KaxCluster.cpp b/src/KaxCluster.cpp
index f08ddfc..8390b61 100644
--- a/src/KaxCluster.cpp
+++ b/src/KaxCluster.cpp
@@ -264,7 +264,7 @@ int16 KaxCluster::GetBlockLocalTimecode(uint64 aGlobalTimecode) const
   return int16(TimecodeDelay);
 }
 
-uint64 KaxCluster::GetBlockGlobalTimecode(int16 GlobalSavedTimecode)
+uint64 KaxCluster::GetBlockGlobalTimecode(int16 LocalTimecode)
 {
   if (!bFirstFrameInside) {
     KaxClusterTimecode * Timecode = static_cast<KaxClusterTimecode *>(this->FindElt(EBML_INFO(KaxClusterTimecode)));
@@ -273,7 +273,7 @@ uint64 KaxCluster::GetBlockGlobalTimecode(int16 GlobalSavedTimecode)
     bFirstFrameInside = true;
     bPreviousTimecodeIsSet = true;
   }
-  return int64(GlobalSavedTimecode * GlobalTimecodeScale()) + GlobalTimecode();
+  return int64(LocalTimecode * GlobalTimecodeScale()) + GlobalTimecode();
 }
 
 KaxBlockGroup & KaxCluster::GetNewBlock()
diff --git a/src/KaxCuesData.cpp b/src/KaxCuesData.cpp
index 628c8be..b2a15fc 100644
--- a/src/KaxCuesData.cpp
+++ b/src/KaxCuesData.cpp
@@ -139,19 +139,19 @@ void KaxCueReference::AddReference(const KaxBlockBlob & BlockReference, uint64 G
 #endif /* OLD */
 }
 
-bool KaxCuePoint::IsSmallerThan(const EbmlElement * EltB) const
+bool KaxCuePoint::IsSmallerThan(const EbmlElement * Cmp) const
 {
   assert(EbmlId(*this) == EBML_ID(KaxCuePoint));
-  assert(EbmlId(*EltB) == EBML_ID(KaxCuePoint));
+  assert(EbmlId(*Cmp)  == EBML_ID(KaxCuePoint));
 
-  const KaxCuePoint & theEltB = *static_cast<const KaxCuePoint *>(EltB);
+  const KaxCuePoint & theCmp = *static_cast<const KaxCuePoint *>(Cmp);
 
   // compare timecode
   const KaxCueTime * TimeCodeA = static_cast<const KaxCueTime *>(FindElt(EBML_INFO(KaxCueTime)));
   if (TimeCodeA == NULL)
     return false;
 
-  const KaxCueTime * TimeCodeB = static_cast<const KaxCueTime *>(theEltB.FindElt(EBML_INFO(KaxCueTime)));
+  const KaxCueTime * TimeCodeB = static_cast<const KaxCueTime *>(theCmp.FindElt(EBML_INFO(KaxCueTime)));
   if (TimeCodeB == NULL)
     return false;
 
@@ -166,7 +166,7 @@ bool KaxCuePoint::IsSmallerThan(const EbmlElement * EltB) const
   if (TrackA == NULL)
     return false;
 
-  const KaxCueTrack * TrackB = static_cast<const KaxCueTrack *>(theEltB.FindElt(EBML_INFO(KaxCueTrack)));
+  const KaxCueTrack * TrackB = static_cast<const KaxCueTrack *>(theCmp.FindElt(EBML_INFO(KaxCueTrack)));
   if (TrackB == NULL)
     return false;