diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs index f02a9a176c..ff0abd3d78 100644 --- a/osu.Game/Beatmaps/BeatmapManager.cs +++ b/osu.Game/Beatmaps/BeatmapManager.cs @@ -341,6 +341,8 @@ namespace osu.Game.Beatmaps /// Returns a to a usable state if it has previously been deleted but not yet purged. /// Is a no-op for already usable beatmaps. /// + /// The store to restore beatmaps from. + /// The store to restore beatmap files from. /// The beatmap to restore. private void undelete(BeatmapStore beatmaps, FileStore files, BeatmapSetInfo beatmapSet) { @@ -426,6 +428,8 @@ namespace osu.Game.Beatmaps /// Import a beamap into our local storage. /// If the beatmap is already imported, the existing instance will be returned. /// + /// The store to import beatmap files to. + /// The store to import beatmaps to. /// The beatmap archive to be read. /// The imported beatmap, or an existing instance if it is already present. private BeatmapSetInfo importToStorage(FileStore files, BeatmapStore beatmaps, ArchiveReader reader) diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs index cb2bdf5c9f..928c355696 100644 --- a/osu.Game/Database/OsuDbContext.cs +++ b/osu.Game/Database/OsuDbContext.cs @@ -102,7 +102,7 @@ namespace osu.Game.Database return null; } - public new int SaveChanges(IDbContextTransaction transaction = null) + public int SaveChanges(IDbContextTransaction transaction = null) { var ret = base.SaveChanges(); transaction?.Commit(); @@ -262,7 +262,7 @@ namespace osu.Game.Database throw new MigrationFailedException(e); } } - catch (MigrationFailedException e) + catch (MigrationFailedException) { throw; } diff --git a/osu.Game/IO/FileStore.cs b/osu.Game/IO/FileStore.cs index 93d1086ee5..4eca310424 100644 --- a/osu.Game/IO/FileStore.cs +++ b/osu.Game/IO/FileStore.cs @@ -19,7 +19,7 @@ namespace osu.Game.IO { public readonly IResourceStore Store; - public Storage Storage => base.Storage; + public new Storage Storage => base.Storage; public FileStore(Func createContext, Storage storage) : base(createContext, storage.GetStorageForDirectory(@"files")) { diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs index e03fc91aa7..a3933b775e 100644 --- a/osu.Game/Overlays/Settings/SettingsItem.cs +++ b/osu.Game/Overlays/Settings/SettingsItem.cs @@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Settings private SpriteText text; - private readonly RestoreDefaultValueButton restoreDefaultValueButton = new RestoreDefaultValueButton(); + private readonly RestoreDefaultValueButton restoreDefaultValueButton = new RestoreDefaultValueButton(); public bool ShowsDefaultIndicator = true; @@ -132,7 +132,7 @@ namespace osu.Game.Overlays.Settings } } - private class RestoreDefaultValueButton : Box, IHasTooltip + private class RestoreDefaultValueButton : Box, IHasTooltip { private Bindable bindable; internal Bindable Bindable diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs index 587853be59..3e1d0329a9 100644 --- a/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs +++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs @@ -114,7 +114,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline } /// - /// Zoom target as a relative position in the space. + /// Zoom target as a relative position in the space. /// private float? relativeContentZoomTarget;