[System.Xaml] Rename method parameters to match .NET contract

7 files changed, 30 insertions, 30 deletions

diff --git a/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs b/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs
index d64a2a9645b..89896814ea4 100755
--- a/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs
+++ b/mcs/class/System.Xaml/System.Windows.Markup/ContentWrapperAttribute.cs
@@ -41,9 +41,9 @@ namespace System.Windows.Markup
 		}
 #endif
 
-		public override bool Equals (object other)
+		public override bool Equals (object obj)
 		{
-			var cwa = other as ContentWrapperAttribute;
+			var cwa = obj as ContentWrapperAttribute;
 			if (cwa == null)
 				return false;
 			return ContentWrapper != null ? ContentWrapper == cwa.ContentWrapper : cwa.ContentWrapper == null;
diff --git a/mcs/class/System.Xaml/System.Xaml.Schema/XamlTypeName.cs b/mcs/class/System.Xaml/System.Xaml.Schema/XamlTypeName.cs
index 5cd79018f4a..e6002c386db 100644
--- a/mcs/class/System.Xaml/System.Xaml.Schema/XamlTypeName.cs
+++ b/mcs/class/System.Xaml/System.Xaml.Schema/XamlTypeName.cs
@@ -105,14 +105,14 @@ namespace System.Xaml.Schema
 
 		static readonly char [] comma_or_parens = new char [] {',', '(', ')'};
 
-		public static bool TryParseList (string typeNameList, IXamlNamespaceResolver namespaceResolver, out IList<XamlTypeName> list)
+		public static bool TryParseList (string typeNameList, IXamlNamespaceResolver namespaceResolver, out IList<XamlTypeName> result)
 		{
 			if (typeNameList == null)
 				throw new ArgumentNullException ("typeNameList");
 			if (namespaceResolver == null)
 				throw new ArgumentNullException ("namespaceResolver");
 
-			list = null;
+			result = null;
 			int idx = 0;
 			int parens = 0;
 			XamlTypeName tn;
@@ -153,7 +153,7 @@ namespace System.Xaml.Schema
 				ret.Add (tn);
 			}
 
-			list = ret;
+			result = ret;
 			return true;
 		}
 
diff --git a/mcs/class/System.Xaml/System.Xaml.Schema/XamlValueConverter.cs b/mcs/class/System.Xaml/System.Xaml.Schema/XamlValueConverter.cs
index 5273358236a..fda91aa3b9c 100755
--- a/mcs/class/System.Xaml/System.Xaml.Schema/XamlValueConverter.cs
+++ b/mcs/class/System.Xaml/System.Xaml.Schema/XamlValueConverter.cs
@@ -56,9 +56,9 @@ namespace System.Xaml.Schema
 		public XamlType TargetType { get; private set; }
 
 		
-		public static bool operator == (XamlValueConverter<TConverterBase> left, XamlValueConverter<TConverterBase> right)
+		public static bool operator == (XamlValueConverter<TConverterBase> converter1, XamlValueConverter<TConverterBase> converter2)
 		{
-			return IsNull (left) ? IsNull (right) : left.Equals (right);
+			return IsNull (converter1) ? IsNull (converter2) : converter1.Equals (converter2);
 		}
 
 		static bool IsNull (XamlValueConverter<TConverterBase> a)
@@ -66,9 +66,9 @@ namespace System.Xaml.Schema
 			return Object.ReferenceEquals (a, null);
 		}
 
-		public static bool operator != (XamlValueConverter<TConverterBase> left, XamlValueConverter<TConverterBase> right)
+		public static bool operator != (XamlValueConverter<TConverterBase> converter1, XamlValueConverter<TConverterBase> converter2)
 		{
-			return IsNull (left) ? !IsNull (right) : IsNull (right) || left.ConverterType != right.ConverterType || left.TargetType != right.TargetType || left.Name != right.Name;
+			return IsNull (converter1) ? !IsNull (converter2) : IsNull (converter2) || converter1.ConverterType != converter2.ConverterType || converter1.TargetType != converter2.TargetType || converter1.Name != converter2.Name;
 		}
 		
 		public bool Equals (XamlValueConverter<TConverterBase> other)
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlMember.cs b/mcs/class/System.Xaml/System.Xaml/XamlMember.cs
index ad03cbf6283..4e0f4601039 100644
--- a/mcs/class/System.Xaml/System.Xaml/XamlMember.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlMember.cs
@@ -236,9 +236,9 @@ namespace System.Xaml
 			get { return LookupValueSerializer (); }
 		}
 
