Make entire AL_Common.Common global-using'd

FenPhoenix · Dec 15, 2024 · 060c83b · 060c83b
1 parent 497e331
commit 060c83b
Show file tree

Hide file tree

Showing 118 changed files with 22 additions and 175 deletions.
diff --git a/AL_Common/FastZipReader/ZipArchiveFast.cs b/AL_Common/FastZipReader/ZipArchiveFast.cs
@@ -8,7 +8,6 @@
 using System.IO;
 using System.Text;
 using JetBrains.Annotations;
-using static AL_Common.Common;
 using static AL_Common.FastZipReader.ZipArchiveFast_Common;
 
 namespace AL_Common.FastZipReader;

diff --git a/AL_Common/FastZipReader/ZipArchiveFast_Common.cs b/AL_Common/FastZipReader/ZipArchiveFast_Common.cs
@@ -5,7 +5,6 @@
 using System.Runtime.CompilerServices;
 using AL_Common.FastZipReader.Deflate64Managed;
 using JetBrains.Annotations;
-using static AL_Common.Common;
 
 namespace AL_Common.FastZipReader;
 

diff --git a/AL_Common/FastZipReader/ZipArchiveFast_Threaded.cs b/AL_Common/FastZipReader/ZipArchiveFast_Threaded.cs
@@ -4,7 +4,6 @@
 // Zip Spec here: http://www.pkware.com/documents/casestudies/APPNOTE.TXT
 
 using System.IO;
-using static AL_Common.Common;
 using static AL_Common.FastZipReader.ZipArchiveFast_Common;
 
 namespace AL_Common.FastZipReader;

diff --git a/AL_Common/FastZipReader/ZipBlocks.cs b/AL_Common/FastZipReader/ZipBlocks.cs
@@ -4,7 +4,6 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
-using static AL_Common.Common;
 using static AL_Common.FastZipReader.ZipArchiveFast_Common;
 
 namespace AL_Common.FastZipReader;

diff --git a/AL_Common/Fen7z.cs b/AL_Common/Fen7z.cs
@@ -4,7 +4,6 @@
 using System.IO;
 using System.Threading;
 using JetBrains.Annotations;
-using static AL_Common.Common;
 
 namespace AL_Common;
 

diff --git a/AL_Common/FullyGlobal.cs b/AL_Common/FullyGlobal.cs
diff --git a/AL_Common/General/Common.cs b/AL_Common/General/Common.cs
@@ -425,4 +425,15 @@ public static unsafe string Path_GetRandomFileName()
     #endregion
 
     #endregion
+
+    /// <summary>
+    /// Shorthand for <see cref="Environment.NewLine"/>
+    /// </summary>
+    public static readonly string NL = Environment.NewLine;
+
+    public const int StreamCopyBufferSize = 81920;
+    public const int FileStreamBufferSize = 4096;
+
+    // Immediately static init for thread safety
+    public static readonly Encoding UTF8NoBOM = new UTF8Encoding(false, true);
 }
diff --git a/AL_Common/GlobalUsings.cs b/AL_Common/GlobalUsings.cs
@@ -1 +1,2 @@
-global using static AL_Common.FullyGlobal;
+global using AL_Common;
+global using static AL_Common.Common;
diff --git a/AL_Common/IO/FastIO_Native.cs b/AL_Common/IO/FastIO_Native.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using static AL_Common.Common;
 
 namespace AL_Common;
 

diff --git a/AL_Common/Logger.cs b/AL_Common/Logger.cs
@@ -5,7 +5,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using JetBrains.Annotations;
-using static AL_Common.Common;
 
 namespace AL_Common;
 

diff --git a/AL_Common/RTF/RTFParserCommon.cs b/AL_Common/RTF/RTFParserCommon.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using static AL_Common.Common;
 
 namespace AL_Common;
 

diff --git a/AL_Common/RTF/RtfDisplayedReadmeParser.cs b/AL_Common/RTF/RtfDisplayedReadmeParser.cs
@@ -3,7 +3,6 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using JetBrains.Annotations;
-using static AL_Common.Common;
 using static AL_Common.RTFParserCommon;
 
 namespace AL_Common;

diff --git a/AL_Common/RTF/RtfToTextConverter.cs b/AL_Common/RTF/RtfToTextConverter.cs
@@ -75,7 +75,6 @@ afforded by being able to move the stream index freely.
 using System.Runtime.CompilerServices;
 using System.Text;
 using JetBrains.Annotations;
-using static AL_Common.Common;
 using static AL_Common.RTFParserCommon;
 
 namespace AL_Common;

diff --git a/AL_Common/RTF/RtfToTextConverter_DupeSource.cs b/AL_Common/RTF/RtfToTextConverter_DupeSource.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using static AL_Common.Common;
 using static AL_Common.FenGenAttributes;
 using static AL_Common.RTFParserCommon;
 

diff --git a/AL_Common/TDMCommon.cs b/AL_Common/TDMCommon.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
-using static AL_Common.Common;
 
 namespace AL_Common;
 

