From e3d37b808d6dad9f2a6916a3632d56970e11e320 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Wed, 19 Feb 2020 17:33:09 +0900 Subject: [PATCH] Move overlined displays to a higher namespace --- .../Visual/Multiplayer/TestSceneOverlinedParticipants.cs | 2 +- .../Visual/Multiplayer/TestSceneOverlinedPlaylist.cs | 2 +- .../Screens/Multi/{Match => }/Components/OverlinedDisplay.cs | 2 +- .../Multi/{Match => }/Components/OverlinedParticipants.cs | 3 +-- .../Screens/Multi/{Match => }/Components/OverlinedPlaylist.cs | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) rename osu.Game/Screens/Multi/{Match => }/Components/OverlinedDisplay.cs (98%) rename osu.Game/Screens/Multi/{Match => }/Components/OverlinedParticipants.cs (90%) rename osu.Game/Screens/Multi/{Match => }/Components/OverlinedPlaylist.cs (95%) diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs index e07ebc1454..575602d787 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs @@ -3,7 +3,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Game.Screens.Multi.Match.Components; +using osu.Game.Screens.Multi.Components; using osuTK; namespace osu.Game.Tests.Visual.Multiplayer diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs index cf4897be50..4e38f6d2c2 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs @@ -5,7 +5,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Online.Multiplayer; using osu.Game.Rulesets.Osu; -using osu.Game.Screens.Multi.Match.Components; +using osu.Game.Screens.Multi.Components; using osu.Game.Tests.Beatmaps; using osuTK; diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs similarity index 98% rename from osu.Game/Screens/Multi/Match/Components/OverlinedDisplay.cs rename to osu.Game/Screens/Multi/Components/OverlinedDisplay.cs index 854877bd1c..844337aed4 100644 --- a/osu.Game/Screens/Multi/Match/Components/OverlinedDisplay.cs +++ b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs @@ -9,7 +9,7 @@ using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osuTK; -namespace osu.Game.Screens.Multi.Match.Components +namespace osu.Game.Screens.Multi.Components { public abstract class OverlinedDisplay : MultiplayerComposite { diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedParticipants.cs b/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs similarity index 90% rename from osu.Game/Screens/Multi/Match/Components/OverlinedParticipants.cs rename to osu.Game/Screens/Multi/Components/OverlinedParticipants.cs index 7a4290a9a1..fbf2bb91c5 100644 --- a/osu.Game/Screens/Multi/Match/Components/OverlinedParticipants.cs +++ b/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs @@ -3,9 +3,8 @@ using osu.Framework.Allocation; using osu.Framework.Graphics; -using osu.Game.Screens.Multi.Components; -namespace osu.Game.Screens.Multi.Match.Components +namespace osu.Game.Screens.Multi.Components { public class OverlinedParticipants : OverlinedDisplay { diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedPlaylist.cs b/osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs similarity index 95% rename from osu.Game/Screens/Multi/Match/Components/OverlinedPlaylist.cs rename to osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs index eea85d9d64..4fe79b40a0 100644 --- a/osu.Game/Screens/Multi/Match/Components/OverlinedPlaylist.cs +++ b/osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs @@ -6,7 +6,7 @@ using osu.Framework.Bindables; using osu.Framework.Graphics; using osu.Game.Online.Multiplayer; -namespace osu.Game.Screens.Multi.Match.Components +namespace osu.Game.Screens.Multi.Components { public class OverlinedPlaylist : OverlinedDisplay {