From 45956720aa547ac1b672d4ffa3ad0c7b88c9baaf Mon Sep 17 00:00:00 2001 From: Q-Sharp <8755388+Q-Sharp@users.noreply.github.com> Date: Fri, 27 Sep 2024 20:25:11 +0200 Subject: [PATCH] cleanup usings --- RemnantSaveGuardian/App.xaml.cs | 14 +++++++------- RemnantSaveGuardian/EventTransfer.cs | 8 +------- RemnantSaveGuardian/LocalizationProvider.cs | 4 ++-- RemnantSaveGuardian/RemnantWorldEvent.cs | 3 +-- RemnantSaveGuardian/SaveWatcher.cs | 7 +------ RemnantSaveGuardian/ViewModels/BackupsViewModel.cs | 4 ++-- RemnantSaveGuardian/ViewModels/LogViewModel.cs | 7 ++----- .../ViewModels/MainWindowViewModel.cs | 6 +++--- .../ViewModels/SettingsViewModel.cs | 6 ++---- .../ViewModels/WorldAnalyzerViewModel.cs | 7 ++----- RemnantSaveGuardian/Views/Pages/LogPage.xaml.cs | 10 +++++----- .../Views/Pages/SettingsPage.xaml.cs | 9 ++++----- .../Views/Windows/MainWindow.xaml.cs | 11 ++++++----- 13 files changed, 38 insertions(+), 58 deletions(-) diff --git a/RemnantSaveGuardian/App.xaml.cs b/RemnantSaveGuardian/App.xaml.cs index 673a83f..d9cfb44 100644 --- a/RemnantSaveGuardian/App.xaml.cs +++ b/RemnantSaveGuardian/App.xaml.cs @@ -1,30 +1,30 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; + using RemnantSaveGuardian.Models; using RemnantSaveGuardian.Properties; using RemnantSaveGuardian.Services; + using System; -using System.Collections.Generic; -using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; using System.Reflection; -using System.Resources; using System.Threading; using System.Windows; using System.Windows.Markup; using System.Windows.Threading; + using Wpf.Ui.Mvvm.Contracts; using Wpf.Ui.Mvvm.Services; namespace RemnantSaveGuardian { - /// - /// Interaction logic for App.xaml - /// - public partial class App + /// + /// Interaction logic for App.xaml + /// + public partial class App { // The.NET Generic Host provides dependency injection, configuration, logging, and other services. // https://docs.microsoft.com/dotnet/core/extensions/generic-host diff --git a/RemnantSaveGuardian/EventTransfer.cs b/RemnantSaveGuardian/EventTransfer.cs index d7b33ae..4808cd8 100644 --- a/RemnantSaveGuardian/EventTransfer.cs +++ b/RemnantSaveGuardian/EventTransfer.cs @@ -1,14 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Forms; namespace RemnantSaveGuardian { - internal class EventTransfer + internal class EventTransfer { internal static event EventHandler? Event; internal class MessageArgs : EventArgs diff --git a/RemnantSaveGuardian/LocalizationProvider.cs b/RemnantSaveGuardian/LocalizationProvider.cs index c906c56..4136ce8 100644 --- a/RemnantSaveGuardian/LocalizationProvider.cs +++ b/RemnantSaveGuardian/LocalizationProvider.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.Reflection; using System.Text.RegularExpressions; + using WPFLocalizeExtension.Extensions; namespace RemnantSaveGuardian { - internal class Loc + internal class Loc { public static T GetLocalizedValue(string key, LocalizationOptions options) { diff --git a/RemnantSaveGuardian/RemnantWorldEvent.cs b/RemnantSaveGuardian/RemnantWorldEvent.cs index bac9172..2ee2f7d 100644 --- a/RemnantSaveGuardian/RemnantWorldEvent.cs +++ b/RemnantSaveGuardian/RemnantWorldEvent.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Text.RegularExpressions; namespace RemnantSaveGuardian { - public class RemnantWorldEvent + public class RemnantWorldEvent { //private string _world; private List _locations; diff --git a/RemnantSaveGuardian/SaveWatcher.cs b/RemnantSaveGuardian/SaveWatcher.cs index 42eacd8..7532a9d 100644 --- a/RemnantSaveGuardian/SaveWatcher.cs +++ b/RemnantSaveGuardian/SaveWatcher.cs @@ -1,14 +1,9 @@ using System; -using System.Collections.Generic; -using System.Diagnostics; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace RemnantSaveGuardian { - internal static class SaveWatcher + internal static class SaveWatcher { public static event EventHandler SaveUpdated; private static FileSystemWatcher watcher = new () diff --git a/RemnantSaveGuardian/ViewModels/BackupsViewModel.cs b/RemnantSaveGuardian/ViewModels/BackupsViewModel.cs index 3e169cc..a94ffdf 100644 --- a/RemnantSaveGuardian/ViewModels/BackupsViewModel.cs +++ b/RemnantSaveGuardian/ViewModels/BackupsViewModel.cs @@ -1,10 +1,10 @@ using CommunityToolkit.Mvvm.ComponentModel; -using CommunityToolkit.Mvvm.Input; + using Wpf.Ui.Common.Interfaces; namespace RemnantSaveGuardian.ViewModels { - public partial class BackupsViewModel : ObservableObject, INavigationAware + public partial class BackupsViewModel : ObservableObject, INavigationAware { public void OnNavigatedTo() { diff --git a/RemnantSaveGuardian/ViewModels/LogViewModel.cs b/RemnantSaveGuardian/ViewModels/LogViewModel.cs index 25201ff..dfa55ce 100644 --- a/RemnantSaveGuardian/ViewModels/LogViewModel.cs +++ b/RemnantSaveGuardian/ViewModels/LogViewModel.cs @@ -1,13 +1,10 @@ using CommunityToolkit.Mvvm.ComponentModel; -using RemnantSaveGuardian.Models; -using System; -using System.Collections.Generic; -using System.Windows.Media; + using Wpf.Ui.Common.Interfaces; namespace RemnantSaveGuardian.ViewModels { - public partial class LogViewModel : ObservableObject, INavigationAware + public partial class LogViewModel : ObservableObject, INavigationAware { private bool _isInitialized = false; diff --git a/RemnantSaveGuardian/ViewModels/MainWindowViewModel.cs b/RemnantSaveGuardian/ViewModels/MainWindowViewModel.cs index 0d3b152..55fc62c 100644 --- a/RemnantSaveGuardian/ViewModels/MainWindowViewModel.cs +++ b/RemnantSaveGuardian/ViewModels/MainWindowViewModel.cs @@ -1,16 +1,16 @@ using CommunityToolkit.Mvvm.ComponentModel; + using System; using System.Collections.ObjectModel; -using System.Diagnostics; + using Wpf.Ui.Common; using Wpf.Ui.Controls; using Wpf.Ui.Controls.Interfaces; using Wpf.Ui.Mvvm.Contracts; -using WPFLocalizeExtension.Providers; namespace RemnantSaveGuardian.ViewModels { - public partial class MainWindowViewModel : ObservableObject + public partial class MainWindowViewModel : ObservableObject { private bool _isInitialized = false; diff --git a/RemnantSaveGuardian/ViewModels/SettingsViewModel.cs b/RemnantSaveGuardian/ViewModels/SettingsViewModel.cs index e6081f4..9ece9fb 100644 --- a/RemnantSaveGuardian/ViewModels/SettingsViewModel.cs +++ b/RemnantSaveGuardian/ViewModels/SettingsViewModel.cs @@ -1,12 +1,10 @@ using CommunityToolkit.Mvvm.ComponentModel; -using CommunityToolkit.Mvvm.Input; -using System; -using System.Windows.Input; + using Wpf.Ui.Common.Interfaces; namespace RemnantSaveGuardian.ViewModels { - public partial class SettingsViewModel : ObservableObject, INavigationAware + public partial class SettingsViewModel : ObservableObject, INavigationAware { private bool _isInitialized = false; diff --git a/RemnantSaveGuardian/ViewModels/WorldAnalyzerViewModel.cs b/RemnantSaveGuardian/ViewModels/WorldAnalyzerViewModel.cs index 8da327c..449a267 100644 --- a/RemnantSaveGuardian/ViewModels/WorldAnalyzerViewModel.cs +++ b/RemnantSaveGuardian/ViewModels/WorldAnalyzerViewModel.cs @@ -1,13 +1,10 @@ using CommunityToolkit.Mvvm.ComponentModel; -using RemnantSaveGuardian.Models; -using System; -using System.Collections.Generic; -using System.Windows.Media; + using Wpf.Ui.Common.Interfaces; namespace RemnantSaveGuardian.ViewModels { - public partial class WorldAnalyzerViewModel : ObservableObject, INavigationAware + public partial class WorldAnalyzerViewModel : ObservableObject, INavigationAware { private bool _isInitialized = false; diff --git a/RemnantSaveGuardian/Views/Pages/LogPage.xaml.cs b/RemnantSaveGuardian/Views/Pages/LogPage.xaml.cs index bc93edc..0e8b998 100644 --- a/RemnantSaveGuardian/Views/Pages/LogPage.xaml.cs +++ b/RemnantSaveGuardian/Views/Pages/LogPage.xaml.cs @@ -1,15 +1,15 @@ //using System.Drawing; using System; -using System.Text.RegularExpressions; + using Wpf.Ui.Common.Interfaces; using Wpf.Ui.Controls; namespace RemnantSaveGuardian.Views.Pages { - /// - /// Interaction logic for LogView.xaml - /// - public partial class LogPage : INavigableView + /// + /// Interaction logic for LogView.xaml + /// + public partial class LogPage : INavigableView { public ViewModels.LogViewModel ViewModel { diff --git a/RemnantSaveGuardian/Views/Pages/SettingsPage.xaml.cs b/RemnantSaveGuardian/Views/Pages/SettingsPage.xaml.cs index 00dd075..d9bc97c 100644 --- a/RemnantSaveGuardian/Views/Pages/SettingsPage.xaml.cs +++ b/RemnantSaveGuardian/Views/Pages/SettingsPage.xaml.cs @@ -8,15 +8,14 @@ using System.Windows; using System.Windows.Controls; using Wpf.Ui.Common.Interfaces; -using RemnantSaveGuardian.Views.Windows; using RemnantSaveGuardian.Helpers; namespace RemnantSaveGuardian.Views.Pages { - /// - /// Interaction logic for SettingsPage.xaml - /// - public partial class SettingsPage : INavigableView + /// + /// Interaction logic for SettingsPage.xaml + /// + public partial class SettingsPage : INavigableView { public ViewModels.SettingsViewModel ViewModel { diff --git a/RemnantSaveGuardian/Views/Windows/MainWindow.xaml.cs b/RemnantSaveGuardian/Views/Windows/MainWindow.xaml.cs index 9236eab..8daed4d 100644 --- a/RemnantSaveGuardian/Views/Windows/MainWindow.xaml.cs +++ b/RemnantSaveGuardian/Views/Windows/MainWindow.xaml.cs @@ -1,7 +1,7 @@ using RemnantSaveGuardian.Helpers; -using RemnantSaveGuardian.Services; using RemnantSaveGuardian.ViewModels; using RemnantSaveGuardian.Views.Pages; + using System; using System.IO; using System.Linq; @@ -14,14 +14,15 @@ using Wpf.Ui.Controls; using Wpf.Ui.Controls.Interfaces; using Wpf.Ui.Mvvm.Contracts; + using WPFLocalizeExtension.Engine; namespace RemnantSaveGuardian.Views.Windows { - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : INavigationWindow + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : INavigationWindow { public ViewModels.MainWindowViewModel ViewModel {