diff --git a/AngelLoader/Common/Comparers.cs b/AngelLoader/Common/Comparers.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
-using AL_Common;
 using AngelLoader.DataClasses;
 using static AngelLoader.GameSupport;
 using static AngelLoader.Global;

diff --git a/AngelLoader/Common/DataClasses/CatAndTags.cs b/AngelLoader/Common/DataClasses/CatAndTags.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using static AL_Common.Common;
 
 namespace AngelLoader.DataClasses;
 

diff --git a/AngelLoader/Common/DataClasses/ConfigData.cs b/AngelLoader/Common/DataClasses/ConfigData.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using static AL_Common.Common;
 using static AngelLoader.GameSupport;
 using static AngelLoader.Misc;
 

diff --git a/AngelLoader/Common/DataClasses/ConfigDataSupporting.cs b/AngelLoader/Common/DataClasses/ConfigDataSupporting.cs
@@ -6,8 +6,6 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using AL_Common;
-using static AL_Common.Common;
 using static AL_Common.FenGenAttributes;
 using static AngelLoader.GameSupport;
 using static AngelLoader.Misc;

diff --git a/AngelLoader/Common/DataClasses/FMData.cs b/AngelLoader/Common/DataClasses/FMData.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using AL_Common;
 using JetBrains.Annotations;
 using static AL_Common.FenGenAttributes;
 using static AL_Common.LanguageSupport;

diff --git a/AngelLoader/Common/DataClasses/FMDataSupporting.cs b/AngelLoader/Common/DataClasses/FMDataSupporting.cs
@@ -5,9 +5,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Runtime.CompilerServices;
-using AL_Common;
 using JetBrains.Annotations;
-using static AL_Common.Common;
 using static AL_Common.FenGenAttributes;
 using static AngelLoader.Utils;
 

diff --git a/AngelLoader/Common/DataClasses/NonLocalizableText.cs b/AngelLoader/Common/DataClasses/NonLocalizableText.cs
@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.Reflection;
 using System.Runtime.Versioning;
-using AL_Common;
 
 namespace AngelLoader.DataClasses;
 

diff --git a/AngelLoader/Common/Misc.cs b/AngelLoader/Common/Misc.cs
@@ -7,7 +7,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using AL_Common;
 using AngelLoader.DataClasses;
 using JetBrains.Annotations;
 using static AngelLoader.GameSupport;

diff --git a/AngelLoader/Common/Native/FastIO.cs b/AngelLoader/Common/Native/FastIO.cs
@@ -3,9 +3,7 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using AL_Common;
 using AngelLoader.DataClasses;
-using static AL_Common.Common;
 using static AL_Common.FastIO_Native;
 
 namespace AngelLoader;

diff --git a/AngelLoader/Common/Native/NativeCommon.cs b/AngelLoader/Common/Native/NativeCommon.cs
@@ -2,7 +2,6 @@
 using System.Buffers;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
-using static AL_Common.Common;
 
 namespace AngelLoader;
 

diff --git a/AngelLoader/Common/Paths.cs b/AngelLoader/Common/Paths.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using AngelLoader.DataClasses;
 using Microsoft.Win32;
-using static AL_Common.Common;
 using static AL_Common.Logger;
 using static AngelLoader.GameSupport;
 using static AngelLoader.Global;

diff --git a/AngelLoader/Common/Utility/ColorUtils.cs b/AngelLoader/Common/Utility/ColorUtils.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Drawing;
 using System.Runtime.InteropServices;
-using AL_Common;
 using static AngelLoader.Utils;
 
 namespace AngelLoader;

diff --git a/AngelLoader/Common/Utility/MathUtils.cs b/AngelLoader/Common/Utility/MathUtils.cs
@@ -1,5 +1,4 @@
 using System;
-using AL_Common;
 
 namespace AngelLoader;
 

diff --git a/AngelLoader/Common/Utility/MiscUtils.cs b/AngelLoader/Common/Utility/MiscUtils.cs
@@ -3,10 +3,8 @@
 using System.Drawing;
 using System.Globalization;
 using System.IO;
-using AL_Common;
 using AngelLoader.DataClasses;
 using JetBrains.Annotations;
-using static AL_Common.Common;
 using static AL_Common.Logger;
 using static AngelLoader.GameSupport;
 using static AngelLoader.Global;

diff --git a/AngelLoader/Common/Utility/PathUtils.cs b/AngelLoader/Common/Utility/PathUtils.cs
@@ -4,7 +4,6 @@
 using System.IO;
 using System.Text;
 using AngelLoader.DataClasses;
-using static AL_Common.Common;
 using static AL_Common.Logger;
 
 namespace AngelLoader;

diff --git a/AngelLoader/Common/Utility/StringUtils.cs b/AngelLoader/Common/Utility/StringUtils.cs
@@ -1,5 +1,4 @@
 using System;
-using AL_Common;
 using static System.StringComparison;
 
 namespace AngelLoader;

