Adobe SDK: fix some shadow warnings

4 files changed, 16 insertions, 16 deletions

diff --git a/XMPCore/source/XMPMeta-GetSet.cpp b/XMPCore/source/XMPMeta-GetSet.cpp
index c67965f..eaf0ef5 100644
--- a/XMPCore/source/XMPMeta-GetSet.cpp
+++ b/XMPCore/source/XMPMeta-GetSet.cpp
@@ -119,16 +119,16 @@ static inline void
 	node->SetValue( value );
 }	//SetNodeValue
 
-void XMP_Node::SetValue( XMP_StringPtr value )
+void XMP_Node::SetValue( XMP_StringPtr value_ )
 {
 
 	#if XMP_DebugBuild	// ! Hack to force an assert.
-		if ( (this->name == "xmp:TestAssertNotify") && XMP_LitMatch ( value, "DoIt!" ) ) {
+		if ( (this->name == "xmp:TestAssertNotify") && XMP_LitMatch ( value_, "DoIt!" ) ) {
 			XMP_Assert ( this->name != "xmp:TestAssertNotify" );
 		}
 	#endif
 	
-	std::string newValue = value;	// Need a local copy to tweak and not change node.value for errors.
+	std::string newValue = value_;	// Need a local copy to tweak and not change node.value for errors.
 	
 	XMP_Uns8* chPtr = (XMP_Uns8*) newValue.c_str();	// Check for valid UTF-8, replace ASCII controls with a space.
 	while ( *chPtr != 0 ) {
diff --git a/XMPFiles/source/FileHandlers/WEBP_Handler.cpp b/XMPFiles/source/FileHandlers/WEBP_Handler.cpp
index 24b0147..aa63101 100644
--- a/XMPFiles/source/FileHandlers/WEBP_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/WEBP_Handler.cpp
@@ -44,10 +44,10 @@ bool WEBP_CheckFormat(XMP_FileFormat format, XMP_StringPtr filePath,
     return false;
 }
 
-WEBP_MetaHandler::WEBP_MetaHandler(XMPFiles* parent)
+WEBP_MetaHandler::WEBP_MetaHandler(XMPFiles* parent_)
   : exifMgr(0)
 {
-    this->parent = parent;
+    this->parent = parent_;
     this->handlerFlags = kWEBP_HandlerFlags;
     this->stdCharForm = kXMP_Char8Bit;
 
diff --git a/XMPFiles/source/FormatSupport/ID3_Support.cpp b/XMPFiles/source/FormatSupport/ID3_Support.cpp
index f9aeefe..0bc4eb6 100644
--- a/XMPFiles/source/FormatSupport/ID3_Support.cpp
+++ b/XMPFiles/source/FormatSupport/ID3_Support.cpp
@@ -451,11 +451,11 @@ ID3v2Frame::ID3v2Frame() : frameDefaults
 
 // =================================================================================================
 
-ID3v2Frame::ID3v2Frame ( XMP_Uns32 id ) : frameDefaults
+ID3v2Frame::ID3v2Frame ( XMP_Uns32 id_ ) : frameDefaults
 {
 	memset ( this->fields, 0, kV23_FrameHeaderSize );
-	this->id = id;
-	PutUns32BE ( id, &this->fields[o_id] );
+	this->id = id_;
+	PutUns32BE ( id_, &this->fields[o_id] );
 }
 
 // =================================================================================================
diff --git a/XMPFiles/source/FormatSupport/RIFF.cpp b/XMPFiles/source/FormatSupport/RIFF.cpp
index 587bb8d..f258f8a 100644
--- a/XMPFiles/source/FormatSupport/RIFF.cpp
+++ b/XMPFiles/source/FormatSupport/RIFF.cpp
@@ -686,13 +686,13 @@ ContainerChunk::~ContainerChunk()
 // a) create
 
 // a) creation
-XMPChunk::XMPChunk( ContainerChunk* parent ) : Chunk( parent, chunk_XMP , kChunk_XMP )
+XMPChunk::XMPChunk( ContainerChunk* parent_ ) : Chunk( parent_, chunk_XMP , kChunk_XMP )
 {
 	// nothing
 }
 
 // b) parse
-XMPChunk::XMPChunk( ContainerChunk* parent, RIFF_MetaHandler* handler ) : Chunk( parent, handler, false, chunk_XMP )
+XMPChunk::XMPChunk( ContainerChunk* parent_, RIFF_MetaHandler* handler ) : Chunk( parent_, handler, false, chunk_XMP )
 {
 	chunkType = chunk_XMP;
 	XMP_IO* file = handler->parent->ioRef;
@@ -732,14 +732,14 @@ void XMPChunk::write( RIFF_MetaHandler* handler, XMP_IO* file, bool /*isMainChun
 
 // Value CHUNK ///////////////////////////////////////////////
 // a) creation
-ValueChunk::ValueChunk( ContainerChunk* parent, std::string value, XMP_Uns32 id ) : Chunk( parent, chunk_VALUE, id )
+ValueChunk::ValueChunk( ContainerChunk* parent_, std::string value, XMP_Uns32 id_ ) : Chunk( parent_, chunk_VALUE, id_ )
 {
 	this->oldValue = std::string();
 	this->SetValue( value );
 }
 
 // b) parsing
-ValueChunk::ValueChunk( ContainerChunk* parent, RIFF_MetaHandler* handler ) : Chunk( parent, handler, false, chunk_VALUE )
+ValueChunk::ValueChunk( ContainerChunk* parent_, RIFF_MetaHandler* handler ) : Chunk( parent_, handler, false, chunk_VALUE )
 {
 	// set value: -----------------
 	XMP_IO* file = handler->parent->ioRef;
@@ -788,10 +788,10 @@ void ValueChunk::write( RIFF_MetaHandler* /*handler*/, XMP_IO* file, bool /*isMa
 
 /* remove value chunk if existing.
    return true if it was existing. */
-bool ContainerChunk::removeValue( XMP_Uns32	id )
+bool ContainerChunk::removeValue( XMP_Uns32	id_ )
 {
 	valueMap* cm = &this->childmap;
-	valueMapIter iter = cm->find( id );
+	valueMapIter iter = cm->find( id_ );
 
 	if( iter == cm->end() )
 		return false;  //not found
@@ -803,7 +803,7 @@ bool ContainerChunk::removeValue( XMP_Uns32	id )
 	chunkVectIter cvIter;
 	for (cvIter = cv->begin(); cvIter != cv->end(); ++cvIter )
 	{
-		if ( (*cvIter)->id == id )
+		if ( (*cvIter)->id == id_ )
 			break; // found!
 	}
 	XMP_Validate( cvIter != cv->end(), "property not found in children vector", kXMPErr_InternalFailure );
@@ -845,7 +845,7 @@ void ContainerChunk::replaceChildWithJunk( Chunk* child, bool deleteChild )
 
 // JunkChunk ///////////////////////////////////////////////////
 // a) creation
-JunkChunk::JunkChunk( ContainerChunk* parent, XMP_Int64 size ) : Chunk( parent, chunk_JUNK, kChunk_JUNK )
+JunkChunk::JunkChunk( ContainerChunk* parent_, XMP_Int64 size ) : Chunk( parent_, chunk_JUNK, kChunk_JUNK )
 {
 	XMP_Assert( size >= 8 );
 	this->oldSize = size;