From af3db5191d1725a7813d6c63bb334431c9e98dfa Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Sat, 27 Mar 2010 19:26:41 +0100
Subject: [PATCH] Don't shadow variables

---
 lib/utf8-cpp/source/utf8/checked.h | 10 +++++-----
 src/common/hacks.cpp               |  1 -
 src/mmg/header_editor/frame.cpp    | 12 ++++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/utf8-cpp/source/utf8/checked.h b/lib/utf8-cpp/source/utf8/checked.h
index 16bab4dbd..d9364add0 100644
--- a/lib/utf8-cpp/source/utf8/checked.h
+++ b/lib/utf8-cpp/source/utf8/checked.h
@@ -37,7 +37,7 @@ namespace utf8
     class invalid_code_point : public std::exception {
         uint32_t cp;
     public:
-        invalid_code_point(uint32_t cp) : cp(cp) {}
+        invalid_code_point(uint32_t p_cp) : cp(p_cp) {}
         virtual const char* what() const throw() { return "Invalid code point"; }
         uint32_t code_point() const {return cp;}
     };
@@ -262,10 +262,10 @@ namespace utf8
       octet_iterator range_end;
       public:
       iterator () {};
-      explicit iterator (const octet_iterator& octet_it,
-                         const octet_iterator& range_start,
-                         const octet_iterator& range_end) :
-               it(octet_it), range_start(range_start), range_end(range_end)
+      explicit iterator (const octet_iterator& p_it,
+                         const octet_iterator& p_range_start,
+                         const octet_iterator& p_range_end) :
+               it(p_it), range_start(p_range_start), range_end(p_range_end)
       {
           if (it < range_start || it > range_end)
               throw std::out_of_range("Invalid utf-8 iterator position");
diff --git a/src/common/hacks.cpp b/src/common/hacks.cpp
index 3439cca49..0b3abd2b5 100644
--- a/src/common/hacks.cpp
+++ b/src/common/hacks.cpp
@@ -77,7 +77,6 @@ engage_hacks(const std::string &hacks) {
 
   for (aidx = 0; engage_args.size() > aidx; aidx++) {
     bool valid_hack = false;
-    int hidx;
     for (hidx = 0; s_available_hacks[hidx].name != NULL; hidx++)
       if (engage_args[aidx] == s_available_hacks[hidx].name) {
         valid_hack = true;
diff --git a/src/mmg/header_editor/frame.cpp b/src/mmg/header_editor/frame.cpp
index d595e64f4..882864de8 100644
--- a/src/mmg/header_editor/frame.cpp
+++ b/src/mmg/header_editor/frame.cpp
@@ -357,12 +357,12 @@ header_editor_frame_c::handle_tracks(kax_analyzer_data_c *data) {
   if (NULL == e)
     return;
 
-  m_e_tracks        = e;
-  KaxTracks *tracks = static_cast<KaxTracks *>(e);
-  int track_type    = -1;
+  m_e_tracks            = e;
+  KaxTracks *kax_tracks = static_cast<KaxTracks *>(e);
+  int track_type        = -1;
   int i;
-  for (i = 0; tracks->ListSize() > i; ++i) {
-    KaxTrackEntry *k_track_entry = dynamic_cast<KaxTrackEntry *>((*tracks)[i]);
+  for (i = 0; kax_tracks->ListSize() > i; ++i) {
+    KaxTrackEntry *k_track_entry = dynamic_cast<KaxTrackEntry *>((*kax_tracks)[i]);
     if (NULL == k_track_entry)
       continue;
 
@@ -378,7 +378,7 @@ header_editor_frame_c::handle_tracks(kax_analyzer_data_c *data) {
     wxString title;
     track_type = uint64(*k_track_type);
 
-    he_track_type_page_c *page = new he_track_type_page_c(this, track_type, track_number, tracks);
+    he_track_type_page_c *page = new he_track_type_page_c(this, track_type, track_number, kax_tracks);
     page->init();
 
     he_value_page_c *child_page;