Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4

mcs/class/WindowsBase/System.Windows/Int32Rect.cs

@@ -38,14 +38,14 @@ namespace System.Windows {
 	[ValueSerializer (typeof(Int32RectValueSerializer))]
 	public struct Int32Rect : IFormattable
 	{
-		int x, y, width, height;
+		int _x, _y, _width, _height;
 
 		public Int32Rect (int x, int y, int width, int height)
 		{
-			this.x = x;
-			this.y = y;
-			this.width = width;
-			this.height = height;
+			this._x = x;
+			this._y = y;
+			this._width = width;
+			this._height = height;
 		}
 
 		public static bool operator != (Int32Rect int32Rect1, Int32Rect int32Rect2)
@@ -63,35 +63,35 @@ namespace System.Windows {
 		}
 
 		public int Height {
-			get { return height; }
-			set { height = value; }
+			get { return _height; }
+			set { _height = value; }
 		}
 
 		public bool IsEmpty {
-			get { return width == 0 && height == 0; }
+			get { return _width == 0 && _height == 0; }
 		}
 
 		public int Width {
-			get { return width; }
-			set { width = value; }
+			get { return _width; }
+			set { _width = value; }
 		}
 
 		public int X {
-			get { return x; }
-			set { x = value; }
+			get { return _x; }
+			set { _x = value; }
 		}
 
 		public int Y {
-			get { return y; }
-			set { y = value; }
+			get { return _y; }
+			set { _y = value; }
 		}
 
 		public bool Equals (Int32Rect value)
 		{
-			return (x == value.x &&
-				y == value.y &&
-				width == value.width &&
-				height == value.height);
+			return (_x == value._x &&
+				_y == value._y &&
+				_width == value._width &&
+				_height == value._height);
 		}
 
 		public override bool Equals (object o)
@@ -121,7 +121,7 @@ namespace System.Windows {
 		{
 			if (IsEmpty)
 				return "Empty";
-			return String.Format ("{0},{1},{2},{3}", x, y, width, height);
+			return String.Format ("{0},{1},{2},{3}", _x, _y, _width, _height);
 		}
 
 		public string ToString (IFormatProvider provider)