From 22abf9b4c4297b0fd0af37d16e58b9816990b130 Mon Sep 17 00:00:00 2001 From: RoosterDragon Date: Mon, 16 Jun 2014 22:20:39 +0100 Subject: [PATCH] Remove and sort usings. --- OpenRA.Game/Game.cs | 2 +- OpenRA.Game/Graphics/MappedImage.cs | 2 +- OpenRA.Game/Graphics/SpriteFont.cs | 2 +- OpenRA.Game/Map/Map.cs | 4 ++-- OpenRA.Game/Map/TileSet.cs | 1 - OpenRA.Game/Player.cs | 2 +- OpenRA.Game/Sync.cs | 2 +- OpenRA.Game/Traits/DrawLineToTarget.cs | 2 +- OpenRA.Game/Widgets/ScrollPanelWidget.cs | 2 +- OpenRA.Game/Widgets/TooltipContainerWidget.cs | 2 +- OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs | 2 +- OpenRA.Mods.D2k/Render/WithBuildingPlacedOverlayInfo.cs | 2 +- OpenRA.Mods.D2k/Render/WithDeliveryOverlay.cs | 2 +- OpenRA.Mods.D2k/Render/WithDockingOverlay.cs | 2 +- OpenRA.Mods.D2k/ThrowsShrapnel.cs | 2 +- OpenRA.Mods.RA/AI/HackyAI.cs | 2 +- OpenRA.Mods.RA/Activities/Attack.cs | 2 +- OpenRA.Mods.RA/Activities/DonateSupplies.cs | 2 +- OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs | 2 +- OpenRA.Mods.RA/Activities/FindResources.cs | 2 +- OpenRA.Mods.RA/Activities/LayMines.cs | 2 +- OpenRA.Mods.RA/Activities/Sell.cs | 4 ++-- OpenRA.Mods.RA/Activities/Teleport.cs | 2 +- OpenRA.Mods.RA/Activities/Transform.cs | 2 +- OpenRA.Mods.RA/Buildings/Building.cs | 2 +- OpenRA.Mods.RA/Buildings/CanPowerDown.cs | 2 +- OpenRA.Mods.RA/CashTrickler.cs | 2 +- OpenRA.Mods.RA/Combat.cs | 2 +- OpenRA.Mods.RA/Console/ChatCommands.cs | 2 +- OpenRA.Mods.RA/ContainsCrate.cs | 2 +- OpenRA.Mods.RA/Crates/GiveCashCrateAction.cs | 2 +- OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs | 2 +- OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs | 2 +- OpenRA.Mods.RA/CrushableInfantry.cs | 2 +- OpenRA.Mods.RA/ExternalCapturable.cs | 2 +- OpenRA.Mods.RA/GainsUnitUpgrades.cs | 2 +- OpenRA.Mods.RA/InfiltrateForCash.cs | 2 +- OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs | 2 +- OpenRA.Mods.RA/PaletteFromFile.cs | 2 +- OpenRA.Mods.RA/PaletteFromRGBA.cs | 2 +- OpenRA.Mods.RA/Player/ActorGroupProxy.cs | 2 +- OpenRA.Mods.RA/PortableChrono.cs | 2 +- OpenRA.Mods.RA/Render/RenderBuilding.cs | 2 +- OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs | 2 +- OpenRA.Mods.RA/Render/WithIdleOverlay.cs | 2 +- OpenRA.Mods.RA/Render/WithRepairOverlay.cs | 6 +++--- OpenRA.Mods.RA/Render/WithShadow.cs | 2 +- OpenRA.Mods.RA/SeedsResource.cs | 2 +- OpenRA.Mods.RA/SupportPowers/GpsPower.cs | 2 +- OpenRA.Mods.RA/VoxelNormalsPalette.cs | 2 +- OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs | 2 +- OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs | 2 +- OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs | 2 +- OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs | 2 +- OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs | 2 +- OpenRA.Utility/ExtractLanguageStrings.cs | 2 +- OpenRA.Utility/Glob.cs | 2 +- OpenRA.Utility/Program.cs | 2 +- 58 files changed, 61 insertions(+), 62 deletions(-) diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 804939411b..e6d9303b7b 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -14,8 +14,8 @@ using System.Drawing; using System.IO; using System.Linq; using System.Net; -using OpenRA.FileSystem; using MaxMind.GeoIP2; +using OpenRA.FileSystem; using OpenRA.Graphics; using OpenRA.Network; using OpenRA.Primitives; diff --git a/OpenRA.Game/Graphics/MappedImage.cs b/OpenRA.Game/Graphics/MappedImage.cs index 31ccd9ddb8..c4224ac520 100644 --- a/OpenRA.Game/Graphics/MappedImage.cs +++ b/OpenRA.Game/Graphics/MappedImage.cs @@ -8,8 +8,8 @@ */ #endregion -using System.Drawing; using System.Collections.Generic; +using System.Drawing; namespace OpenRA.Graphics { diff --git a/OpenRA.Game/Graphics/SpriteFont.cs b/OpenRA.Game/Graphics/SpriteFont.cs index ca937a6180..42bef7f250 100644 --- a/OpenRA.Game/Graphics/SpriteFont.cs +++ b/OpenRA.Game/Graphics/SpriteFont.cs @@ -11,8 +11,8 @@ using System; using System.Drawing; using System.Linq; -using SharpFont; using OpenRA.Primitives; +using SharpFont; namespace OpenRA.Graphics { diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs index e6fc7c5feb..01f5685963 100644 --- a/OpenRA.Game/Map/Map.cs +++ b/OpenRA.Game/Map/Map.cs @@ -16,10 +16,10 @@ using System.Linq; using System.Security.Cryptography; using System.Text; using OpenRA.FileSystem; -using OpenRA.Network; -using OpenRA.Traits; using OpenRA.Graphics; +using OpenRA.Network; using OpenRA.Support; +using OpenRA.Traits; namespace OpenRA { diff --git a/OpenRA.Game/Map/TileSet.cs b/OpenRA.Game/Map/TileSet.cs index 9e56657f31..1397cd5eea 100644 --- a/OpenRA.Game/Map/TileSet.cs +++ b/OpenRA.Game/Map/TileSet.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using System.Drawing; using System.IO; using System.Linq; -using System.Reflection; namespace OpenRA { diff --git a/OpenRA.Game/Player.cs b/OpenRA.Game/Player.cs index 7fe0fccdd4..a6bba831d9 100644 --- a/OpenRA.Game/Player.cs +++ b/OpenRA.Game/Player.cs @@ -13,8 +13,8 @@ using System.Collections.Generic; using System.Linq; using Eluant; using Eluant.ObjectBinding; -using OpenRA.Network; using OpenRA.Graphics; +using OpenRA.Network; using OpenRA.Primitives; using OpenRA.Scripting; using OpenRA.Traits; diff --git a/OpenRA.Game/Sync.cs b/OpenRA.Game/Sync.cs index b877f97922..fdbcef8806 100755 --- a/OpenRA.Game/Sync.cs +++ b/OpenRA.Game/Sync.cs @@ -13,8 +13,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Reflection.Emit; -using OpenRA.Traits; using OpenRA.Primitives; +using OpenRA.Traits; namespace OpenRA { diff --git a/OpenRA.Game/Traits/DrawLineToTarget.cs b/OpenRA.Game/Traits/DrawLineToTarget.cs index 415ccc0dd1..125c68f4cc 100644 --- a/OpenRA.Game/Traits/DrawLineToTarget.cs +++ b/OpenRA.Game/Traits/DrawLineToTarget.cs @@ -8,9 +8,9 @@ */ #endregion +using System.Collections.Generic; using System.Drawing; using OpenRA.Graphics; -using System.Collections.Generic; namespace OpenRA.Traits { diff --git a/OpenRA.Game/Widgets/ScrollPanelWidget.cs b/OpenRA.Game/Widgets/ScrollPanelWidget.cs index 150b5048ea..6c005e837c 100644 --- a/OpenRA.Game/Widgets/ScrollPanelWidget.cs +++ b/OpenRA.Game/Widgets/ScrollPanelWidget.cs @@ -11,8 +11,8 @@ using System; using System.Drawing; using System.Linq; -using OpenRA.Primitives; using OpenRA.Graphics; +using OpenRA.Primitives; namespace OpenRA.Widgets { diff --git a/OpenRA.Game/Widgets/TooltipContainerWidget.cs b/OpenRA.Game/Widgets/TooltipContainerWidget.cs index 086eda10a5..fcf6e848f4 100644 --- a/OpenRA.Game/Widgets/TooltipContainerWidget.cs +++ b/OpenRA.Game/Widgets/TooltipContainerWidget.cs @@ -8,9 +8,9 @@ */ #endregion +using System; using System.Drawing; using OpenRA.Graphics; -using System; namespace OpenRA.Widgets { diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs b/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs index 30b0b8f625..4dbb1af4aa 100644 --- a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs @@ -13,10 +13,10 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Graphics; -using OpenRA.Network; using OpenRA.Mods.RA; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Orders; +using OpenRA.Network; using OpenRA.Traits; using OpenRA.Widgets; diff --git a/OpenRA.Mods.D2k/Render/WithBuildingPlacedOverlayInfo.cs b/OpenRA.Mods.D2k/Render/WithBuildingPlacedOverlayInfo.cs index 9de5b44490..cf38f2d7c2 100644 --- a/OpenRA.Mods.D2k/Render/WithBuildingPlacedOverlayInfo.cs +++ b/OpenRA.Mods.D2k/Render/WithBuildingPlacedOverlayInfo.cs @@ -9,8 +9,8 @@ #endregion using OpenRA.Graphics; -using OpenRA.Traits; using OpenRA.Mods.RA.Buildings; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Render { diff --git a/OpenRA.Mods.D2k/Render/WithDeliveryOverlay.cs b/OpenRA.Mods.D2k/Render/WithDeliveryOverlay.cs index 989ab6d93a..8292506b92 100644 --- a/OpenRA.Mods.D2k/Render/WithDeliveryOverlay.cs +++ b/OpenRA.Mods.D2k/Render/WithDeliveryOverlay.cs @@ -10,8 +10,8 @@ using OpenRA.Effects; using OpenRA.Graphics; -using OpenRA.Traits; using OpenRA.Mods.RA.Buildings; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Render { diff --git a/OpenRA.Mods.D2k/Render/WithDockingOverlay.cs b/OpenRA.Mods.D2k/Render/WithDockingOverlay.cs index e5d981b576..44ef03915f 100644 --- a/OpenRA.Mods.D2k/Render/WithDockingOverlay.cs +++ b/OpenRA.Mods.D2k/Render/WithDockingOverlay.cs @@ -10,8 +10,8 @@ using OpenRA.Effects; using OpenRA.Graphics; -using OpenRA.Traits; using OpenRA.Mods.RA.Buildings; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Render { diff --git a/OpenRA.Mods.D2k/ThrowsShrapnel.cs b/OpenRA.Mods.D2k/ThrowsShrapnel.cs index 87da530b1f..c5b6f8e110 100644 --- a/OpenRA.Mods.D2k/ThrowsShrapnel.cs +++ b/OpenRA.Mods.D2k/ThrowsShrapnel.cs @@ -8,8 +8,8 @@ */ #endregion -using OpenRA.GameRules; using System.Linq; +using OpenRA.GameRules; using OpenRA.Traits; namespace OpenRA.Mods.D2k diff --git a/OpenRA.Mods.RA/AI/HackyAI.cs b/OpenRA.Mods.RA/AI/HackyAI.cs index 6c9ab973c2..4f643ec78f 100644 --- a/OpenRA.Mods.RA/AI/HackyAI.cs +++ b/OpenRA.Mods.RA/AI/HackyAI.cs @@ -15,9 +15,9 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Air; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Move; -using OpenRA.Traits; using OpenRA.Primitives; using OpenRA.Support; +using OpenRA.Traits; namespace OpenRA.Mods.RA.AI { diff --git a/OpenRA.Mods.RA/Activities/Attack.cs b/OpenRA.Mods.RA/Activities/Attack.cs index 4d20d99dea..58412889ab 100755 --- a/OpenRA.Mods.RA/Activities/Attack.cs +++ b/OpenRA.Mods.RA/Activities/Attack.cs @@ -8,8 +8,8 @@ */ #endregion -using OpenRA.Traits; using OpenRA.Mods.RA.Move; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/DonateSupplies.cs b/OpenRA.Mods.RA/Activities/DonateSupplies.cs index 3da95226f5..62891f69c1 100644 --- a/OpenRA.Mods.RA/Activities/DonateSupplies.cs +++ b/OpenRA.Mods.RA/Activities/DonateSupplies.cs @@ -8,8 +8,8 @@ */ #endregion -using OpenRA.Traits; using OpenRA.Mods.RA.Effects; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs b/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs index 5d9f5978d6..9274889bd1 100644 --- a/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs +++ b/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs @@ -8,9 +8,9 @@ */ #endregion -using OpenRA.Traits; using OpenRA.Effects; using OpenRA.Mods.RA.Move; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/FindResources.cs b/OpenRA.Mods.RA/Activities/FindResources.cs index 853c970201..9746a840bb 100755 --- a/OpenRA.Mods.RA/Activities/FindResources.cs +++ b/OpenRA.Mods.RA/Activities/FindResources.cs @@ -8,12 +8,12 @@ */ #endregion +using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Mods.RA.Move; using OpenRA.Traits; -using System; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/LayMines.cs b/OpenRA.Mods.RA/Activities/LayMines.cs index b104548774..674f4fd04e 100644 --- a/OpenRA.Mods.RA/Activities/LayMines.cs +++ b/OpenRA.Mods.RA/Activities/LayMines.cs @@ -9,8 +9,8 @@ #endregion using System.Linq; -using OpenRA.Traits; using OpenRA.Primitives; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Sell.cs b/OpenRA.Mods.RA/Activities/Sell.cs index c3cbab0814..f2bad44fb4 100755 --- a/OpenRA.Mods.RA/Activities/Sell.cs +++ b/OpenRA.Mods.RA/Activities/Sell.cs @@ -8,9 +8,9 @@ */ #endregion -using OpenRA.Traits; -using OpenRA.Mods.RA.Effects; using OpenRA.Mods.RA.Buildings; +using OpenRA.Mods.RA.Effects; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Teleport.cs b/OpenRA.Mods.RA/Activities/Teleport.cs index c5a81108b1..9b80ce7c69 100755 --- a/OpenRA.Mods.RA/Activities/Teleport.cs +++ b/OpenRA.Mods.RA/Activities/Teleport.cs @@ -11,8 +11,8 @@ using System; using System.Collections.Generic; using System.Linq; -using OpenRA.Traits; using OpenRA.Mods.RA.Render; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Activities/Transform.cs b/OpenRA.Mods.RA/Activities/Transform.cs index 86db282784..86d77ad2ae 100644 --- a/OpenRA.Mods.RA/Activities/Transform.cs +++ b/OpenRA.Mods.RA/Activities/Transform.cs @@ -9,8 +9,8 @@ #endregion using System.Linq; -using OpenRA.Traits; using OpenRA.Primitives; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Activities { diff --git a/OpenRA.Mods.RA/Buildings/Building.cs b/OpenRA.Mods.RA/Buildings/Building.cs index 72b21c42b9..318a36c9a4 100644 --- a/OpenRA.Mods.RA/Buildings/Building.cs +++ b/OpenRA.Mods.RA/Buildings/Building.cs @@ -11,8 +11,8 @@ using System; using System.Collections.Generic; using System.Linq; -using OpenRA.Traits; using OpenRA.Primitives; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Buildings { diff --git a/OpenRA.Mods.RA/Buildings/CanPowerDown.cs b/OpenRA.Mods.RA/Buildings/CanPowerDown.cs index 9e4f299a5f..2932011adb 100755 --- a/OpenRA.Mods.RA/Buildings/CanPowerDown.cs +++ b/OpenRA.Mods.RA/Buildings/CanPowerDown.cs @@ -8,8 +8,8 @@ */ #endregion -using OpenRA.Traits; using OpenRA.Mods.RA.Effects; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Buildings { diff --git a/OpenRA.Mods.RA/CashTrickler.cs b/OpenRA.Mods.RA/CashTrickler.cs index b27ad851fb..a50ec69534 100644 --- a/OpenRA.Mods.RA/CashTrickler.cs +++ b/OpenRA.Mods.RA/CashTrickler.cs @@ -8,8 +8,8 @@ */ #endregion -using OpenRA.Traits; using OpenRA.Mods.RA.Effects; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/Combat.cs b/OpenRA.Mods.RA/Combat.cs index b4d1da5b5c..03bcc490c9 100755 --- a/OpenRA.Mods.RA/Combat.cs +++ b/OpenRA.Mods.RA/Combat.cs @@ -9,12 +9,12 @@ #endregion using System; +using System.Collections.Generic; using System.Linq; using OpenRA.Effects; using OpenRA.GameRules; using OpenRA.Mods.RA.Effects; using OpenRA.Traits; -using System.Collections.Generic; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/Console/ChatCommands.cs b/OpenRA.Mods.RA/Console/ChatCommands.cs index 6f6bf6bd16..7539ab1857 100644 --- a/OpenRA.Mods.RA/Console/ChatCommands.cs +++ b/OpenRA.Mods.RA/Console/ChatCommands.cs @@ -8,9 +8,9 @@ */ #endregion -using OpenRA.Traits; using System.Collections.Generic; using System.Linq; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/ContainsCrate.cs b/OpenRA.Mods.RA/ContainsCrate.cs index 20c5326663..c71e218d4a 100644 --- a/OpenRA.Mods.RA/ContainsCrate.cs +++ b/OpenRA.Mods.RA/ContainsCrate.cs @@ -8,8 +8,8 @@ */ #endregion -using OpenRA.Traits; using OpenRA.Primitives; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/Crates/GiveCashCrateAction.cs b/OpenRA.Mods.RA/Crates/GiveCashCrateAction.cs index 7810c4ad12..f94182c75b 100644 --- a/OpenRA.Mods.RA/Crates/GiveCashCrateAction.cs +++ b/OpenRA.Mods.RA/Crates/GiveCashCrateAction.cs @@ -8,8 +8,8 @@ */ #endregion -using OpenRA.Traits; using OpenRA.Mods.RA.Effects; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs b/OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs index d23de5b112..23bdda30a9 100644 --- a/OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs +++ b/OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs @@ -11,8 +11,8 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Mods.RA.Move; -using OpenRA.Traits; using OpenRA.Primitives; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Crates { diff --git a/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs b/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs index 3162a041d6..2d8da8e32e 100644 --- a/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs +++ b/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs @@ -8,8 +8,8 @@ */ #endregion -using OpenRA.Traits; using OpenRA.Primitives; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Crates { diff --git a/OpenRA.Mods.RA/CrushableInfantry.cs b/OpenRA.Mods.RA/CrushableInfantry.cs index 43fed1b45e..051feeabef 100644 --- a/OpenRA.Mods.RA/CrushableInfantry.cs +++ b/OpenRA.Mods.RA/CrushableInfantry.cs @@ -9,9 +9,9 @@ #endregion using System.Linq; -using OpenRA.Traits; using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Render; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/ExternalCapturable.cs b/OpenRA.Mods.RA/ExternalCapturable.cs index 3808938b68..2ffd3924ce 100644 --- a/OpenRA.Mods.RA/ExternalCapturable.cs +++ b/OpenRA.Mods.RA/ExternalCapturable.cs @@ -9,8 +9,8 @@ #endregion using System.Linq; -using OpenRA.Traits; using OpenRA.Mods.RA.Buildings; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/GainsUnitUpgrades.cs b/OpenRA.Mods.RA/GainsUnitUpgrades.cs index 66423db5e0..db7f9d557a 100644 --- a/OpenRA.Mods.RA/GainsUnitUpgrades.cs +++ b/OpenRA.Mods.RA/GainsUnitUpgrades.cs @@ -9,8 +9,8 @@ #endregion using System; -using OpenRA.Traits; using OpenRA.GameRules; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/InfiltrateForCash.cs b/OpenRA.Mods.RA/InfiltrateForCash.cs index 07315e5a74..d2ef6079c6 100644 --- a/OpenRA.Mods.RA/InfiltrateForCash.cs +++ b/OpenRA.Mods.RA/InfiltrateForCash.cs @@ -9,8 +9,8 @@ #endregion using System; -using OpenRA.Traits; using OpenRA.Mods.RA.Effects; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs b/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs index 782da84d0c..39daeddd05 100644 --- a/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs +++ b/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs @@ -10,8 +10,8 @@ using System; using System.Linq; -using OpenRA.Traits; using OpenRA.Mods.RA.Buildings; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/PaletteFromFile.cs b/OpenRA.Mods.RA/PaletteFromFile.cs index 9808fc9645..ddf4f98e83 100644 --- a/OpenRA.Mods.RA/PaletteFromFile.cs +++ b/OpenRA.Mods.RA/PaletteFromFile.cs @@ -9,8 +9,8 @@ #endregion using OpenRA.FileSystem; -using OpenRA.Traits; using OpenRA.Graphics; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/PaletteFromRGBA.cs b/OpenRA.Mods.RA/PaletteFromRGBA.cs index cc90622323..190c5667e9 100644 --- a/OpenRA.Mods.RA/PaletteFromRGBA.cs +++ b/OpenRA.Mods.RA/PaletteFromRGBA.cs @@ -8,8 +8,8 @@ */ #endregion -using OpenRA.Traits; using OpenRA.Graphics; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/Player/ActorGroupProxy.cs b/OpenRA.Mods.RA/Player/ActorGroupProxy.cs index eaf2bb77cb..8b86f07a04 100755 --- a/OpenRA.Mods.RA/Player/ActorGroupProxy.cs +++ b/OpenRA.Mods.RA/Player/ActorGroupProxy.cs @@ -8,8 +8,8 @@ */ #endregion -using System.Linq; using System.Globalization; +using System.Linq; using OpenRA.Traits; namespace OpenRA.Mods.RA diff --git a/OpenRA.Mods.RA/PortableChrono.cs b/OpenRA.Mods.RA/PortableChrono.cs index 6f8f9d6489..da75f2a3d6 100644 --- a/OpenRA.Mods.RA/PortableChrono.cs +++ b/OpenRA.Mods.RA/PortableChrono.cs @@ -10,10 +10,10 @@ using System.Collections.Generic; using System.Drawing; +using OpenRA.Graphics; using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Orders; using OpenRA.Traits; -using OpenRA.Graphics; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/Render/RenderBuilding.cs b/OpenRA.Mods.RA/Render/RenderBuilding.cs index abf8800e7e..937589094a 100755 --- a/OpenRA.Mods.RA/Render/RenderBuilding.cs +++ b/OpenRA.Mods.RA/Render/RenderBuilding.cs @@ -11,9 +11,9 @@ using System; using System.Linq; using OpenRA.Graphics; +using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Buildings; using OpenRA.Traits; -using OpenRA.Mods.RA.Activities; namespace OpenRA.Mods.RA.Render { diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs index a3b25941b0..cd444a92a2 100755 --- a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs +++ b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs @@ -11,8 +11,8 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Graphics; -using OpenRA.Traits; using OpenRA.Mods.RA.Buildings; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Render { diff --git a/OpenRA.Mods.RA/Render/WithIdleOverlay.cs b/OpenRA.Mods.RA/Render/WithIdleOverlay.cs index 206ed8bb46..02b86f000b 100644 --- a/OpenRA.Mods.RA/Render/WithIdleOverlay.cs +++ b/OpenRA.Mods.RA/Render/WithIdleOverlay.cs @@ -10,8 +10,8 @@ using System.Linq; using OpenRA.Graphics; -using OpenRA.Traits; using OpenRA.Mods.RA.Buildings; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Render { diff --git a/OpenRA.Mods.RA/Render/WithRepairOverlay.cs b/OpenRA.Mods.RA/Render/WithRepairOverlay.cs index 0365ebe016..5b38a217b0 100644 --- a/OpenRA.Mods.RA/Render/WithRepairOverlay.cs +++ b/OpenRA.Mods.RA/Render/WithRepairOverlay.cs @@ -9,10 +9,10 @@ #endregion using System.Linq; -using OpenRA.Graphics; -using OpenRA.Traits; -using OpenRA.Mods.RA.Buildings; using OpenRA.Effects; +using OpenRA.Graphics; +using OpenRA.Mods.RA.Buildings; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Render { diff --git a/OpenRA.Mods.RA/Render/WithShadow.cs b/OpenRA.Mods.RA/Render/WithShadow.cs index 11c5653439..56ea245b56 100644 --- a/OpenRA.Mods.RA/Render/WithShadow.cs +++ b/OpenRA.Mods.RA/Render/WithShadow.cs @@ -12,8 +12,8 @@ using System; using System.Collections.Generic; using System.Linq; using OpenRA.Graphics; -using OpenRA.Traits; using OpenRA.Mods.RA.Air; +using OpenRA.Traits; namespace OpenRA.Mods.RA.Render { diff --git a/OpenRA.Mods.RA/SeedsResource.cs b/OpenRA.Mods.RA/SeedsResource.cs index 1c29550328..9fc911bf58 100644 --- a/OpenRA.Mods.RA/SeedsResource.cs +++ b/OpenRA.Mods.RA/SeedsResource.cs @@ -12,8 +12,8 @@ using System; using System.Collections.Generic; using System.Linq; using OpenRA.Mods.RA.Render; -using OpenRA.Traits; using OpenRA.Support; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/SupportPowers/GpsPower.cs b/OpenRA.Mods.RA/SupportPowers/GpsPower.cs index ded8887883..6561603630 100755 --- a/OpenRA.Mods.RA/SupportPowers/GpsPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/GpsPower.cs @@ -8,8 +8,8 @@ */ #endregion -using System.Linq; using System.Collections.Generic; +using System.Linq; using OpenRA.Effects; using OpenRA.Mods.RA.Effects; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/VoxelNormalsPalette.cs b/OpenRA.Mods.RA/VoxelNormalsPalette.cs index fdf9287932..9c18029495 100644 --- a/OpenRA.Mods.RA/VoxelNormalsPalette.cs +++ b/OpenRA.Mods.RA/VoxelNormalsPalette.cs @@ -9,8 +9,8 @@ #endregion using OpenRA.FileFormats; -using OpenRA.Traits; using OpenRA.Graphics; +using OpenRA.Traits; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs index ccbf01a429..8f14691864 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs @@ -9,9 +9,9 @@ #endregion using System; +using OpenRA.Support; using OpenRA.Traits; using OpenRA.Widgets; -using OpenRA.Support; namespace OpenRA.Mods.RA.Widgets.Logic { diff --git a/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs index b377f38287..9c23a5b7a6 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs @@ -10,8 +10,8 @@ using System; using System.Linq; -using OpenRA.Traits; using OpenRA.Network; +using OpenRA.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.RA.Widgets.Logic diff --git a/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs index 5a5c8066c8..4dfc424488 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs @@ -10,8 +10,8 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Drawing; +using System.Linq; using System.Net; using System.Text; using OpenRA.Network; diff --git a/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs b/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs index 57bce61c24..f9aaf00ffb 100644 --- a/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs +++ b/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs @@ -9,9 +9,9 @@ #endregion using System.Linq; +using OpenRA.Mods.RA.Widgets; using OpenRA.Traits; using OpenRA.Widgets; -using OpenRA.Mods.RA.Widgets; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs b/OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs index 69f6b6b6a2..5044cfdae2 100755 --- a/OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs +++ b/OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs @@ -12,8 +12,8 @@ using System; using System.Drawing; using OpenRA; using OpenRA.Graphics; -using SDL2; using OpenTK.Graphics.OpenGL; +using SDL2; [assembly: Renderer(typeof(OpenRA.Renderer.Sdl2.DeviceFactory))] diff --git a/OpenRA.Utility/ExtractLanguageStrings.cs b/OpenRA.Utility/ExtractLanguageStrings.cs index b620657bf7..e967af7c22 100644 --- a/OpenRA.Utility/ExtractLanguageStrings.cs +++ b/OpenRA.Utility/ExtractLanguageStrings.cs @@ -9,8 +9,8 @@ #endregion using System; -using System.IO; using System.Collections.Generic; +using System.IO; using System.Linq; namespace OpenRA.Utility diff --git a/OpenRA.Utility/Glob.cs b/OpenRA.Utility/Glob.cs index 82c67a3fcc..1314976b81 100644 --- a/OpenRA.Utility/Glob.cs +++ b/OpenRA.Utility/Glob.cs @@ -9,8 +9,8 @@ #endregion using System.Collections.Generic; -using System.Linq; using System.IO; +using System.Linq; namespace OpenRA.Utility { diff --git a/OpenRA.Utility/Program.cs b/OpenRA.Utility/Program.cs index 5f8a7ec73f..d5ee6a3b1f 100644 --- a/OpenRA.Utility/Program.cs +++ b/OpenRA.Utility/Program.cs @@ -10,8 +10,8 @@ using System; using System.Collections.Generic; -using System.Linq; using System.IO; +using System.Linq; using OpenRA.FileSystem; namespace OpenRA.Utility