sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-05 12:57:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup nullability

Browse Source
This commit is contained in:
Dan Balasescu 2022-06-22 13:07:44 +09:00 committed by Dean Herbert
parent 23254d2ff2
commit 1018c9852d
4 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs
View File

@ -1,10 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System.Threading.Tasks; using System.Threading.Tasks;
using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Localisation; using osu.Framework.Localisation;
@ -17,14 +14,15 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
public class BeatmapSettings : SettingsSubsection public class BeatmapSettings : SettingsSubsection
{ {
protected override LocalisableString Header => "Beatmaps"; protected override LocalisableString Header => "Beatmaps";
private SettingsButton importBeatmapsButton;
private SettingsButton deleteBeatmapsButton;
private SettingsButton deleteBeatmapVideosButton;
private SettingsButton restoreButton;
private SettingsButton undeleteButton;
[BackgroundDependencyLoader(permitNulls: true)] private SettingsButton importBeatmapsButton = null!;
private void load(BeatmapManager beatmaps, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay) private SettingsButton deleteBeatmapsButton = null!;
private SettingsButton deleteBeatmapVideosButton = null!;
private SettingsButton restoreButton = null!;
private SettingsButton undeleteButton = null!;
[BackgroundDependencyLoader]
private void load(BeatmapManager beatmaps, LegacyImportManager? legacyImportManager, IDialogOverlay? dialogOverlay)
{ {
if (legacyImportManager?.SupportsImportFromStable == true) if (legacyImportManager?.SupportsImportFromStable == true)
{ {

10
osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs
View File

@ -1,9 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Collections; using osu.Game.Collections;
@ -15,10 +12,11 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
public class CollectionsSettings : SettingsSubsection public class CollectionsSettings : SettingsSubsection
{ {
protected override LocalisableString Header => "Collections"; protected override LocalisableString Header => "Collections";
private SettingsButton importCollectionsButton;
[BackgroundDependencyLoader(permitNulls: true)] private SettingsButton importCollectionsButton = null!;
private void load([CanBeNull] CollectionManager collectionManager, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay)
[BackgroundDependencyLoader]
private void load(CollectionManager? collectionManager, LegacyImportManager? legacyImportManager, IDialogOverlay? dialogOverlay)
{ {
if (collectionManager == null) return; if (collectionManager == null) return;

12
osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs
View File

@ -1,10 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System.Threading.Tasks; using System.Threading.Tasks;
using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Database; using osu.Game.Database;
@ -16,11 +13,12 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
public class ScoreSettings : SettingsSubsection public class ScoreSettings : SettingsSubsection
{ {
protected override LocalisableString Header => "Scores"; protected override LocalisableString Header => "Scores";
private SettingsButton importScoresButton;
private SettingsButton deleteScoresButton;
[BackgroundDependencyLoader(permitNulls: true)] private SettingsButton importScoresButton = null!;
private void load(ScoreManager scores, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay) private SettingsButton deleteScoresButton = null!;
[BackgroundDependencyLoader]
private void load(ScoreManager scores, LegacyImportManager? legacyImportManager, IDialogOverlay? dialogOverlay)
{ {
if (legacyImportManager?.SupportsImportFromStable == true) if (legacyImportManager?.SupportsImportFromStable == true)
{ {

12
osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs
View File

@ -1,10 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System.Threading.Tasks; using System.Threading.Tasks;
using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Database; using osu.Game.Database;
@ -16,11 +13,12 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
public class SkinSettings : SettingsSubsection public class SkinSettings : SettingsSubsection
{ {
protected override LocalisableString Header => "Skins"; protected override LocalisableString Header => "Skins";
private SettingsButton importSkinsButton;
private SettingsButton deleteSkinsButton;
[BackgroundDependencyLoader(permitNulls: true)] private SettingsButton importSkinsButton = null!;
private void load(SkinManager skins, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay) private SettingsButton deleteSkinsButton = null!;
[BackgroundDependencyLoader]
private void load(SkinManager skins, LegacyImportManager? legacyImportManager, IDialogOverlay? dialogOverlay)
{ {
if (legacyImportManager?.SupportsImportFromStable == true) if (legacyImportManager?.SupportsImportFromStable == true)
{ {