Fix nullability annotations in WPF converters

Tyrrrz · Jan 15, 2024 · 9f15a7a · 9f15a7a
1 parent fe02ebe
commit 9f15a7a
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 38 deletions.
diff --git a/LightBulb/Converters/CycleStateToPackIconKindConverter.cs b/LightBulb/Converters/CycleStateToPackIconKindConverter.cs
@@ -11,7 +11,7 @@ public class CycleStateToPackIconKindConverter : IValueConverter
 {
     public static CycleStateToPackIconKindConverter Instance { get; } = new();
 
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
         value switch
         {
             CycleState.Disabled => PackIconKind.Cancel,
@@ -23,9 +23,9 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         };
 
     public object ConvertBack(
-        object value,
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) => throw new NotSupportedException();
 }
diff --git a/LightBulb/Converters/DoubleToStringConverter.cs b/LightBulb/Converters/DoubleToStringConverter.cs
@@ -9,13 +9,17 @@ public class DoubleToStringConverter : IValueConverter
 {
     public static DoubleToStringConverter Instance { get; } = new();
 
-    public object? Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
-        value is double doubleValue ? doubleValue.ToString(culture) : default;
+    public object? Convert(
+        object? value,
+        Type targetType,
+        object? parameter,
+        CultureInfo culture
+    ) => value is double doubleValue ? doubleValue.ToString(culture) : default;
 
     public object ConvertBack(
-        object value,
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) =>
         value is string stringValue

diff --git a/LightBulb/Converters/FractionToDegreesConverter.cs b/LightBulb/Converters/FractionToDegreesConverter.cs
@@ -9,13 +9,13 @@ public class FractionToDegreesConverter : IValueConverter
 {
     public static FractionToDegreesConverter Instance { get; } = new();
 
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
         value is double doubleValue ? doubleValue * 360.0 : default;
 
     public object ConvertBack(
-        object value,
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) => value is double doubleValue ? doubleValue / 360.0 : default;
 }
diff --git a/LightBulb/Converters/FractionToPercentageStringConverter.cs b/LightBulb/Converters/FractionToPercentageStringConverter.cs
@@ -9,13 +9,17 @@ public class FractionToPercentageStringConverter : IValueConverter
 {
     public static FractionToPercentageStringConverter Instance { get; } = new();
 
-    public object? Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
-        value is double doubleValue ? doubleValue.ToString("P0", culture) : default;
+    public object? Convert(
+        object? value,
+        Type targetType,
+        object? parameter,
+        CultureInfo culture
+    ) => value is double doubleValue ? doubleValue.ToString("P0", culture) : default;
 
     public object ConvertBack(
-        object value,
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) =>
         value is string stringValue

diff --git a/LightBulb/Converters/InverseBoolConverter.cs b/LightBulb/Converters/InverseBoolConverter.cs
@@ -9,13 +9,13 @@ public class InverseBoolConverter : IValueConverter
 {
     public static InverseBoolConverter Instance { get; } = new();
 
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
         value is false;
 
     public object ConvertBack(
-        object value,
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) => value is false;
 }
diff --git a/LightBulb/Converters/SettingsTabViewModelToPackIconKindConverter.cs b/LightBulb/Converters/SettingsTabViewModelToPackIconKindConverter.cs
@@ -11,7 +11,7 @@ public class SettingsTabViewModelToPackIconKindConverter : IValueConverter
 {
     public static SettingsTabViewModelToPackIconKindConverter Instance { get; } = new();
 
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
         value switch
         {
             GeneralSettingsTabViewModel => PackIconKind.Settings,
@@ -23,9 +23,9 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         };
 
     public object ConvertBack(
-        object value,
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) => throw new NotSupportedException();
 }
diff --git a/LightBulb/Converters/TimeOnlyToDegreesConverter.cs b/LightBulb/Converters/TimeOnlyToDegreesConverter.cs
@@ -9,13 +9,13 @@ public class TimeOnlyToDegreesConverter : IValueConverter
 {
     public static TimeOnlyToDegreesConverter Instance { get; } = new();
 
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
         value is TimeOnly timeOfDayValue ? timeOfDayValue.ToTimeSpan().TotalDays * 360.0 : default;
 
     public object ConvertBack(
-        object value,
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) =>
         value is double doubleValue

diff --git a/LightBulb/Converters/TimeOnlyToHoursConverter.cs b/LightBulb/Converters/TimeOnlyToHoursConverter.cs
@@ -9,13 +9,13 @@ public class TimeOnlyToHoursConverter : IValueConverter
 {
     public static TimeOnlyToHoursConverter Instance { get; } = new();
 
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
         value is TimeOnly timeOfDayValue ? timeOfDayValue.ToTimeSpan().TotalHours : default;
 
     public object ConvertBack(
-        object value,
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) =>
         value is double doubleValue

diff --git a/LightBulb/Converters/TimeOnlyToStringConverter.cs b/LightBulb/Converters/TimeOnlyToStringConverter.cs
@@ -9,13 +9,17 @@ public class TimeOnlyToStringConverter : IValueConverter
 {
     public static TimeOnlyToStringConverter Instance { get; } = new();
 
-    public object? Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
-        value is TimeOnly timeOfDay ? timeOfDay.ToString(null, culture) : default;
+    public object? Convert(
+        object? value,
+        Type targetType,
+        object? parameter,
+        CultureInfo culture
+    ) => value is TimeOnly timeOfDay ? timeOfDay.ToString(null, culture) : default;
 
-    public object? ConvertBack(
-        object value,
+    public object ConvertBack(
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) =>
         value is string stringValue

diff --git a/LightBulb/Converters/TimeSpanToDurationStringConverter.cs b/LightBulb/Converters/TimeSpanToDurationStringConverter.cs
@@ -9,13 +9,17 @@ public class TimeSpanToDurationStringConverter : IValueConverter
 {
     public static TimeSpanToDurationStringConverter Instance { get; } = new();
 
-    public object? Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
-        value is TimeSpan timeSpanValue ? timeSpanValue.ToString(@"hh\:mm\:ss", culture) : default;
+    public object? Convert(
+        object? value,
+        Type targetType,
+        object? parameter,
+        CultureInfo culture
+    ) => value is TimeSpan timeSpanValue ? timeSpanValue.ToString(@"hh\:mm\:ss", culture) : default;
 
     public object ConvertBack(
-        object value,
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) =>
         value is string stringValue && TimeSpan.TryParse(stringValue, culture, out var result)

diff --git a/LightBulb/Converters/TimeSpanToHoursConverter.cs b/LightBulb/Converters/TimeSpanToHoursConverter.cs
@@ -9,13 +9,13 @@ public class TimeSpanToHoursConverter : IValueConverter
 {
     public static TimeSpanToHoursConverter Instance { get; } = new();
 
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
         value is TimeSpan timeSpanValue ? timeSpanValue.TotalHours : default;
 
     public object ConvertBack(
-        object value,
+        object? value,
         Type targetType,
-        object parameter,
+        object? parameter,
         CultureInfo culture
     ) => value is double doubleValue ? TimeSpan.FromHours(doubleValue) : default;
 }