Merge pull request #198 from rlabrecque/monogame-sdl2

#193 Using Statement Cleanup - Part 1 - Organize

MonoGame.Framework/Audio/AudioEngine.cs

@@ -7,9 +7,11 @@
  */
 #endregion
 
+#region Using Statements
 using System;
 using System.Collections.Generic;
 using System.IO;
+#endregion
 
 namespace Microsoft.Xna.Framework.Audio
 {

MonoGame.Framework/Audio/CueData.cs

@@ -7,9 +7,11 @@
  */
 #endregion
 
+#region Using Statements
 using System;
 using System.Collections.Generic;
 using System.IO;
+#endregion
 
 namespace Microsoft.Xna.Framework.Audio
 {

MonoGame.Framework/Audio/InstancePlayLimitException.cs

@@ -7,8 +7,10 @@
  */
 #endregion
 
+#region Using Statements
 using System;
 using System.Runtime.InteropServices;
+#endregion
 
 namespace Microsoft.Xna.Framework.Audio
 {

MonoGame.Framework/Audio/NoAudioHardwareException.cs

@@ -7,8 +7,10 @@
  */
 #endregion
 
+#region Using Statements
 using System;
 using System.Runtime.InteropServices;
+#endregion
 
 namespace Microsoft.Xna.Framework.Audio
 {

MonoGame.Framework/Audio/SoundBank.cs

@@ -7,9 +7,11 @@
  */
 #endregion
 
+#region Using Statements
 using System;
 using System.Collections.Generic;
 using System.IO;
+#endregion
 
 namespace Microsoft.Xna.Framework.Audio
 {

MonoGame.Framework/Audio/WaveBank.cs

@@ -21,8 +21,10 @@
  */
 #endregion
 
+#region Using Statements
 using System;
 using System.IO;
+#endregion
 
 namespace Microsoft.Xna.Framework.Audio
 {

MonoGame.Framework/Audio/XACTInternal.cs

@@ -7,9 +7,11 @@
  */
 #endregion
 
+#region Using Statements
 using System;
 
 using OpenTK.Audio.OpenAL;
+#endregion
 
 namespace Microsoft.Xna.Framework.Audio
 {

MonoGame.Framework/Content/ContentExtensions.cs

@@ -10,8 +10,8 @@
 #region Using Statements
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Linq;
+using System.Reflection;
 #endregion
 
 namespace Microsoft.Xna.Framework.Content

MonoGame.Framework/Content/ContentManager.cs

@@ -9,17 +9,15 @@
 
 #region Using Statements
 using System;
-using System.IO;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Reflection;
 using System.Text;
 
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Path = System.IO.Path;
-using System.Diagnostics;
-
 using Microsoft.Xna.Framework.Audio;
+using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Media;
 #endregion
 

MonoGame.Framework/Content/ContentReaders/BoundingFrustumReader.cs

@@ -9,6 +9,7 @@
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework;
 #endregion
 

MonoGame.Framework/Content/ContentReaders/BoundingSphereReader.cs

@@ -9,6 +9,7 @@
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework;
 #endregion
 

MonoGame.Framework/Content/ContentReaders/ColorReader.cs

@@ -10,8 +10,8 @@
 #region Using Statements
 using System;
 
-using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Content;
 #endregion
 
 namespace Microsoft.Xna.Framework.Content

MonoGame.Framework/Content/ContentReaders/EffectMaterialReader.cs

@@ -10,8 +10,9 @@
 #region Using Statements
 using System;
 using System.Collections.Generic;
-using Microsoft.Xna.Framework.Graphics;
 using System.Diagnostics;
+
+using Microsoft.Xna.Framework.Graphics;
 #endregion
 
 namespace Microsoft.Xna.Framework.Content

MonoGame.Framework/Content/ContentReaders/EffectReader.cs

@@ -10,10 +10,11 @@
 #region Using Statements
 using System;
 using System.Collections.Generic;
-using System.Text;
-using Microsoft.Xna.Framework.Graphics;
 using System.IO;
 using System.Linq;
+using System.Text;
+
+using Microsoft.Xna.Framework.Graphics;
 #endregion
 
 namespace Microsoft.Xna.Framework.Content

MonoGame.Framework/Content/ContentReaders/EnvironmentMapEffectReader.cs

@@ -9,6 +9,7 @@
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework.Graphics;
 #endregion
 

MonoGame.Framework/Content/ContentReaders/ModelReader.cs

@@ -9,10 +9,11 @@
 
 #region Using Statements
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.Xna.Framework.Graphics;
+
 using Microsoft.Xna.Framework.Content;
-using System.Collections.Generic;
+using Microsoft.Xna.Framework.Graphics;
 #endregion
 
 namespace Microsoft.Xna.Framework.Content

MonoGame.Framework/Content/ContentReaders/RayReader.cs

@@ -9,6 +9,7 @@
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework;
 #endregion
 

MonoGame.Framework/Content/ContentReaders/Texture3DReader.cs

@@ -9,6 +9,7 @@
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework.Graphics;
 #endregion
 

MonoGame.Framework/Content/ContentReaders/TextureReader.cs

@@ -9,6 +9,7 @@
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework.Graphics;
 #endregion
 

MonoGame.Framework/Content/ContentReaders/VertexBufferReader.cs

@@ -34,6 +34,7 @@ MIT License
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework.Graphics;
 #endregion
 

MonoGame.Framework/Content/ContentReaders/VertexDeclarationReader.cs

@@ -9,6 +9,7 @@
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework.Graphics;
 #endregion
 

MonoGame.Framework/Content/ContentTypeReaderManager.cs

@@ -34,9 +34,9 @@ MIT License
 
 #region Using Statements
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using System.Collections.Generic;
 #endregion
 
 namespace Microsoft.Xna.Framework.Content

MonoGame.Framework/Content/LzxDecoder.cs

@@ -8,8 +8,10 @@
  */
 #endregion
 
+#region Using Statements
 using System;
 using System.Diagnostics;
+#endregion
 
 namespace Microsoft.Xna.Framework.Content
 {

MonoGame.Framework/Game.cs

@@ -12,6 +12,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
+
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 #endregion

MonoGame.Framework/GamePlatform.cs

@@ -9,6 +9,7 @@
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Input.Touch;

MonoGame.Framework/GameWindow.cs

@@ -10,6 +10,7 @@
 #region Using Statements
 using System;
 using System.ComponentModel;
+
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Input.Touch;
 #endregion

MonoGame.Framework/Graphics/DirectionalLight.cs

@@ -9,6 +9,7 @@
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework.Graphics;
 #endregion
 

MonoGame.Framework/Graphics/PresentationParameters.cs

@@ -7,7 +7,9 @@
  */
 #endregion
 
+#region Using Statements
 using System;
+#endregion
 
 namespace Microsoft.Xna.Framework.Graphics
 {

MonoGame.Framework/Graphics/RenderTargetBinding.cs

@@ -7,7 +7,9 @@
  */
 #endregion
 
+#region Using Statements
 using System;
+#endregion
 
 namespace Microsoft.Xna.Framework.Graphics
 {

MonoGame.Framework/Graphics/SpriteBatch.cs

@@ -794,4 +794,4 @@ void CheckValid(SpriteFont spriteFont, StringBuilder text)
 
 		#endregion
 	}
-}
+}

MonoGame.Framework/Graphics/Texture.cs

@@ -10,6 +10,7 @@
 #region Using Statements
 using System;
 using System.Diagnostics;
+
 using OpenTK.Graphics.OpenGL;
 #endregion
 

MonoGame.Framework/Graphics/Texture2D.cs

@@ -13,9 +13,8 @@
 using System.IO;
 using System.Runtime.InteropServices;
 
-using SDL2;
 using OpenTK.Graphics.OpenGL;
-using GLPixelFormat = OpenTK.Graphics.OpenGL.PixelFormat;
+using SDL2;
 #endregion
 
 namespace Microsoft.Xna.Framework.Graphics
@@ -215,7 +214,7 @@ int elementCount
 					IntPtr dataPtr = (IntPtr) (dataHandle.AddrOfPinnedObject().ToInt64() + startByte);
 
 					OpenGLDevice.Instance.BindTexture(texture);
-					if (glFormat == (GLPixelFormat) All.CompressedTextureFormats)
+					if (glFormat == (PixelFormat) All.CompressedTextureFormats)
 					{
 						int dataLength;
 						if (elementCount > 0)
@@ -357,7 +356,7 @@ int elementCount
 
 			OpenGLDevice.Instance.BindTexture(texture);
 
-			if (glFormat == (GLPixelFormat) All.CompressedTextureFormats)
+			if (glFormat == (PixelFormat) All.CompressedTextureFormats)
 			{
 				throw new NotImplementedException("GetData, CompressedTexture");
 			}

MonoGame.Framework/Graphics/Vertices/VertexDeclaration.cs

@@ -10,6 +10,7 @@
 #region Using Statements
 using System;
 using System.Collections.Generic;
+
 using OpenTK.Graphics.OpenGL;
 #endregion
 

MonoGame.Framework/Graphics/Vertices/VertexPosition2ColorTexture.cs

@@ -8,10 +8,11 @@
 #endregion
 
 #region Using Statements
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Runtime.InteropServices;
+
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
 #endregion
 
 namespace Microsoft.Xna.Framework.Graphics

MonoGame.Framework/Graphics/Vertices/VertexPositionColor.cs

@@ -8,8 +8,8 @@
 #endregion
 
 #region Using Statements
-using System.Runtime.Serialization;
 using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
 #endregion
 
 namespace Microsoft.Xna.Framework.Graphics

MonoGame.Framework/GraphicsDeviceManager.cs

@@ -9,6 +9,7 @@
 
 #region Using Statements
 using System;
+
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input.Touch;
 #endregion

MonoGame.Framework/IUpdateable.cs

@@ -7,7 +7,7 @@
  */
 #endregion
 
-#region Using Statemenents
+#region Using Statements
 using System;
 #endregion