From 6372cd0a13e11b1f2c9048bcc0645164aceb8c90 Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Fri, 16 Jun 2017 16:36:23 +0800 Subject: [PATCH] Move namespace under Overlays. --- .../Profile/AboutSection.cs | 2 +- .../Profile/BeatmapsSection.cs | 2 +- .../Profile/HistoricalSection.cs | 2 +- .../Profile/KudosuSection.cs | 2 +- .../Profile/MedalsSection.cs | 2 +- .../Profile/ProfileHeader.cs | 4 ++-- .../Profile/ProfileSection.cs | 2 +- .../{Users => Overlays}/Profile/RankChart.cs | 3 ++- .../Profile/RanksSection.cs | 2 +- .../Profile/RecentSection.cs | 2 +- osu.Game/Overlays/UserProfileOverlay.cs | 2 +- osu.Game/osu.Game.csproj | 20 +++++++++---------- 12 files changed, 23 insertions(+), 22 deletions(-) rename osu.Game/{Users => Overlays}/Profile/AboutSection.cs (86%) rename osu.Game/{Users => Overlays}/Profile/BeatmapsSection.cs (87%) rename osu.Game/{Users => Overlays}/Profile/HistoricalSection.cs (87%) rename osu.Game/{Users => Overlays}/Profile/KudosuSection.cs (87%) rename osu.Game/{Users => Overlays}/Profile/MedalsSection.cs (87%) rename osu.Game/{Users => Overlays}/Profile/ProfileHeader.cs (97%) rename osu.Game/{Users => Overlays}/Profile/ProfileSection.cs (95%) rename osu.Game/{Users => Overlays}/Profile/RankChart.cs (96%) rename osu.Game/{Users => Overlays}/Profile/RanksSection.cs (87%) rename osu.Game/{Users => Overlays}/Profile/RecentSection.cs (87%) diff --git a/osu.Game/Users/Profile/AboutSection.cs b/osu.Game/Overlays/Profile/AboutSection.cs similarity index 86% rename from osu.Game/Users/Profile/AboutSection.cs rename to osu.Game/Overlays/Profile/AboutSection.cs index 572eb1a273..8dc27b1fdf 100644 --- a/osu.Game/Users/Profile/AboutSection.cs +++ b/osu.Game/Overlays/Profile/AboutSection.cs @@ -2,7 +2,7 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Users.Profile +namespace osu.Game.Overlays.Profile { public class AboutSection : ProfileSection { diff --git a/osu.Game/Users/Profile/BeatmapsSection.cs b/osu.Game/Overlays/Profile/BeatmapsSection.cs similarity index 87% rename from osu.Game/Users/Profile/BeatmapsSection.cs rename to osu.Game/Overlays/Profile/BeatmapsSection.cs index eb460bbbec..0748b7d943 100644 --- a/osu.Game/Users/Profile/BeatmapsSection.cs +++ b/osu.Game/Overlays/Profile/BeatmapsSection.cs @@ -1,7 +1,7 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Users.Profile +namespace osu.Game.Overlays.Profile { public class BeatmapsSection : ProfileSection { diff --git a/osu.Game/Users/Profile/HistoricalSection.cs b/osu.Game/Overlays/Profile/HistoricalSection.cs similarity index 87% rename from osu.Game/Users/Profile/HistoricalSection.cs rename to osu.Game/Overlays/Profile/HistoricalSection.cs index 1b767662cf..a4d03d1938 100644 --- a/osu.Game/Users/Profile/HistoricalSection.cs +++ b/osu.Game/Overlays/Profile/HistoricalSection.cs @@ -1,7 +1,7 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Users.Profile +namespace osu.Game.Overlays.Profile { public class HistoricalSection : ProfileSection { diff --git a/osu.Game/Users/Profile/KudosuSection.cs b/osu.Game/Overlays/Profile/KudosuSection.cs similarity index 87% rename from osu.Game/Users/Profile/KudosuSection.cs rename to osu.Game/Overlays/Profile/KudosuSection.cs index 3502c61822..bb3988230c 100644 --- a/osu.Game/Users/Profile/KudosuSection.cs +++ b/osu.Game/Overlays/Profile/KudosuSection.cs @@ -1,7 +1,7 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Users.Profile +namespace osu.Game.Overlays.Profile { public class KudosuSection : ProfileSection { diff --git a/osu.Game/Users/Profile/MedalsSection.cs b/osu.Game/Overlays/Profile/MedalsSection.cs similarity index 87% rename from osu.Game/Users/Profile/MedalsSection.cs rename to osu.Game/Overlays/Profile/MedalsSection.cs index 18ef779f83..eaefc4cc42 100644 --- a/osu.Game/Users/Profile/MedalsSection.cs +++ b/osu.Game/Overlays/Profile/MedalsSection.cs @@ -1,7 +1,7 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Users.Profile +namespace osu.Game.Overlays.Profile { public class MedalsSection : ProfileSection { diff --git a/osu.Game/Users/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs similarity index 97% rename from osu.Game/Users/Profile/ProfileHeader.cs rename to osu.Game/Overlays/Profile/ProfileHeader.cs index faedc18d09..3ea4d66008 100644 --- a/osu.Game/Users/Profile/ProfileHeader.cs +++ b/osu.Game/Overlays/Profile/ProfileHeader.cs @@ -14,9 +14,9 @@ using osu.Framework.Graphics.Textures; using osu.Game.Graphics; using osu.Game.Graphics.Containers; using osu.Game.Graphics.Sprites; -using osu.Game.Overlays; +using osu.Game.Users; -namespace osu.Game.Users.Profile +namespace osu.Game.Overlays.Profile { public class ProfileHeader : Container { diff --git a/osu.Game/Users/Profile/ProfileSection.cs b/osu.Game/Overlays/Profile/ProfileSection.cs similarity index 95% rename from osu.Game/Users/Profile/ProfileSection.cs rename to osu.Game/Overlays/Profile/ProfileSection.cs index ec938c13ac..dfefe7fba1 100644 --- a/osu.Game/Users/Profile/ProfileSection.cs +++ b/osu.Game/Overlays/Profile/ProfileSection.cs @@ -9,7 +9,7 @@ using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osu.Game.Overlays; -namespace osu.Game.Users.Profile +namespace osu.Game.Overlays.Profile { public abstract class ProfileSection : FillFlowContainer { diff --git a/osu.Game/Users/Profile/RankChart.cs b/osu.Game/Overlays/Profile/RankChart.cs similarity index 96% rename from osu.Game/Users/Profile/RankChart.cs rename to osu.Game/Overlays/Profile/RankChart.cs index 8581635cd7..26fba0dba5 100644 --- a/osu.Game/Users/Profile/RankChart.cs +++ b/osu.Game/Overlays/Profile/RankChart.cs @@ -13,8 +13,9 @@ using osu.Framework.Input; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; +using osu.Game.Users; -namespace osu.Game.Users.Profile +namespace osu.Game.Overlays.Profile { public class RankChart : Container { diff --git a/osu.Game/Users/Profile/RanksSection.cs b/osu.Game/Overlays/Profile/RanksSection.cs similarity index 87% rename from osu.Game/Users/Profile/RanksSection.cs rename to osu.Game/Overlays/Profile/RanksSection.cs index b2a35dbd21..df41077996 100644 --- a/osu.Game/Users/Profile/RanksSection.cs +++ b/osu.Game/Overlays/Profile/RanksSection.cs @@ -1,7 +1,7 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Users.Profile +namespace osu.Game.Overlays.Profile { public class RanksSection : ProfileSection { diff --git a/osu.Game/Users/Profile/RecentSection.cs b/osu.Game/Overlays/Profile/RecentSection.cs similarity index 87% rename from osu.Game/Users/Profile/RecentSection.cs rename to osu.Game/Overlays/Profile/RecentSection.cs index b1961491bb..7bc1b5def1 100644 --- a/osu.Game/Users/Profile/RecentSection.cs +++ b/osu.Game/Overlays/Profile/RecentSection.cs @@ -1,7 +1,7 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Users.Profile +namespace osu.Game.Overlays.Profile { public class RecentSection : ProfileSection { diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs index a44ffd0319..1b91075e9c 100644 --- a/osu.Game/Overlays/UserProfileOverlay.cs +++ b/osu.Game/Overlays/UserProfileOverlay.cs @@ -13,8 +13,8 @@ using osu.Game.Graphics.Containers; using osu.Game.Graphics.UserInterface; using osu.Game.Online.API; using osu.Game.Online.API.Requests; +using osu.Game.Overlays.Profile; using osu.Game.Users; -using osu.Game.Users.Profile; namespace osu.Game.Overlays { diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index c592a1dcd3..819fb83c60 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -97,18 +97,18 @@ - - - - - - - - + + + + + + + + - - + +