-		public static bool operator == (XamlMember left, XamlMember right)
+		public static bool operator == (XamlMember xamlMember1, XamlMember xamlMember2)
 		{
-			return IsNull (left) ? IsNull (right) : left.Equals (right);
+			return IsNull (xamlMember1) ? IsNull (xamlMember2) : xamlMember1.Equals (xamlMember2);
 		}
 
 		static bool IsNull (XamlMember a)
@@ -246,14 +246,14 @@ namespace System.Xaml
 			return Object.ReferenceEquals (a, null);
 		}
 
-		public static bool operator != (XamlMember left, XamlMember right)
+		public static bool operator != (XamlMember xamlMember1, XamlMember xamlMember2)
 		{
-			return !(left == right);
+			return !(xamlMember1 == xamlMember2);
 		}
 		
-		public override bool Equals (object other)
+		public override bool Equals (object obj)
 		{
-			var x = other as XamlMember;
+			var x = obj as XamlMember;
 			return Equals (x);
 		}
 		
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlServices.cs b/mcs/class/System.Xaml/System.Xaml/XamlServices.cs
index c8026d195a4..115de3f7940 100755
--- a/mcs/class/System.Xaml/System.Xaml/XamlServices.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlServices.cs
@@ -83,23 +83,23 @@ namespace System.Xaml
 				Save (xw, instance);
 		}
 
-		public static void Save (TextWriter textWriter, object instance)
+		public static void Save (TextWriter writer, object instance)
 		{
-			using (var xw = XmlWriter.Create (textWriter, new XmlWriterSettings () { OmitXmlDeclaration = true, Indent = true }))
+			using (var xw = XmlWriter.Create (writer, new XmlWriterSettings () { OmitXmlDeclaration = true, Indent = true }))
 				Save (xw, instance);
 		}
 
-		public static void Save (XmlWriter xmlWriter, object instance)
+		public static void Save (XmlWriter writer, object instance)
 		{
-			Save (new XamlXmlWriter (xmlWriter, new XamlSchemaContext ()), instance);
+			Save (new XamlXmlWriter (writer, new XamlSchemaContext ()), instance);
 		}
 
-		public static void Save (XamlWriter xamlWriter, object instance)
+		public static void Save (XamlWriter writer, object instance)
 		{
-			if (xamlWriter == null)
-				throw new ArgumentNullException ("xamlWriter");
-			var r = new XamlObjectReader (instance, xamlWriter.SchemaContext);
-			Transform (r, xamlWriter);
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			var r = new XamlObjectReader (instance, writer.SchemaContext);
+			Transform (r, writer);
 		}
 
 		public static void Transform (XamlReader xamlReader, XamlWriter xamlWriter)
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlType.cs b/mcs/class/System.Xaml/System.Xaml/XamlType.cs
index 6aebc3ebddd..0081cca2375 100755
--- a/mcs/class/System.Xaml/System.Xaml/XamlType.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlType.cs
@@ -252,9 +252,9 @@ namespace System.Xaml
 			return stn != null ? stn.Name : Name;
 		}
 
-		public static bool operator == (XamlType left, XamlType right)
+		public static bool operator == (XamlType xamlType1, XamlType xamlType2)
 		{
-			return IsNull (left) ? IsNull (right) : left.Equals (right);
+			return IsNull (xamlType1) ? IsNull (xamlType2) : xamlType1.Equals (xamlType2);
 		}
 
 		static bool IsNull (XamlType a)
@@ -262,9 +262,9 @@ namespace System.Xaml
 			return Object.ReferenceEquals (a, null);
 		}
 
-		public static bool operator != (XamlType left, XamlType right)
+		public static bool operator != (XamlType xamlType1, XamlType xamlType2)
 		{
-			return !(left == right);
+			return !(xamlType1 == xamlType2);
 		}
 		
 		public bool Equals (XamlType other)
diff --git a/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs b/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
index 4d2a6571d95..ef3be44fd52 100755
--- a/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
@@ -139,9 +139,9 @@ namespace System.Xaml
 			intl.WriteNamespace (namespaceDeclaration);
 		}
 
-		public override void WriteStartObject (XamlType xamlType)
+		public override void WriteStartObject (XamlType type)
 		{
-			intl.WriteStartObject (xamlType);
+			intl.WriteStartObject (type);
 		}
 		
 		public override void WriteValue (object value)