From 7d8c0aca7264ebadc6b2f17e910804db367900de Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Tue, 14 Aug 2018 12:25:35 -0300 Subject: [PATCH] Order usings, use inline out variable declaration. --- osu.Game.Tests/Visual/TestCaseRoomSettings.cs | 5 ++--- .../Screens/Multi/Screens/Match/Settings/GameTypePicker.cs | 2 +- .../Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs | 2 +- .../Multi/Screens/Match/Settings/RoomSettingsOverlay.cs | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/osu.Game.Tests/Visual/TestCaseRoomSettings.cs b/osu.Game.Tests/Visual/TestCaseRoomSettings.cs index e735d9721d..ba13fa9b24 100644 --- a/osu.Game.Tests/Visual/TestCaseRoomSettings.cs +++ b/osu.Game.Tests/Visual/TestCaseRoomSettings.cs @@ -3,11 +3,11 @@ using NUnit.Framework; using osu.Framework.Graphics; +using osu.Framework.Testing.Input; using osu.Game.Graphics.UserInterface; using osu.Game.Online.Multiplayer; using osu.Game.Screens.Multi.Screens.Match.Settings; using OpenTK.Input; -using osu.Framework.Testing.Input; namespace osu.Game.Tests.Visual { @@ -86,8 +86,7 @@ namespace osu.Game.Tests.Visual { get { - int max; - if (int.TryParse(MaxParticipantsField.Text, out max)) + if (int.TryParse(MaxParticipantsField.Text, out int max)) return max; return null; diff --git a/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs b/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs index 83e4055c28..be1f227460 100644 --- a/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs +++ b/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs @@ -6,12 +6,12 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.UserInterface; +using osu.Framework.Input.States; using osu.Game.Graphics; using osu.Game.Online.Multiplayer; using osu.Game.Screens.Multi.Components; using OpenTK; using OpenTK.Graphics; -using osu.Framework.Input.States; namespace osu.Game.Screens.Multi.Screens.Match.Settings { diff --git a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs index 240938eed2..e2f780d02b 100644 --- a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs +++ b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs @@ -6,11 +6,11 @@ using osu.Framework.Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.UserInterface; +using osu.Framework.Input.States; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osu.Game.Online.Multiplayer; using OpenTK; -using osu.Framework.Input.States; using OpenTK.Graphics; namespace osu.Game.Screens.Multi.Screens.Match.Settings diff --git a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs index 7f12b9fb5b..bb15a4cad5 100644 --- a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs +++ b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs @@ -184,8 +184,7 @@ namespace osu.Game.Screens.Multi.Screens.Match.Settings room.Availability.Value = AvailabilityPicker.Current.Value; room.Type.Value = TypePicker.Current.Value; - int max; - if (int.TryParse(MaxParticipantsField.Text, out max)) + if (int.TryParse(MaxParticipantsField.Text, out int max)) room.MaxParticipants.Value = max; else room.MaxParticipants.Value = null;