From b4cd8ea7169efa65bf106fcefa6921d5cc930968 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 30 Jan 2018 14:54:30 +0900
Subject: [PATCH] GlobalKeyBindingContainer -> GlobalActionContainer

Consitent with "FrameworkActionContainer".
---
 ...lobalKeyBindingContainer.cs => GlobalActionContainer.cs} | 4 ++--
 osu.Game/OsuGameBase.cs                                     | 4 ++--
 osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs    | 6 +++---
 osu.Game/Overlays/KeyBindingOverlay.cs                      | 2 +-
 osu.Game/osu.Game.csproj                                    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename osu.Game/Input/Bindings/{GlobalKeyBindingContainer.cs => GlobalActionContainer.cs} (91%)

diff --git a/osu.Game/Input/Bindings/GlobalKeyBindingContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
similarity index 91%
rename from osu.Game/Input/Bindings/GlobalKeyBindingContainer.cs
rename to osu.Game/Input/Bindings/GlobalActionContainer.cs
index 2b8de20c67..46cda845aa 100644
--- a/osu.Game/Input/Bindings/GlobalKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -10,11 +10,11 @@ using osu.Framework.Input.Bindings;
 
 namespace osu.Game.Input.Bindings
 {
-    public class GlobalKeyBindingContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalInput
+    public class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalInput
     {
         private readonly Drawable handler;
 
-        public GlobalKeyBindingContainer(OsuGameBase game)
+        public GlobalActionContainer(OsuGameBase game)
         {
             if (game is IKeyBindingHandler<GlobalAction>)
                 handler = game;
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 9823ca479b..937b204c81 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -212,10 +212,10 @@ namespace osu.Game
         {
             base.LoadComplete();
 
-            GlobalKeyBindingContainer globalBinding;
+            GlobalActionContainer globalBinding;
 
             CursorOverrideContainer = new CursorOverrideContainer { RelativeSizeAxes = Axes.Both };
-            CursorOverrideContainer.Child = globalBinding = new GlobalKeyBindingContainer(this)
+            CursorOverrideContainer.Child = globalBinding = new GlobalActionContainer(this)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = content = new OsuTooltipContainer(CursorOverrideContainer.Cursor) { RelativeSizeAxes = Axes.Both　}
diff --git a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
index 8e87cac087..a4c1621266 100644
--- a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.KeyBinding
         public override FontAwesome Icon => FontAwesome.fa_osu_hot;
         public override string Header => "Global";
 
-        public GlobalKeyBindingsSection(GlobalKeyBindingContainer manager)
+        public GlobalKeyBindingsSection(GlobalActionContainer manager)
         {
             Add(new DefaultBindingsSubsection(manager));
             Add(new InGameKeyBindingsSubsection(manager));
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.KeyBinding
         {
             protected override string Header => string.Empty;
 
-            public DefaultBindingsSubsection(GlobalKeyBindingContainer manager)
+            public DefaultBindingsSubsection(GlobalActionContainer manager)
                 : base(null)
             {
                 Defaults = manager.GlobalKeyBindings;
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.KeyBinding
         {
             protected override string Header => "In Game";
 
-            public InGameKeyBindingsSubsection(GlobalKeyBindingContainer manager) : base(null)
+            public InGameKeyBindingsSubsection(GlobalActionContainer manager) : base(null)
             {
                 Defaults = manager.InGameKeyBindings;
             }
diff --git a/osu.Game/Overlays/KeyBindingOverlay.cs b/osu.Game/Overlays/KeyBindingOverlay.cs
index b6902b1c09..b311ee68c0 100644
--- a/osu.Game/Overlays/KeyBindingOverlay.cs
+++ b/osu.Game/Overlays/KeyBindingOverlay.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays
         protected override Drawable CreateHeader() => new SettingsHeader("key configuration", "Customise your keys!");
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(RulesetStore rulesets, GlobalKeyBindingContainer global)
+        private void load(RulesetStore rulesets, GlobalActionContainer global)
         {
             AddSection(new GlobalKeyBindingsSection(global));
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6276797b6f..4e048d60b9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -447,7 +447,7 @@
     <Compile Include="Graphics\UserInterface\Volume\VolumeMeter.cs" />
     <Compile Include="Input\Bindings\DatabasedKeyBinding.cs" />
     <Compile Include="Input\Bindings\DatabasedKeyBindingContainer.cs" />
-    <Compile Include="Input\Bindings\GlobalKeyBindingContainer.cs" />
+    <Compile Include="Input\Bindings\GlobalActionContainer.cs" />
     <Compile Include="Input\Handlers\ReplayInputHandler.cs" />
     <Compile Include="Input\KeyBindingStore.cs" />
     <Compile Include="IO\FileInfo.cs" />