Moving the goalposts!

MonoGame.Framework/Input/Touch/GestureSample.cs

@@ -8,7 +8,6 @@
 #endregion
 
 #region Using Statements
-using Microsoft.Xna.Framework;
 using System;
 #endregion
 
@@ -29,7 +28,7 @@ public GestureType GestureType
 		{
 			get
 			{
-				return this._gestureType;
+				return gestureType;
 			}
 		}
 
@@ -40,7 +39,7 @@ public TimeSpan Timestamp
 		{
 			get
 			{
-				return this._timestamp;
+				return timestamp;
 			}
 		}
 
@@ -51,7 +50,7 @@ public Vector2 Position
 		{
 			get
 			{
-				return this._position;
+				return position;
 			}
 		}
 
@@ -62,7 +61,7 @@ public Vector2 Position2
 		{
 			get
 			{
-				return this._position2;
+				return position2;
 			}
 		}
 
@@ -73,7 +72,7 @@ public Vector2 Delta
 		{
 			get
 			{
-				return this._delta;
+				return delta;
 			}
 		}
 
@@ -84,21 +83,20 @@ public Vector2 Delta2
 		{
 			get
 			{
-				return this._delta2;
+				return delta2;
 			}
 		}
 
 		#endregion
 
 		#region Private Variables
 
-		// Attributes
-		private GestureType _gestureType;
-		private TimeSpan _timestamp;
-		private Vector2 _position;
-		private Vector2 _position2;
-		private Vector2 _delta;
-		private Vector2 _delta2;
+		private GestureType gestureType;
+		private TimeSpan timestamp;
+		private Vector2 position;
+		private Vector2 position2;
+		private Vector2 delta;
+		private Vector2 delta2;
 
 		#endregion
 
@@ -121,16 +119,14 @@ public Vector2 Delta2
 			Vector2 delta,
 			Vector2 delta2
 		) {
-			this._gestureType = gestureType;
-			this._timestamp = timestamp;
-			this._position = position;
-			this._position2 = position2;
-			this._delta = delta;
-			this._delta2 = delta2;
+			this.gestureType = gestureType;
+			this.timestamp = timestamp;
+			this.position = position;
+			this.position2 = position2;
+			this.delta = delta;
+			this.delta2 = delta2;
 		}
 
 		#endregion
-
 	}
 }
-

MonoGame.Framework/Input/Touch/GestureType.cs

@@ -7,7 +7,9 @@
  */
 #endregion
 
+#region Using Statements
 using System;
+#endregion
 
 namespace Microsoft.Xna.Framework.Input.Touch
 {
@@ -89,4 +91,3 @@ public enum GestureType
 		VerticalDrag = 512,
 	}
 }
-

MonoGame.Framework/Input/Touch/TouchCollection.cs

@@ -7,13 +7,12 @@
  */
 #endregion
 
-#region Using clause
+#region Using Statements
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-#endregion Using clause
+#endregion
 
 namespace Microsoft.Xna.Framework.Input.Touch
 {
@@ -22,12 +21,6 @@ namespace Microsoft.Xna.Framework.Input.Touch
 	/// </summary>
 	public struct TouchCollection : IList<TouchLocation>
 	{
-		private TouchLocation[] _collection;
-
-		private bool _isConnected;
-
-		private static readonly TouchLocation[] emptyCollection = new TouchLocation[0];
-
 		#region Public Properties
 
 		/// <summary>
@@ -37,7 +30,7 @@ public bool IsConnected
 		{
 			get
 			{
-				return _isConnected;
+				return isConnected;
 			}
 		}
 
@@ -64,11 +57,11 @@ public int Count
 		{
 			get
 			{
-				if (_collection == null)
+				if (collection == null)
 				{
 					return 0;
 				}
-				return _collection.Length;
+				return collection.Length;
 			}
 		}
 
@@ -81,11 +74,11 @@ public int Count
 		{
 			get
 			{
-				if (_collection == null)
+				if (collection == null)
 				{
 					throw new ArgumentOutOfRangeException("index");
 				}
-				return _collection[index];
+				return collection[index];
 			}
 			set
 			{
@@ -95,6 +88,16 @@ public int Count
 
 		#endregion
 
+		#region Private Variables
+
+		private TouchLocation[] collection;
+
+		private bool isConnected;
+
+		private static readonly TouchLocation[] emptyCollection = new TouchLocation[0];
+
+		#endregion
+
 		#region Public Constructor
 
 		/// <summary>
@@ -106,8 +109,8 @@ public int Count
 		/// </param>
 		public TouchCollection(TouchLocation[] touches)
 		{
-			_isConnected = true;
-			_collection = touches;
+			isConnected = true;
+			collection = touches;
 		}
 
 		#endregion
@@ -122,12 +125,12 @@ public TouchCollection(TouchLocation[] touches)
 		/// <returns></returns>
 		public bool FindById(int id, out TouchLocation touchLocation)
 		{
-			if (_collection == null)
+			if (collection == null)
 			{
 				touchLocation = default(TouchLocation);
 				return false;
 			}
-			foreach (TouchLocation location in _collection)
+			foreach (TouchLocation location in collection)
 			{
 				if (location.Id == id)
 				{
@@ -152,13 +155,13 @@ public bool FindById(int id, out TouchLocation touchLocation)
 		/// <returns></returns>
 		public int IndexOf(TouchLocation item)
 		{
-			if (_collection == null)
+			if (collection == null)
 			{
 				return -1;
 			}
-			for (int i = 0; i < _collection.Length; i += 1)
+			for (int i = 0; i < collection.Length; i += 1)
 			{
-				if (item == _collection[i])
+				if (item == collection[i])
 				{
 					return i;
 				}
@@ -211,11 +214,11 @@ public void Clear()
 		/// <returns>Returns true if queried item is found, false otherwise.</returns>
 		public bool Contains(TouchLocation item)
 		{
-			if (_collection == null)
+			if (collection == null)
 			{
 				return false;
 			}
-			foreach(TouchLocation location in _collection)
+			foreach(TouchLocation location in collection)
 			{
 				if (item == location)
 				{
@@ -234,9 +237,9 @@ public bool Contains(TouchLocation item)
 		/// <param name="arrayIndex">The starting index of the copy operation.</param>
 		public void CopyTo(TouchLocation[] array, int arrayIndex)
 		{
-			if (_collection != null)
+			if (collection != null)
 			{
-				_collection.CopyTo(array, arrayIndex);
+				collection.CopyTo(array, arrayIndex);
 			}
 		}
 
@@ -256,12 +259,12 @@ public bool Remove(TouchLocation item)
 		/// <returns>Enumerable list of <see cref="TouchLocation"/> objects.</returns>
 		public IEnumerator<TouchLocation> GetEnumerator()
 		{
-			if (_collection == null)
+			if (collection == null)
 			{
 				return emptyCollection.AsEnumerable().GetEnumerator();
 			}
 
-			return _collection.AsEnumerable().GetEnumerator();
+			return collection.AsEnumerable().GetEnumerator();
 		}
 
 
@@ -271,14 +274,14 @@ public IEnumerator<TouchLocation> GetEnumerator()
 		/// <returns>Enumerable list of objects.</returns>
 		IEnumerator IEnumerable.GetEnumerator()
 		{
-			if (_collection == null)
+			if (collection == null)
 			{
 				return emptyCollection.GetEnumerator();
 			}
 
-			return _collection.GetEnumerator();
+			return collection.GetEnumerator();
 		}
 
 		#endregion
 	}
-}
+}