From 5d11db7753212439c219b7c60863eb4bfb6680cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Oct 2020 19:15:56 +0900
Subject: [PATCH] Locallise ChildItems to DrawableCarouselBeatmapSet for
 clarity

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs  | 2 +-
 osu.Game/Screens/Select/BeatmapCarousel.cs                    | 2 +-
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs     | 2 +-
 osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs      | 4 ----
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 239fa9ec4e..0ba8cfeb28 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -923,7 +923,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                         if (item is DrawableCarouselBeatmapSet set)
                         {
-                            foreach (var difficulty in set.ChildItems)
+                            foreach (var difficulty in set.DrawableBeatmaps)
                                 yield return difficulty;
                         }
                     }
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 21777c5c7c..c011ea7e05 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -640,7 +640,7 @@ namespace osu.Game.Screens.Select
 
                 if (item is DrawableCarouselBeatmapSet set)
                 {
-                    foreach (var diff in set.ChildItems)
+                    foreach (var diff in set.DrawableBeatmaps)
                         updateItem(diff, item);
                 }
             }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index e83c460f15..79387a9905 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
 
-        public override IEnumerable<DrawableCarouselItem> ChildItems => beatmapContainer?.Children ?? base.ChildItems;
+        public IEnumerable<DrawableCarouselItem> DrawableBeatmaps => beatmapContainer?.Children ?? Enumerable.Empty<DrawableCarouselItem>();
 
         private BeatmapSetInfo beatmapSet => (Item as CarouselBeatmapSet)?.BeatmapSet;
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
index df8d5cd565..cde3edad39 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -62,8 +60,6 @@ namespace osu.Game.Screens.Select.Carousel
             }
         }
 
-        public virtual IEnumerable<DrawableCarouselItem> ChildItems => Enumerable.Empty<DrawableCarouselItem>();
-
         protected DrawableCarouselItem()
         {
             RelativeSizeAxes = Axes.X;