diff --git a/AngelLoader/Common/Utility/ThreadingUtils.cs b/AngelLoader/Common/Utility/ThreadingUtils.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using AngelLoader.DataClasses;
-using static AL_Common.Common;
 using static AngelLoader.GameSupport;
 using static AngelLoader.Global;
 using static AngelLoader.Misc;

diff --git a/AngelLoader/Common/Utility/ZipUtils.cs b/AngelLoader/Common/Utility/ZipUtils.cs
@@ -4,11 +4,9 @@
 using System.IO.Compression;
 using System.Text;
 using System.Threading;
-using AL_Common;
 using AL_Common.FastZipReader;
 using SharpCompress.Archives.Rar;
 using SharpCompress.Readers.Rar;
-using static AL_Common.Common;
 
 namespace AngelLoader;
 

diff --git a/AngelLoader/Core.cs b/AngelLoader/Core.cs
@@ -23,7 +23,6 @@ every time we write
 using AngelLoader.DataClasses;
 using JetBrains.Annotations;
 using Microsoft.Win32;
-using static AL_Common.Common;
 using static AL_Common.LanguageSupport;
 using static AL_Common.Logger;
 using static AngelLoader.GameSupport;

diff --git a/AngelLoader/DetectDriveTypes.cs b/AngelLoader/DetectDriveTypes.cs
@@ -8,12 +8,10 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
-using AL_Common;
 using AL_Common.DeviceIoControlLib.Objects.Storage;
 using AL_Common.DeviceIoControlLib.Wrapper;
 using AngelLoader.DataClasses;
 using Microsoft.Win32.SafeHandles;
-using static AL_Common.Common;
 using static AngelLoader.Misc;
 
 namespace AngelLoader;

diff --git a/AngelLoader/FFmpeg.NET/FFmpeg.NET.cs b/AngelLoader/FFmpeg.NET/FFmpeg.NET.cs
@@ -26,7 +26,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using System;
 using System.Diagnostics;
 using System.IO;
-using AL_Common;
 using AngelLoader.DataClasses;
 using static AL_Common.Logger;
 

diff --git a/AngelLoader/FMArchives.cs b/AngelLoader/FMArchives.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using AL_Common;
 using AngelLoader.DataClasses;
 using JetBrains.Annotations;
 using Microsoft.VisualBasic.FileIO;

diff --git a/AngelLoader/FMAudio.cs b/AngelLoader/FMAudio.cs
@@ -5,9 +5,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using AL_Common;
 using AngelLoader.DataClasses;
-using static AL_Common.Common;
 using static AL_Common.Logger;
 using static AngelLoader.GameSupport;
 using static AngelLoader.Global;

diff --git a/AngelLoader/FMBackupAndRestore.cs b/AngelLoader/FMBackupAndRestore.cs
@@ -7,11 +7,9 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using AL_Common;
 using AngelLoader.DataClasses;
 using SharpCompress.Archives.Rar;
 using SharpCompress.Archives.SevenZip;
-using static AL_Common.Common;
 using static AngelLoader.GameSupport;
 using static AngelLoader.Global;
 using static AngelLoader.Utils;

diff --git a/AngelLoader/FMCache.cs b/AngelLoader/FMCache.cs
@@ -4,13 +4,11 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Threading.Tasks;
-using AL_Common;
 using AngelLoader.DataClasses;
 using SharpCompress;
 using SharpCompress.Archives.Rar;
 using SharpCompress.Archives.SevenZip;
 using SharpCompress.Readers.Rar;
-using static AL_Common.Common;
 using static AL_Common.Logger;
 using static AngelLoader.GameSupport;
 using static AngelLoader.Global;

diff --git a/AngelLoader/FMDelete.cs b/AngelLoader/FMDelete.cs
@@ -4,10 +4,8 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using AL_Common;
 using AngelLoader.DataClasses;
 using Microsoft.VisualBasic.FileIO;
-using static AL_Common.Common;
 using static AL_Common.Logger;
 using static AngelLoader.GameSupport;
 using static AngelLoader.Global;

diff --git a/AngelLoader/FMInstallAndPlay.cs b/AngelLoader/FMInstallAndPlay.cs
@@ -10,14 +10,12 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using AL_Common;
 using AL_Common.FastZipReader;
 using AngelLoader.DataClasses;
 using JetBrains.Annotations;
 using SharpCompress.Archives.Rar;
 using SharpCompress.Archives.SevenZip;
 using SharpCompress.Readers.Rar;
-using static AL_Common.Common;
 using static AL_Common.LanguageSupport;
 using static AL_Common.Logger;
 using static AngelLoader.GameSupport;

diff --git a/AngelLoader/FMLanguages.cs b/AngelLoader/FMLanguages.cs
@@ -6,7 +6,6 @@
 using AngelLoader.DataClasses;
 using SharpCompress.Archives.Rar;
 using SharpCompress.Archives.SevenZip;
-using static AL_Common.Common;
 using static AL_Common.LanguageSupport;
 using static AL_Common.Logger;
 using static AngelLoader.GameSupport;