FDK19: global using

Mr-Ojii · Dec 29, 2023 · f9a8356 · f9a8356
1 parent 905d2ff
commit f9a8356
Show file tree

Hide file tree

Showing 51 changed files with 66 additions and 303 deletions.
diff --git a/FDK19/FDK19.csproj b/FDK19/FDK19.csproj
@@ -7,6 +7,7 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>true</ImplicitUsings>
 
     <AssemblyName>FDK</AssemblyName>
     <RootNamespace>FDK</RootNamespace>
@@ -57,6 +58,21 @@
     <AdditionalFiles Include="../BannedSymbols.txt" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Using Include="System.Collections.Concurrent" />
+    <Using Include="System.Collections.Frozen" />
+    <Using Include="System.Collections.ObjectModel" />
+    <Using Include="System.Collections.Specialized" />
+    <Using Include="System.ComponentModel" />
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Drawing" />
+    <Using Include="System.Numerics" />
+    <Using Include="System.Reflection" />
+    <Using Include="System.Runtime.InteropServices" />
+    <Using Include="System.Text" />
+    <Using Include="System.Xml.XPath" />
+  </ItemGroup>
+
   <PropertyGroup>
     <PackageId>FDKライブラリ</PackageId>
     <Product>FDKライブラリ ver.21</Product>

