global using

Mr-Ojii · Dec 29, 2023 · aaa14ff · aaa14ff
1 parent e79afe9
commit aaa14ff
Show file tree

Hide file tree

Showing 103 changed files with 101 additions and 707 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,10 +12,16 @@
     <Using Include="System.ComponentModel" />
     <Using Include="System.Diagnostics" />
     <Using Include="System.Drawing" />
+    <Using Include="System.Globalization" />
+    <Using Include="System.Net.NetworkInformation" />
     <Using Include="System.Numerics" />
     <Using Include="System.Reflection" />
     <Using Include="System.Runtime.InteropServices" />
+    <Using Include="System.Runtime.Serialization" />
     <Using Include="System.Text" />
+    <Using Include="System.Text.Json" />
+    <Using Include="System.Text.Json.Serialization" />
+    <Using Include="System.Text.RegularExpressions" />
     <Using Include="System.Xml.XPath" />
   </ItemGroup>
 

diff --git a/FDK19/src/04.Graphic/CTexture.cs b/FDK19/src/04.Graphic/CTexture.cs
@@ -1,11 +1,6 @@
 using SDL2;
 using SkiaSharp;
 
-using Rectangle = System.Drawing.Rectangle;
-using Point = System.Drawing.Point;
-using Color = System.Drawing.Color;
-using Size = System.Drawing.Size;
-
 namespace FDK;
 
 public class CTexture : IDisposable

diff --git a/FDK19/src/04.Graphic/CVideoDecoder.cs b/FDK19/src/04.Graphic/CVideoDecoder.cs
@@ -1,6 +1,4 @@
 using FFmpeg.AutoGen;
-
-using Size = System.Drawing.Size;
 using SkiaSharp;
 
 namespace FDK;

diff --git a/FDK19/src/04.Graphic/TextRenderer/CCachedFontRenderer.cs b/FDK19/src/04.Graphic/TextRenderer/CCachedFontRenderer.cs
@@ -1,7 +1,5 @@
 using SkiaSharp;
 
-using Color = System.Drawing.Color;
-
 namespace FDK;
 
 /// <summary>

diff --git a/FDK19/src/04.Graphic/TextRenderer/CFontRenderer.cs b/FDK19/src/04.Graphic/TextRenderer/CFontRenderer.cs
@@ -1,7 +1,5 @@
 using SkiaSharp;
 
-using Color = System.Drawing.Color;
-
 namespace FDK;
 
 public class CFontRenderer : IDisposable

diff --git a/FDK19/src/04.Graphic/TextRenderer/CSkiaSharpTextRenderer.cs b/FDK19/src/04.Graphic/TextRenderer/CSkiaSharpTextRenderer.cs
@@ -1,7 +1,5 @@
 using SkiaSharp;
 
-using Color = System.Drawing.Color;
-
 namespace FDK;
 
 internal class CSkiaSharpTextRenderer : ITextRenderer

diff --git a/FDK19/src/04.Graphic/TextRenderer/ITextRenderer.cs b/FDK19/src/04.Graphic/TextRenderer/ITextRenderer.cs
@@ -1,7 +1,5 @@
 using SkiaSharp;
 
-using Color = System.Drawing.Color;
-
 namespace FDK;
 
 internal interface ITextRenderer : IDisposable

diff --git a/TJAPlayer3-f/src/Common/CConfigIni.cs b/TJAPlayer3-f/src/Common/CConfigIni.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
-using System.Runtime.InteropServices;
-using System.IO;
-using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
-using FDK;
+using FDK;
 
 namespace TJAPlayer3;
 

diff --git a/TJAPlayer3-f/src/Common/CConfigToml.cs b/TJAPlayer3-f/src/Common/CConfigToml.cs
@@ -1,10 +1,4 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Diagnostics;
-using System.ComponentModel;
-using System.Collections.Generic;
-using FDK;
+using FDK;
 using Tomlyn;
 
 namespace TJAPlayer3;

diff --git a/TJAPlayer3-f/src/Common/CPad.cs b/TJAPlayer3-f/src/Common/CPad.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
-using FDK;
+using FDK;
 
 namespace TJAPlayer3;
 

