From 09c4828a9e93017ad93b515fdf98359f5b8f890e Mon Sep 17 00:00:00 2001 From: goat Date: Sat, 29 Oct 2022 15:54:24 +0200 Subject: [PATCH] chore: clean up file-scoped namespace fallout --- Dalamud/Data/DataManager.cs | 2 +- Dalamud/EntryPoint.cs | 6 +++--- Dalamud/Interface/Internal/DalamudInterface.cs | 2 +- Dalamud/Interface/Internal/InterfaceManager.cs | 2 +- Dalamud/Interface/Internal/Windows/DataWindow.cs | 10 +++++----- .../Windows/PluginInstaller/PluginInstallerWindow.cs | 8 ++++---- Dalamud/Interface/UiBuilder.cs | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs index d27fbf109..dce3e98c3 100644 --- a/Dalamud/Data/DataManager.cs +++ b/Dalamud/Data/DataManager.cs @@ -66,7 +66,7 @@ public sealed class DataManager : IDisposable, IServiceType LoadMultithreaded = true, CacheFileResources = true, #if DEBUG - PanicOnSheetChecksumMismatch = true, + PanicOnSheetChecksumMismatch = true, #else PanicOnSheetChecksumMismatch = false, #endif diff --git a/Dalamud/EntryPoint.cs b/Dalamud/EntryPoint.cs index 219b71a64..48692e323 100644 --- a/Dalamud/EntryPoint.cs +++ b/Dalamud/EntryPoint.cs @@ -84,9 +84,9 @@ public sealed class EntryPoint internal static void InitLogging(string baseDirectory, bool logConsole, bool logSynchronously) { #if DEBUG - var logPath = Path.Combine(baseDirectory, "dalamud.log"); - var oldPath = Path.Combine(baseDirectory, "dalamud.old.log"); - var oldPathOld = Path.Combine(baseDirectory, "dalamud.log.old"); + var logPath = Path.Combine(baseDirectory, "dalamud.log"); + var oldPath = Path.Combine(baseDirectory, "dalamud.old.log"); + var oldPathOld = Path.Combine(baseDirectory, "dalamud.log.old"); #else var logPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.log"); var oldPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.old.log"); diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs index e6048f2ec..ae00d5f44 100644 --- a/Dalamud/Interface/Internal/DalamudInterface.cs +++ b/Dalamud/Interface/Internal/DalamudInterface.cs @@ -63,7 +63,7 @@ internal class DalamudInterface : IDisposable, IServiceType private readonly TextureWrap tsmLogoTexture; #if DEBUG - private bool isImGuiDrawDevMenu = true; + private bool isImGuiDrawDevMenu = true; #else private bool isImGuiDrawDevMenu = false; #endif diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs index 98e0c72f1..56687ef49 100644 --- a/Dalamud/Interface/Internal/InterfaceManager.cs +++ b/Dalamud/Interface/Internal/InterfaceManager.cs @@ -985,7 +985,7 @@ internal class InterfaceManager : IDisposable, IServiceType private IntPtr ResizeBuffersDetour(IntPtr swapChain, uint bufferCount, uint width, uint height, uint newFormat, uint swapChainFlags) { #if DEBUG - Log.Verbose($"Calling resizebuffers swap@{swapChain.ToInt64():X}{bufferCount} {width} {height} {newFormat} {swapChainFlags}"); + Log.Verbose($"Calling resizebuffers swap@{swapChain.ToInt64():X}{bufferCount} {width} {height} {newFormat} {swapChainFlags}"); #endif this.ResizeBuffers?.InvokeSafely(); diff --git a/Dalamud/Interface/Internal/Windows/DataWindow.cs b/Dalamud/Interface/Internal/Windows/DataWindow.cs index 8cb542b81..fcfe3edd8 100644 --- a/Dalamud/Interface/Internal/Windows/DataWindow.cs +++ b/Dalamud/Interface/Internal/Windows/DataWindow.cs @@ -759,7 +759,7 @@ internal class DataWindow : Window var condition = Service.Get(); #if DEBUG - ImGui.Text($"ptr: 0x{condition.Address.ToInt64():X}"); + ImGui.Text($"ptr: 0x{condition.Address.ToInt64():X}"); #endif ImGui.Text("Current Conditions:"); @@ -1310,11 +1310,11 @@ internal class DataWindow : Window ImGui.Text($"GamepadInput 0x{gamepadState.GamepadInputAddress.ToInt64():X}"); #if DEBUG - if (ImGui.IsItemHovered()) - ImGui.SetMouseCursor(ImGuiMouseCursor.Hand); + if (ImGui.IsItemHovered()) + ImGui.SetMouseCursor(ImGuiMouseCursor.Hand); - if (ImGui.IsItemClicked()) - ImGui.SetClipboardText($"0x{gamepadState.GamepadInputAddress.ToInt64():X}"); + if (ImGui.IsItemClicked()) + ImGui.SetClipboardText($"0x{gamepadState.GamepadInputAddress.ToInt64():X}"); #endif DrawHelper( diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs index c48944533..10b46feeb 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs @@ -2656,16 +2656,16 @@ internal class PluginInstallerWindow : Window, IDisposable { Log.Error(ex, "Plugin installer threw an error"); #if DEBUG - if (!string.IsNullOrEmpty(ex.Message)) - errorModalMessage += $"\n\n{ex.Message}"; + if (!string.IsNullOrEmpty(ex.Message)) + errorModalMessage += $"\n\n{ex.Message}"; #endif } else { Log.Error(ex, "Plugin installer threw an unexpected error"); #if DEBUG - if (!string.IsNullOrEmpty(ex.Message)) - errorModalMessage += $"\n\n{ex.Message}"; + if (!string.IsNullOrEmpty(ex.Message)) + errorModalMessage += $"\n\n{ex.Message}"; #endif } } diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs index e0818337b..2b0ed2b0d 100644 --- a/Dalamud/Interface/UiBuilder.cs +++ b/Dalamud/Interface/UiBuilder.cs @@ -197,7 +197,7 @@ public sealed class UiBuilder : IDisposable /// Gets or sets a value indicating whether statistics about UI draw time should be collected. /// #if DEBUG - internal static bool DoStats { get; set; } = true; + internal static bool DoStats { get; set; } = true; #else internal static bool DoStats { get; set; } = false; #endif