diff --git a/FDK19/src/00.Common/CActivity.cs b/FDK19/src/00.Common/CActivity.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace FDK;
+namespace FDK;
 
 public class CActivity
 {

diff --git a/FDK19/src/00.Common/CCommon.cs b/FDK19/src/00.Common/CCommon.cs
@@ -1,5 +1,4 @@
-using System;
-using SkiaSharp;
+using SkiaSharp;
 
 namespace FDK;
 

diff --git a/FDK19/src/00.Common/CConvert.cs b/FDK19/src/00.Common/CConvert.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Linq;
-
-namespace FDK;
+namespace FDK;
 
 public static class CConvert
 {

diff --git a/FDK19/src/00.Common/CCounter.cs b/FDK19/src/00.Common/CCounter.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace FDK;
+namespace FDK;
 
 /// <summary>
 /// 一定間隔で単純増加する整数（カウント値）を扱う。

diff --git a/FDK19/src/00.Common/CFPS.cs b/FDK19/src/00.Common/CFPS.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace FDK;
+namespace FDK;
 
 public class CFPS
 {

diff --git a/FDK19/src/00.Common/CJudgeTextEncoding.cs b/FDK19/src/00.Common/CJudgeTextEncoding.cs
@@ -1,6 +1,4 @@
-using System.IO;
-
-namespace FDK;
+namespace FDK;
 
 public class CJudgeTextEncoding
 {

diff --git a/FDK19/src/00.Common/COS.cs b/FDK19/src/00.Common/COS.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace FDK;
+namespace FDK;
 
 public static class COS //2020.05.08 Mr-Ojii DTXManiaからいろいろと移植
 {

diff --git a/FDK19/src/00.Common/CTimer.cs b/FDK19/src/00.Common/CTimer.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
-using System.Diagnostics;
-
-namespace FDK;
+namespace FDK;
 
 public class CTimer : CTimerBase
 {

diff --git a/FDK19/src/00.Common/CTimerBase.cs b/FDK19/src/00.Common/CTimerBase.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace FDK;
+namespace FDK;
 
 /// <summary>
 /// <para>タイマの抽象クラス。</para>

diff --git a/FDK19/src/00.Common/CTraceLogListener.cs b/FDK19/src/00.Common/CTraceLogListener.cs
@@ -1,8 +1,4 @@
-using System;
-using System.IO;
-using System.Diagnostics;
-
-namespace FDK;
+namespace FDK;
 
 public class CTraceLogListener : TraceListener
 {

diff --git a/FDK19/src/00.Common/CWebOpen.cs b/FDK19/src/00.Common/CWebOpen.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace FDK;
+namespace FDK;
 
 public static class CWebOpen
 {

diff --git a/FDK19/src/01.Framework/Device.cs b/FDK19/src/01.Framework/Device.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FDK;
+namespace FDK;
 
 /// <summary>
 /// 大規模な変更がめんどくさかったために作ったクラス

diff --git a/FDK19/src/01.Framework/Game.cs b/FDK19/src/01.Framework/Game.cs
@@ -1,11 +1,4 @@
-using System;
-using System.ComponentModel;
-using System.Threading;
-using System.Reflection;
-using System.IO;
-using System.Text;
-using System.Runtime.InteropServices;
-using FDK.Windowing;
+using FDK.Windowing;
 
 namespace FDK;
 

diff --git a/FDK19/src/01.Framework/SDL2/GameWindow.cs b/FDK19/src/01.Framework/SDL2/GameWindow.cs
@@ -1,15 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.IO;
-using System.Drawing;
-using System.Diagnostics;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-using SDL2;
-using FDK;
+using SDL2;
 
 namespace FDK.Windowing;
 

diff --git a/FDK19/src/01.Framework/SDL2/MouseWheelEvent.cs b/FDK19/src/01.Framework/SDL2/MouseWheelEvent.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FDK.Windowing;
+namespace FDK.Windowing;
 
 public class MouseWheelEventArgs : EventArgs
 {

diff --git a/FDK19/src/01.Framework/SDL2/WindowState.cs b/FDK19/src/01.Framework/SDL2/WindowState.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FDK.Windowing;
+namespace FDK.Windowing;
 
 public enum WindowState
 {

diff --git a/FDK19/src/02.Input/CInputJoystick.cs b/FDK19/src/02.Input/CInputJoystick.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Concurrent;
-using SDL2;
-using System.Runtime.CompilerServices;
+using SDL2;
 
 namespace FDK;
 

diff --git a/FDK19/src/02.Input/CInputKeyboard.cs b/FDK19/src/02.Input/CInputKeyboard.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Concurrent;
-using SDL2;
-
-using SlimDXKey = SlimDXKeys.Key;
+using SDL2;
 
 namespace FDK;
 

diff --git a/FDK19/src/02.Input/CInputMIDI.cs b/FDK19/src/02.Input/CInputMIDI.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Concurrent;
-
-namespace FDK;
+namespace FDK;
 
 public class CInputMIDI : IInputDevice, IDisposable
 {

diff --git a/FDK19/src/02.Input/CInputManager.cs b/FDK19/src/02.Input/CInputManager.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using Commons.Music.Midi;
+using Commons.Music.Midi;
 
 namespace FDK;
 

diff --git a/FDK19/src/02.Input/CInputMouse.cs b/FDK19/src/02.Input/CInputMouse.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Concurrent;
-using SDL2;
+using SDL2;
 
 namespace FDK;
 

diff --git a/FDK19/src/02.Input/DeviceConstantConverter.cs b/FDK19/src/02.Input/DeviceConstantConverter.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Frozen;
-using System.Text;
-
-using SlimDXKey = SlimDXKeys.Key;
+using SlimDXKey = SlimDXKeys.Key;
 using SDLKey = SDL2.SDL.SDL_Scancode;
 
 namespace FDK;

diff --git a/FDK19/src/02.Input/EInputDeviceType.cs b/FDK19/src/02.Input/EInputDeviceType.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace FDK;
+namespace FDK;
 
 // 定数
 public enum EInputDeviceType

diff --git a/FDK19/src/02.Input/IInputDevice.cs b/FDK19/src/02.Input/IInputDevice.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace FDK;
+namespace FDK;
 
 public interface IInputDevice : IDisposable
 {

diff --git a/FDK19/src/02.Input/STInputEvent.cs b/FDK19/src/02.Input/STInputEvent.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
-
-namespace FDK;
+namespace FDK;
 
 public enum EInputEventType
 {

diff --git a/FDK19/src/02.Input/SlimDXKeys.cs b/FDK19/src/02.Input/SlimDXKeys.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SDL2;
-
-namespace SlimDXKeys;
+namespace SlimDXKeys;
 
 public enum Key
 {

diff --git a/FDK19/src/03.Sound/CAudioDecoder.cs b/FDK19/src/03.Sound/CAudioDecoder.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using FFmpeg.AutoGen;
+using FFmpeg.AutoGen;
 
 namespace FDK;
 

diff --git a/FDK19/src/03.Sound/CBassLibraryLoader.cs b/FDK19/src/03.Sound/CBassLibraryLoader.cs
@@ -1,12 +1,4 @@
-using System;
-using System.IO;
-using System.Reflection;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime;
-using System.Runtime.InteropServices;
-
-namespace FDK;
+namespace FDK;
 
 //Linuxでの"BASS must be loaded first"のエラー解消用
 

diff --git a/FDK19/src/03.Sound/CSound.cs b/FDK19/src/03.Sound/CSound.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using FDK.BassMixExtension;
+using FDK.BassMixExtension;
 using ManagedBass;
 using ManagedBass.Mix;
 using ManagedBass.Fx;

diff --git a/FDK19/src/03.Sound/CSoundDeviceASIO.cs b/FDK19/src/03.Sound/CSoundDeviceASIO.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using ManagedBass;
+using ManagedBass;
 using ManagedBass.Asio;
 using ManagedBass.Mix;
 

diff --git a/FDK19/src/03.Sound/CSoundDeviceBASS.cs b/FDK19/src/03.Sound/CSoundDeviceBASS.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.Reflection;
-using System.IO;
-using ManagedBass;
+using ManagedBass;
 using ManagedBass.Mix;
 
 namespace FDK;

diff --git a/FDK19/src/03.Sound/CSoundDeviceWASAPI.cs b/FDK19/src/03.Sound/CSoundDeviceWASAPI.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using ManagedBass;
+using ManagedBass;
 using ManagedBass.Wasapi;
 using ManagedBass.Mix;
 

diff --git a/FDK19/src/03.Sound/CSoundManager.cs b/FDK19/src/03.Sound/CSoundManager.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using System.IO;
-
-namespace FDK;
+namespace FDK;
 
 #region [ DTXMania用拡張 ]
 public class CSoundManager  // : CSound