diff --git a/TJAPlayer3-f/src/Common/CSkin.cs b/TJAPlayer3-f/src/Common/CSkin.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Diagnostics;
-using FDK;
-using System.Drawing;
-using System.Linq;
-using System.Runtime.Serialization;
+using FDK;
 using Tomlyn;
 
 namespace TJAPlayer3;

diff --git a/TJAPlayer3-f/src/Common/ConfigIniToSoundGroupLevelControllerBinder.cs b/TJAPlayer3-f/src/Common/ConfigIniToSoundGroupLevelControllerBinder.cs
@@ -1,5 +1,4 @@
-using System;
-using FDK;
+using FDK;
 
 namespace TJAPlayer3;
 
@@ -8,7 +7,7 @@ namespace TJAPlayer3;
 /// group level values, and keyboard sound level adjustment increment
 /// values, to flow between CConfigIni and the SoundGroupLevelController
 /// without either of those two classes being aware of one another.
-/// See those classes properties, methods, and events for more details. 
+/// See those classes properties, methods, and events for more details.
 /// </summary>
 internal static class ConfigIniToSoundGroupLevelControllerBinder
 {

diff --git a/TJAPlayer3-f/src/Common/C定数.cs b/TJAPlayer3-f/src/Common/C定数.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
-
-namespace TJAPlayer3;
+namespace TJAPlayer3;
 
 /// <summary>
 /// 難易度。

diff --git a/TJAPlayer3-f/src/Common/C文字コンソール.cs b/TJAPlayer3-f/src/Common/C文字コンソール.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Drawing;
-using FDK;
+using FDK;
 
 namespace TJAPlayer3;
 

diff --git a/TJAPlayer3-f/src/Common/DiscordRichPresence.cs b/TJAPlayer3-f/src/Common/DiscordRichPresence.cs
@@ -1,7 +1,4 @@
-using System.Runtime.InteropServices;
-using System.Reflection;
-using DiscordRPC;
-using System;
+using DiscordRPC;
 
 internal class DiscordRichPresence : IDisposable
 {

diff --git a/TJAPlayer3-f/src/Common/Program.cs b/TJAPlayer3-f/src/Common/Program.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Text.Json;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using System.Net.Http;
-using FDK;
+using FDK;
 using SDL2;
 
 namespace TJAPlayer3;

diff --git a/TJAPlayer3-f/src/Common/TJAPlayer3.cs b/TJAPlayer3-f/src/Common/TJAPlayer3.cs
@@ -1,23 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using System.Net.NetworkInformation;
-using System.Threading.Tasks;
-using FDK;
-using System.Reflection;
+using FDK;
 using SkiaSharp;
 
-using Rectangle = System.Drawing.Rectangle;
-using Point = System.Drawing.Point;
-using Color = System.Drawing.Color;
-using Size = System.Drawing.Size;
-using System.ComponentModel;
-
 namespace TJAPlayer3;
 
 internal class TJAPlayer3 : Game

diff --git a/TJAPlayer3-f/src/Items/CItemBase.cs b/TJAPlayer3-f/src/Items/CItemBase.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Globalization;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-
-namespace TJAPlayer3;
+namespace TJAPlayer3;
 
 /// <summary>
 /// すべてのアイテムの基本クラス。

diff --git a/TJAPlayer3-f/src/Items/CItemInteger.cs b/TJAPlayer3-f/src/Items/CItemInteger.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TJAPlayer3;
+namespace TJAPlayer3;
 
 /// <summary>
 /// 「整数」を表すアイテム。

diff --git a/TJAPlayer3-f/src/Items/CItemList.cs b/TJAPlayer3-f/src/Items/CItemList.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TJAPlayer3;
+namespace TJAPlayer3;
 
 /// <summary>
 /// 「リスト」（複数の固定値からの１つを選択可能）を表すアイテム。

diff --git a/TJAPlayer3-f/src/Items/CItemToggle.cs b/TJAPlayer3-f/src/Items/CItemToggle.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TJAPlayer3;
+namespace TJAPlayer3;
 
 /// <summary>
 /// 「トグル」（ON, OFF の2状態）を表すアイテム。

diff --git a/TJAPlayer3-f/src/Songs/CBoxDef.cs b/TJAPlayer3-f/src/Songs/CBoxDef.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-using System.IO;
-using System.Drawing;
-using FDK;
+using FDK;
 
 namespace TJAPlayer3;
 

diff --git a/TJAPlayer3-f/src/Songs/CDTX.cs b/TJAPlayer3-f/src/Songs/CDTX.cs
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Drawing;
-using System.Diagnostics;
-using System.IO;
-using System.Globalization;
-using System.Threading;
-using System.Text.RegularExpressions;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using FDK;
+using FDK;
 
 namespace TJAPlayer3;
 

diff --git a/TJAPlayer3-f/src/Songs/CDTXCompanionFileFinder.cs b/TJAPlayer3-f/src/Songs/CDTXCompanionFileFinder.cs
@@ -1,8 +1,4 @@
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-
-namespace TJAPlayer3;
+namespace TJAPlayer3;
 
 internal static class CDTXCompanionFileFinder
 {

diff --git a/TJAPlayer3-f/src/Songs/CDTXStyleExtractor.cs b/TJAPlayer3-f/src/Songs/CDTXStyleExtractor.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace TJAPlayer3;
+namespace TJAPlayer3;
 
 /// <summary>
 /// CDTXStyleExtractor determines if there is a session notation, and if there is then

diff --git a/TJAPlayer3-f/src/Songs/CScoreJson.cs b/TJAPlayer3-f/src/Songs/CScoreJson.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text.Json;
-using System.Collections.Generic;
-using FDK;
-
-namespace TJAPlayer3;
+namespace TJAPlayer3;
 
 public class CScoreJson
 {

diff --git a/TJAPlayer3-f/src/Songs/CSongsManager.cs b/TJAPlayer3-f/src/Songs/CSongsManager.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using TJAPlayer3.C曲リストノードComparers;
-using FDK;
+using TJAPlayer3.C曲リストノードComparers;
 
 namespace TJAPlayer3;
 

diff --git a/TJAPlayer3-f/src/Songs/ChartLoader/ChartLoader.cs b/TJAPlayer3-f/src/Songs/ChartLoader/ChartLoader.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using FDK;
+using FDK;
 
 namespace TJAPlayer3;
 

diff --git a/TJAPlayer3-f/src/Songs/Cスコア.cs b/TJAPlayer3-f/src/Songs/Cスコア.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
-using FDK;
+using FDK;
 
 namespace TJAPlayer3;
 

diff --git a/TJAPlayer3-f/src/Songs/C曲リストノード.cs b/TJAPlayer3-f/src/Songs/C曲リストノード.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Text.Json.Serialization;
-
-namespace TJAPlayer3;
+namespace TJAPlayer3;
 
 internal class C曲リストノード
 {

diff --git a/TJAPlayer3-f/src/Songs/C曲リストノードComparers/ComparerChain.cs b/TJAPlayer3-f/src/Songs/C曲リストノードComparers/ComparerChain.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace TJAPlayer3.C曲リストノードComparers;
+namespace TJAPlayer3.C曲リストノードComparers;
 
 internal sealed class ComparerChain<T> : IComparer<T> where T : class
 {

diff --git a/TJAPlayer3-f/src/Songs/C曲リストノードComparers/C曲リストノードComparerGenre.cs b/TJAPlayer3-f/src/Songs/C曲リストノードComparers/C曲リストノードComparerGenre.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Text;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-
-namespace TJAPlayer3.C曲リストノードComparers;
+namespace TJAPlayer3.C曲リストノードComparers;
 
 internal sealed class C曲リストノードComparerGenre : IComparer<C曲リストノード>
 {

diff --git a/TJAPlayer3-f/src/Songs/C曲リストノードComparers/C曲リストノードComparerタイトル.cs b/TJAPlayer3-f/src/Songs/C曲リストノードComparers/C曲リストノードComparerタイトル.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace TJAPlayer3.C曲リストノードComparers;
+namespace TJAPlayer3.C曲リストノードComparers;
 
 internal sealed class C曲リストノードComparerタイトル : IComparer<C曲リストノード>
 {

diff --git a/TJAPlayer3-f/src/Songs/C曲リストノードComparers/C曲リストノードComparerノード種別.cs b/TJAPlayer3-f/src/Songs/C曲リストノードComparers/C曲リストノードComparerノード種別.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace TJAPlayer3.C曲リストノードComparers;
+namespace TJAPlayer3.C曲リストノードComparers;
 
 internal sealed class C曲リストノードComparerNodeType : IComparer<C曲リストノード>
 {