diff --git a/Dalamud/Game/Text/Evaluator/SeStringParameter.cs b/Dalamud/Game/Text/Evaluator/SeStringParameter.cs
index 1c6dd96cb..036d1c921 100644
--- a/Dalamud/Game/Text/Evaluator/SeStringParameter.cs
+++ b/Dalamud/Game/Text/Evaluator/SeStringParameter.cs
@@ -3,7 +3,6 @@ using System.Globalization;
using Lumina.Text.ReadOnly;
using DSeString = Dalamud.Game.Text.SeStringHandling.SeString;
-using LSeString = Lumina.Text.SeString;
namespace Dalamud.Game.Text.Evaluator;
@@ -71,9 +70,6 @@ public readonly struct SeStringParameter
public static implicit operator SeStringParameter(ReadOnlySeStringSpan value) => new(new ReadOnlySeString(value));
- [Obsolete("Switch to using ReadOnlySeString instead of Lumina's SeString.", true)]
- public static implicit operator SeStringParameter(LSeString value) => new(new ReadOnlySeString(value.RawData));
-
public static implicit operator SeStringParameter(DSeString value) => new(new ReadOnlySeString(value.Encode()));
public static implicit operator SeStringParameter(string value) => new(value);
diff --git a/Dalamud/Game/Text/SeStringHandling/SeString.cs b/Dalamud/Game/Text/SeStringHandling/SeString.cs
index 8805c2177..a1ef5e936 100644
--- a/Dalamud/Game/Text/SeStringHandling/SeString.cs
+++ b/Dalamud/Game/Text/SeStringHandling/SeString.cs
@@ -113,14 +113,6 @@ public class SeString
/// Equivalent SeString.
public static implicit operator SeString(string str) => new(new TextPayload(str));
- ///
- /// Implicitly convert a string into a SeString containing a .
- ///
- /// string to convert.
- /// Equivalent SeString.
- [Obsolete("Switch to using ReadOnlySeString instead of Lumina's SeString.", true)]
- public static explicit operator SeString(Lumina.Text.SeString str) => str.ToDalamudString();
-
///
/// Parse a binary game message into an SeString.
///
diff --git a/Dalamud/Interface/Windowing/Window.cs b/Dalamud/Interface/Windowing/Window.cs
index b0786fbb5..48352daa2 100644
--- a/Dalamud/Interface/Windowing/Window.cs
+++ b/Dalamud/Interface/Windowing/Window.cs
@@ -908,7 +908,7 @@ public abstract class Window
private void DrawErrorMessage()
{
// TODO: Once window systems are services, offer to reload the plugin
- ImGui.TextColoredWrapped(ImGuiColors.DalamudRed,Loc.Localize("WindowSystemErrorOccurred", "An error occurred while rendering this window. Please contact the developer for details."));
+ ImGui.TextColoredWrapped(ImGuiColors.DalamudRed, Loc.Localize("WindowSystemErrorOccurred", "An error occurred while rendering this window. Please contact the developer for details."));
ImGuiHelpers.ScaledDummy(5);
diff --git a/Dalamud/Utility/Util.cs b/Dalamud/Utility/Util.cs
index f50efcf0d..bde113904 100644
--- a/Dalamud/Utility/Util.cs
+++ b/Dalamud/Utility/Util.cs
@@ -158,16 +158,6 @@ public static partial class Util
return branchInternal = gitBranch;
}
- ///
- /// Gets the active Dalamud track, if this instance was launched through XIVLauncher and used a version
- /// downloaded from webservices.
- ///
- /// The name of the track, or null.
- internal static string? GetActiveTrack()
- {
- return Environment.GetEnvironmentVariable("DALAMUD_BRANCH");
- }
-
///
public static unsafe string DescribeAddress(void* p) => DescribeAddress((nint)p);
@@ -703,6 +693,16 @@ public static partial class Util
}
}
+ ///
+ /// Gets the active Dalamud track, if this instance was launched through XIVLauncher and used a version
+ /// downloaded from webservices.
+ ///
+ /// The name of the track, or null.
+ internal static string? GetActiveTrack()
+ {
+ return Environment.GetEnvironmentVariable("DALAMUD_BRANCH");
+ }
+
///
/// Gets a random, inoffensive, human-friendly string.
///