From 51fe951cd6b80dbfe8423f0a418169baff6eff4c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 25 Dec 2014 22:53:43 +0100 Subject: [PATCH] Move SupportPowers to Traits namespace --- OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs | 2 +- OpenRA.Mods.D2k/Widgets/SupportPowerBinWidget.cs | 2 +- OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs | 3 +-- OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs | 2 +- OpenRA.Mods.RA/SupportPowers/NukePower.cs | 2 +- OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs | 3 +-- OpenRA.Mods.RA/SupportPowers/SpawnActorPower.cs | 2 +- OpenRA.Mods.RA/SupportPowers/SupportPower.cs | 2 +- OpenRA.Mods.RA/SupportPowers/SupportPowerChargeBar.cs | 2 +- OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs | 2 +- OpenRA.Mods.RA/Widgets/Logic/SupportPowerTooltipLogic.cs | 2 +- OpenRA.Mods.RA/Widgets/ObserverSupportPowerIconsWidget.cs | 1 + OpenRA.Mods.RA/Widgets/SupportPowerTimerWidget.cs | 1 + OpenRA.Mods.RA/Widgets/SupportPowersWidget.cs | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs index 4270c90ff3..b9c454c411 100644 --- a/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs +++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs @@ -10,7 +10,7 @@ using OpenRA.Mods.Cnc.Effects; using OpenRA.Mods.Common.Activities; -using OpenRA.Mods.RA; +using OpenRA.Mods.RA.Traits; using OpenRA.Primitives; using OpenRA.Traits; diff --git a/OpenRA.Mods.D2k/Widgets/SupportPowerBinWidget.cs b/OpenRA.Mods.D2k/Widgets/SupportPowerBinWidget.cs index b97ac8d84f..79f8d78c29 100644 --- a/OpenRA.Mods.D2k/Widgets/SupportPowerBinWidget.cs +++ b/OpenRA.Mods.D2k/Widgets/SupportPowerBinWidget.cs @@ -13,7 +13,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Graphics; -using OpenRA.Mods.RA; +using OpenRA.Mods.RA.Traits; using OpenRA.Primitives; using OpenRA.Widgets; diff --git a/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs index 587508b87d..79bdfa6f3c 100644 --- a/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs +++ b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs @@ -14,11 +14,10 @@ using System.Linq; using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Effects; using OpenRA.Mods.RA.Activities; -using OpenRA.Mods.RA.Traits; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Traits { class AirstrikePowerInfo : SupportPowerInfo { diff --git a/OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs b/OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs index ff4fb5618c..6401357455 100644 --- a/OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs +++ b/OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs @@ -16,7 +16,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Render; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Traits { class GrantUpgradePowerInfo : SupportPowerInfo { diff --git a/OpenRA.Mods.RA/SupportPowers/NukePower.cs b/OpenRA.Mods.RA/SupportPowers/NukePower.cs index ee35a667f9..a2dc1c61ac 100755 --- a/OpenRA.Mods.RA/SupportPowers/NukePower.cs +++ b/OpenRA.Mods.RA/SupportPowers/NukePower.cs @@ -17,7 +17,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Traits { class NukePowerInfo : SupportPowerInfo, Requires { diff --git a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs index 63ecf25d61..65d874a578 100644 --- a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs @@ -14,11 +14,10 @@ using System.Linq; using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Effects; using OpenRA.Mods.RA.Activities; -using OpenRA.Mods.RA.Traits; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Traits { public class ParatroopersPowerInfo : SupportPowerInfo { diff --git a/OpenRA.Mods.RA/SupportPowers/SpawnActorPower.cs b/OpenRA.Mods.RA/SupportPowers/SpawnActorPower.cs index 75425787c8..ddc755fb5c 100755 --- a/OpenRA.Mods.RA/SupportPowers/SpawnActorPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/SpawnActorPower.cs @@ -14,7 +14,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Effects; using OpenRA.Primitives; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Traits { [Desc("Spawns an actor that stays for a limited amount of time.")] public class SpawnActorPowerInfo : SupportPowerInfo diff --git a/OpenRA.Mods.RA/SupportPowers/SupportPower.cs b/OpenRA.Mods.RA/SupportPowers/SupportPower.cs index 93ac8d56ef..f72425fe25 100755 --- a/OpenRA.Mods.RA/SupportPowers/SupportPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/SupportPower.cs @@ -11,7 +11,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Traits { public abstract class SupportPowerInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/SupportPowers/SupportPowerChargeBar.cs b/OpenRA.Mods.RA/SupportPowers/SupportPowerChargeBar.cs index 2011c21438..eb52c2d9b2 100644 --- a/OpenRA.Mods.RA/SupportPowers/SupportPowerChargeBar.cs +++ b/OpenRA.Mods.RA/SupportPowers/SupportPowerChargeBar.cs @@ -12,7 +12,7 @@ using System.Drawing; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Traits { [Desc("Display the time remaining until the super weapon attached to the actor is ready to the player and his allies.")] class SupportPowerChargeBarInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs b/OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs index e12c3ef08a..2e5acb3fa0 100644 --- a/OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs +++ b/OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs @@ -15,7 +15,7 @@ using OpenRA.Graphics; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Traits { [Desc("Attach this to the player actor.")] public class SupportPowerManagerInfo : ITraitInfo, Requires, Requires diff --git a/OpenRA.Mods.RA/Widgets/Logic/SupportPowerTooltipLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/SupportPowerTooltipLogic.cs index 1dad90ff84..234594633c 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/SupportPowerTooltipLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/SupportPowerTooltipLogic.cs @@ -9,7 +9,7 @@ #endregion using System; -using OpenRA.Mods.RA; +using OpenRA.Mods.RA.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.RA.Widgets.Logic diff --git a/OpenRA.Mods.RA/Widgets/ObserverSupportPowerIconsWidget.cs b/OpenRA.Mods.RA/Widgets/ObserverSupportPowerIconsWidget.cs index 8e9318d36f..037a199ad9 100644 --- a/OpenRA.Mods.RA/Widgets/ObserverSupportPowerIconsWidget.cs +++ b/OpenRA.Mods.RA/Widgets/ObserverSupportPowerIconsWidget.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Graphics; +using OpenRA.Mods.RA.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.RA.Widgets diff --git a/OpenRA.Mods.RA/Widgets/SupportPowerTimerWidget.cs b/OpenRA.Mods.RA/Widgets/SupportPowerTimerWidget.cs index 5ff7f3f744..cdaebc64e4 100644 --- a/OpenRA.Mods.RA/Widgets/SupportPowerTimerWidget.cs +++ b/OpenRA.Mods.RA/Widgets/SupportPowerTimerWidget.cs @@ -11,6 +11,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; +using OpenRA.Mods.RA.Traits; using OpenRA.Primitives; using OpenRA.Widgets; diff --git a/OpenRA.Mods.RA/Widgets/SupportPowersWidget.cs b/OpenRA.Mods.RA/Widgets/SupportPowersWidget.cs index e3677e8b87..e482152ad0 100644 --- a/OpenRA.Mods.RA/Widgets/SupportPowersWidget.cs +++ b/OpenRA.Mods.RA/Widgets/SupportPowersWidget.cs @@ -13,7 +13,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Graphics; -using OpenRA.Mods.RA; +using OpenRA.Mods.RA.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.RA.Widgets