From 8979b2849676c08c0c74ee1f9c8b8957b5072d3f Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Tue, 7 Mar 2017 16:17:51 +0800
Subject: [PATCH] Remove usages of the 'new' keyword.

---
 osu.Game/Overlays/Mods/AssistedSection.cs     |  2 +-
 .../Mods/DifficultyIncreaseSection.cs         |  2 +-
 .../Mods/DifficultyReductionSection.cs        |  2 +-
 osu.Game/Overlays/Mods/ModButton.cs           | 20 +++++++++----------
 osu.Game/Overlays/Mods/ModSection.cs          | 14 ++++++-------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/Mods/AssistedSection.cs b/osu.Game/Overlays/Mods/AssistedSection.cs
index a8c4b1909f..79a8981ecf 100644
--- a/osu.Game/Overlays/Mods/AssistedSection.cs
+++ b/osu.Game/Overlays/Mods/AssistedSection.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Mods
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Colour = colours.Blue;
+            BottonColour = colours.Blue;
             SelectedColour = colours.BlueLight;
         }
 
diff --git a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs
index 295eb4e173..88dc8cc9b6 100644
--- a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs
+++ b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Mods
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Colour = colours.Yellow;
+            BottonColour = colours.Yellow;
             SelectedColour = colours.YellowLight;
         }
 
diff --git a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs
index 4e7f13867e..8afcd1f289 100644
--- a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs
+++ b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Mods
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Colour = colours.Green;
+            BottonColour = colours.Green;
             SelectedColour = colours.GreenLight;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 3e353ac071..9e810a52f9 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Mods
 
                 iconsContainer.RotateTo(Selected ? 5f : 0f, 300, EasingTypes.OutElastic);
                 iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, EasingTypes.OutElastic);
-                foregroundIcon.Colour = Selected ? SelectedColour : Colour;
+                foregroundIcon.Colour = Selected ? SelectedColour : ButtonColour;
 
                 displaySelectedMod();
             }
@@ -60,17 +60,17 @@ namespace osu.Game.Overlays.Mods
 
         public bool Selected => selectedIndex != -1;
 
-        private Color4 backgroundColour;
-        public new Color4 Colour
+        private Color4 buttonColour;
+        public Color4 ButtonColour
         {
             get
             {
-                return backgroundColour;
+                return buttonColour;
             }
             set
             {
-                if (value == backgroundColour) return;
-                backgroundColour = value;
+                if (value == buttonColour) return;
+                buttonColour = value;
                 foreach (ModIcon icon in iconsContainer.Children)
                 {
                     icon.Colour = value;
@@ -180,7 +180,7 @@ namespace osu.Game.Overlays.Mods
                         Anchor = Anchor.Centre,
                         AutoSizeAxes = Axes.Both,
                         Position = new Vector2(1.5f),
-                        Colour = this.Colour
+                        Colour = this.ButtonColour
                     },
                     foregroundIcon = new ModIcon
                     {
@@ -188,7 +188,7 @@ namespace osu.Game.Overlays.Mods
                         Anchor = Anchor.Centre,
                         AutoSizeAxes = Axes.Both,
                         Position = new Vector2(-1.5f),
-                        Colour = this.Colour
+                        Colour = this.ButtonColour
                     },
                 });
             }
@@ -199,7 +199,7 @@ namespace osu.Game.Overlays.Mods
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     AutoSizeAxes = Axes.Both,
-                    Colour = this.Colour
+                    Colour = this.ButtonColour
                 });
             }
         }
@@ -208,7 +208,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
             foreach (ModIcon icon in iconsContainer.Children)
-                icon.Colour = Colour;
+                icon.Colour = ButtonColour;
         }
 
         public ModButton(Mod m)
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index cb9083af69..af713a2951 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Mods
 
                 foreach (ModButton button in value)
                 {
-                    button.Colour = Colour;
+                    button.ButtonColour = BottonColour;
                     button.SelectedColour = selectedColour;
                     button.Action = this.Action;
                 }
@@ -59,21 +59,21 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
-        private Color4 colour = Color4.White;
-        public new Color4 Colour
+        private Color4 buttonsBolour = Color4.White;
+        public Color4 BottonColour
         {
             get
             {
-                return colour;
+                return buttonsBolour;
             }
             set
             {
-                if (value == colour) return;
-                colour = value;
+                if (value == buttonsBolour) return;
+                buttonsBolour = value;
 
                 foreach (ModButton button in buttons)
                 {
-                    button.Colour = value;
+                    button.ButtonColour = value;
                 }
             }
         }