Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-17 17:24:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't shadow variables

Browse Source
This commit is contained in:
Moritz Bunkus 2010-03-27 19:26:41 +01:00
parent 8286636741
commit af3db5191d
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/utf8-cpp/source/utf8/checked.h
View File

@ -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");

1
src/common/hacks.cpp
View File

@ -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;

12
src/mmg/header_editor/frame.cpp
View File

@ -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;