epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up usings everywhere

Browse Source
This commit is contained in:
Chris Forbes
2011-05-16 18:23:14 +12:00
committed by Paul Chote
parent eb8aafced0
commit 310ecc34ce
46 changed files with 55 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Actor.cs
View File

@@ -13,7 +13,6 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Support;
using OpenRA.Traits;
using OpenRA.Traits.Activities;

1
OpenRA.Game/ActorReference.cs
View File

@@ -10,7 +10,6 @@
using System.Collections;
using System.Collections.Generic;
using System.IO;
namespace OpenRA.FileFormats
{

3
OpenRA.Game/Map.cs
View File

@@ -13,10 +13,9 @@ using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Security.Cryptography;
using OpenRA.FileFormats;
using System.Text;
using OpenRA.FileFormats;
namespace OpenRA
{

1
OpenRA.Game/Player.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Network;

1
OpenRA.Game/Utilities.cs
View File

@@ -10,7 +10,6 @@
using System;
using System.Diagnostics;
using System.Threading;
namespace OpenRA
{

2
OpenRA.Game/Widgets/BackgroundWidget.cs
View File

@@ -8,8 +8,6 @@
*/
#endregion
using OpenRA.Graphics;
namespace OpenRA.Widgets
{
public class BackgroundWidget : Widget

1
OpenRA.Game/Widgets/ChatDisplayWidget.cs
View File

@@ -11,7 +11,6 @@
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
namespace OpenRA.Widgets
{

1
OpenRA.Game/Widgets/ChatEntryWidget.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Network;
namespace OpenRA.Widgets

1
OpenRA.Game/Widgets/ColorBlockWidget.cs
View File

@@ -10,7 +10,6 @@
using System;
using System.Drawing;
using OpenRA.Graphics;
namespace OpenRA.Widgets
{

1
OpenRA.Game/Widgets/LabelWidget.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;

1
OpenRA.Game/Widgets/MapPreviewWidget.cs
View File

@@ -11,7 +11,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Graphics;

1
OpenRA.Game/Widgets/PerfGraphWidget.cs
View File

@@ -10,7 +10,6 @@
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Support;
namespace OpenRA.Widgets

2
OpenRA.Game/Widgets/ProgressBarWidget.cs
View File

@@ -10,8 +10,6 @@
using System;
using System.Drawing;
using System.Collections.Generic;
using OpenRA.Graphics;
namespace OpenRA.Widgets
{

2
OpenRA.Game/Widgets/ScrollPanelWidget.cs
View File

@@ -8,9 +8,9 @@
*/
#endregion
using System;
using System.Drawing;
using OpenRA.Graphics;
using System;
namespace OpenRA.Widgets
{

1
OpenRA.Game/Widgets/ScrollingTextWidget.cs
View File

@@ -10,7 +10,6 @@
using System;
using System.Drawing;
using OpenRA.Graphics;
namespace OpenRA.Widgets
{

1
OpenRA.Game/Widgets/SliderWidget.cs
View File

@@ -10,7 +10,6 @@
using System;
using System.Drawing;
using OpenRA.Graphics;
namespace OpenRA.Widgets
{

1
OpenRA.Game/Widgets/TimerWidget.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Support;
namespace OpenRA.Widgets

2
OpenRA.Game/Widgets/WidgetUtils.cs
View File

@@ -9,10 +9,10 @@
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using System.Collections.Generic;
namespace OpenRA.Widgets
{

2
OpenRA.Game/World.cs
View File

@@ -15,8 +15,8 @@ using OpenRA.Effects;
using OpenRA.FileFormats;
using OpenRA.Network;
using OpenRA.Orders;
using OpenRA.Traits;
using OpenRA.Support;
using OpenRA.Traits;
using XRandom = OpenRA.Thirdparty.Random;
namespace OpenRA

10
OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
View File

@@ -8,14 +8,14 @@
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using System.Collections.Generic;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Render;
using System;
namespace OpenRA.Mods.Cnc
{

1
OpenRA.Mods.Cnc/CncColorPickerPaletteModifier.cs
View File

@@ -12,7 +12,6 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using OpenRA.Mods.Cnc.Widgets;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc

8
OpenRA.Mods.Cnc/CncLoadScreen.cs
View File

@@ -10,12 +10,10 @@
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Support;
using OpenRA.Graphics;
using OpenRA.Widgets;
using OpenRA.FileFormats;
using System;
using OpenRA.Graphics;
using OpenRA.Support;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc
{

3
OpenRA.Mods.Cnc/CncWaterPaletteRotation.cs
View File

@@ -8,10 +8,9 @@
*/
#endregion
using System.Drawing;
using OpenRA.Traits;
using System.Collections.Generic;
using OpenRA.FileFormats;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc
{

2
OpenRA.Mods.Cnc/IonCannonPower.cs
View File

@@ -10,8 +10,6 @@
using OpenRA.Mods.Cnc.Effects;
using OpenRA.Mods.RA;
using OpenRA.Orders;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc
{

3
OpenRA.Mods.Cnc/Missions/CncShellmapScript.cs
View File

@@ -10,11 +10,10 @@
using System;
using System.Collections.Generic;
using OpenRA.Mods.RA.Air;
using OpenRA.Traits;
using OpenRA.FileFormats;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Move;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{

4
OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
View File

@@ -8,17 +8,13 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA;
using OpenRA.FileFormats;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Move;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc
{

2
OpenRA.Mods.Cnc/PoisonedByTiberium.cs
View File

@@ -9,8 +9,6 @@
#endregion
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.RA;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc

3
OpenRA.Mods.Cnc/ProductionAirdrop.cs
View File

@@ -12,10 +12,9 @@ using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.Mods.RA.Air;
namespace OpenRA.Mods.Cnc
{

3
OpenRA.Mods.Cnc/RenderCargo.cs
View File

@@ -8,11 +8,10 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
using OpenRA.Mods.RA;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc
{

2
OpenRA.Mods.Cnc/RenderGunboat.cs
View File

@@ -8,9 +8,9 @@
*/
#endregion
using System;
using OpenRA.Graphics;
using OpenRA.Traits;
using System;
namespace OpenRA.Mods.RA.Render
{

4
OpenRA.Mods.Cnc/SpawnViceroid.cs
View File

@@ -8,9 +8,9 @@
*/
#endregion
using OpenRA.Traits;
using OpenRA.FileFormats;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc
{

6
OpenRA.Mods.Cnc/TiberiumRefinery.cs
View File

@@ -8,14 +8,10 @@
*/
#endregion
using System.Drawing;
using System.Collections.Generic;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.Mods.RA.Move;
using System.Collections.Generic;
namespace OpenRA.Mods.Cnc
{

2
OpenRA.Mods.Cnc/Widgets/CncCheatsLogic.cs
View File

@@ -18,8 +18,6 @@
*/
#endregion
using System;
using OpenRA;
using OpenRA.Traits;
using OpenRA.Widgets;

3
OpenRA.Mods.Cnc/Widgets/CncConnectionLogic.cs
View File

@@ -8,10 +8,9 @@
*/
#endregion
using System;
using OpenRA.Network;
using OpenRA.Widgets;
using System;
using System.Collections.Generic;
namespace OpenRA.Mods.Cnc.Widgets
{

6
OpenRA.Mods.Cnc/Widgets/CncIngameChromeLogic.cs
View File

@@ -8,12 +8,10 @@
*/
#endregion
using OpenRA.Traits;
using OpenRA.Widgets;
using System.Drawing;
using System.Collections.Generic;
using System;
using System.Drawing;
using OpenRA.Mods.RA;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets
{

2
OpenRA.Mods.Cnc/Widgets/CncInstallLogic.cs
View File

@@ -16,8 +16,8 @@ using System.Linq;
using System.Net;
using System.Threading;
using OpenRA.FileFormats;
using OpenRA.Widgets;
using OpenRA.Mods.RA.Widgets.Delegates;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets
{

2
OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs
View File

@@ -13,10 +13,10 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using OpenRA.Network;
using OpenRA.Traits;
using OpenRA.Widgets;
using OpenRA.Graphics;
namespace OpenRA.Mods.Cnc.Widgets
{

9
OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs
View File

@@ -8,14 +8,11 @@
*/
#endregion
using System.Drawing;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Network;
using OpenRA.Widgets;
using System.IO;
using System;
using System.IO;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets
{

12
OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs
View File

@@ -8,18 +8,10 @@
*/
#endregion
using System.Collections.Generic;
using OpenRA.FileFormats;
using System.Net;
using OpenRA.Network;
using OpenRA.Server;
using OpenRA.Widgets;
using System;
using System.Drawing;
using System.Linq;
using OpenRA.GameRules;
using System.Net;
using OpenRA.Mods.RA;
using OpenRA.Support;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets
{

5
OpenRA.Mods.Cnc/Widgets/CncModBrowserLogic.cs
View File

@@ -11,13 +11,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Widgets.Delegates;
using OpenRA.Server;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets

13
OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs
View File

@@ -9,16 +9,13 @@
#endregion
using System;
using System.Drawing;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Support;
using OpenRA.Widgets;
using OpenRA.Traits;
using OpenRA.Graphics;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets
{

13
OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs
View File

@@ -9,25 +9,22 @@
#endregion
using System;
using System.Drawing;
using System.IO;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Network;
using OpenRA.Widgets;
using OpenRA.Mods.RA.Widgets.Delegates;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Widgets.Delegates;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets
{
public class CncReplayBrowserLogic : IWidgetDelegate
{
Widget panel;
Widget panel;
[ObjectCreator.UseCtor]
public CncReplayBrowserLogic([ObjectCreator.Param] Widget widget,
[ObjectCreator.Param] Action onExit,
[ObjectCreator.Param] Action onStart)
[ObjectCreator.Param] Action onExit,
[ObjectCreator.Param] Action onStart)
{
panel = widget.GetWidget("REPLAYBROWSER_PANEL");

22
OpenRA.Mods.Cnc/Widgets/CncServerCreationLogic.cs
View File

@@ -8,12 +8,11 @@
*/
#endregion
using System;
using System.Linq;
using System.Net;
using OpenRA.Widgets;
using System;
using System.Collections.Generic;
using OpenRA.GameRules;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets
{
@@ -24,15 +23,16 @@ namespace OpenRA.Mods.Cnc.Widgets
Action onExit;
Map map;
bool advertiseOnline;
[ObjectCreator.UseCtor]
public CncServerCreationLogic([ObjectCreator.Param] Widget widget,
[ObjectCreator.Param] Action onExit,
[ObjectCreator.Param] Action openLobby)
[ObjectCreator.Param] Action onExit,
[ObjectCreator.Param] Action openLobby)
{
panel = widget.GetWidget("CREATESERVER_PANEL");
onCreate = openLobby;
this.onExit = onExit;
var settings = Game.Settings;
panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
panel.GetWidget<ButtonWidget>("CREATE_BUTTON").OnClick = CreateAndJoin;
@@ -64,22 +64,22 @@ namespace OpenRA.Mods.Cnc.Widgets
var advertiseCheckbox = panel.GetWidget<CncCheckboxWidget>("ADVERTISE_CHECKBOX");
advertiseCheckbox.IsChecked = () => advertiseOnline;
advertiseCheckbox.OnClick = () => advertiseOnline ^= true;
// Disable these until we have some logic behind them
panel.GetWidget<CncTextFieldWidget>("SERVER_DESC").IsDisabled = () => true;
panel.GetWidget<CncTextFieldWidget>("SERVER_PASSWORD").IsDisabled = () => true;
}
void CreateAndJoin()
{
var name = panel.GetWidget<TextFieldWidget>("SERVER_NAME").Text;
int listenPort, externalPort;
if (!int.TryParse(panel.GetWidget<TextFieldWidget>("LISTEN_PORT").Text, out listenPort))
listenPort = 1234;
if (!int.TryParse(panel.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text, out externalPort))
externalPort = 1234;
// Save new settings
Game.Settings.Server.Name = name;
Game.Settings.Server.ListenPort = listenPort;
@@ -90,7 +90,7 @@ namespace OpenRA.Mods.Cnc.Widgets
// Take a copy so that subsequent changes don't affect the server
var settings = new ServerSettings(Game.Settings.Server);
// Create and join the server
Game.CreateServer(settings);
Widget.CloseWindow();

4
OpenRA.Mods.Cnc/Widgets/CncSettingsLogic.cs
View File

@@ -9,12 +9,12 @@
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using OpenRA.FileFormats;
using OpenRA.FileFormats.Graphics;
using OpenRA.GameRules;
using OpenRA.Widgets;
using System.Collections.Generic;
using System.Drawing;
namespace OpenRA.Mods.Cnc.Widgets
{

4
OpenRA.Mods.Cnc/WithFire.cs
View File

@@ -8,10 +8,8 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc
{

4
OpenRA.Mods.Cnc/WithRoof.cs
View File

@@ -8,10 +8,8 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc
{