From dea387c31e8ff598e8f844bdbf2a85a89694aecc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Nov 2018 16:29:56 +0900
Subject: [PATCH] Fix post-merge issues

---
 osu.Game.Tests/Visual/TestCaseRoomSettings.cs      |  2 +-
 .../Multi/Screens/Match/Settings/GameTypePicker.cs | 12 ++++++------
 .../Match/Settings/RoomAvailabilityPicker.cs       | 14 +++++++-------
 .../Screens/Match/Settings/RoomSettingsOverlay.cs  |  6 ++----
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseRoomSettings.cs b/osu.Game.Tests/Visual/TestCaseRoomSettings.cs
index 97cc2fbba7..40742ce709 100644
--- a/osu.Game.Tests/Visual/TestCaseRoomSettings.cs
+++ b/osu.Game.Tests/Visual/TestCaseRoomSettings.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Testing.Input;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Screens.Match.Settings;
-using OpenTK.Input;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual
 {
diff --git a/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs b/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs
index 317b078952..cd8b081b4e 100644
--- a/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs
+++ b/osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs
@@ -6,11 +6,11 @@ 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.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
-using OpenTK;
+using osuTK;
 
 namespace osu.Game.Screens.Multi.Screens.Match.Settings
 {
@@ -84,16 +84,16 @@ namespace osu.Game.Screens.Multi.Screens.Match.Settings
                 selection.Colour = colours.Yellow;
             }
 
-            protected override bool OnHover(InputState state)
+            protected override bool OnHover(HoverEvent e)
             {
                 hover.FadeTo(0.05f, transition_duration, Easing.OutQuint);
-                return base.OnHover(state);
+                return base.OnHover(e);
             }
 
-            protected override void OnHoverLost(InputState state)
+            protected override void OnHoverLost(HoverLostEvent e)
             {
                 hover.FadeOut(transition_duration, Easing.OutQuint);
-                base.OnHoverLost(state);
+                base.OnHoverLost(e);
             }
 
             protected override void OnActivated()
diff --git a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs
index e2f780d02b..251bd062ec 100644
--- a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs
+++ b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs
@@ -6,12 +6,12 @@ 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.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Multiplayer;
-using OpenTK;
-using OpenTK.Graphics;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.Screens.Match.Settings
 {
@@ -79,16 +79,16 @@ namespace osu.Game.Screens.Multi.Screens.Match.Settings
                 selection.Colour = colours.GreenLight;
             }
 
-            protected override bool OnHover(InputState state)
+            protected override bool OnHover(HoverEvent e)
             {
                 hover.FadeTo(0.05f, transition_duration, Easing.OutQuint);
-                return base.OnHover(state);
+                return base.OnHover(e);
             }
 
-            protected override void OnHoverLost(InputState state)
+            protected override void OnHoverLost(HoverLostEvent e)
             {
                 hover.FadeOut(transition_duration, Easing.OutQuint);
-                base.OnHoverLost(state);
+                base.OnHoverLost(e);
             }
 
             protected override void OnActivated()
diff --git a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs
index e87b05de30..d45ba48f0e 100644
--- a/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs
@@ -11,8 +11,8 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays.SearchableList;
-using OpenTK;
-using OpenTK.Graphics;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.Screens.Match.Settings
 {
@@ -26,7 +26,6 @@ namespace osu.Game.Screens.Multi.Screens.Match.Settings
         private readonly Bindable<GameType> typeBind = new Bindable<GameType>();
         private readonly Bindable<int?> maxParticipantsBind = new Bindable<int?>();
 
-        private readonly Room room;
         private readonly Container content;
         private readonly OsuSpriteText typeLabel;
 
@@ -37,7 +36,6 @@ namespace osu.Game.Screens.Multi.Screens.Match.Settings
 
         public RoomSettingsOverlay(Room room)
         {
-            this.room = room;
             Masking = true;
 
             Child = content = new Container