Convert remaining files to file-scoped namespace

2026-03-03 12:54:27 +09:00
parent 1efd9993bf
commit 478f67aa82
8 changed files with 153 additions and 162 deletions
@@ -5,43 +5,42 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace MayShow.ViewModels
+namespace MayShow.ViewModels;
+
+class BaseViewModel : ChangeNotifier
 {
-    class BaseViewModel : ChangeNotifier
+    IChangeViewModel _viewModelChanger;
+    ITopLevelGrabber? _topLevelGrabber;
+
+    public BaseViewModel(IChangeViewModel viewModelChanger)
    {
-        IChangeViewModel _viewModelChanger;
-        ITopLevelGrabber? _topLevelGrabber;
-
-        public BaseViewModel(IChangeViewModel viewModelChanger)
-        {
-            _viewModelChanger = viewModelChanger;
-            _topLevelGrabber = null;
-        }
-
-        public ITopLevelGrabber? TopLevelGrabber
-        {
-            get => _topLevelGrabber;
-            set { _topLevelGrabber = value; }
-        }
-
-        public IChangeViewModel ViewModelChanger
-        {
-            get { return _viewModelChanger; }
-            set { _viewModelChanger = value; }
-        }
-
-        #region IChangeViewModel
-
-        public void PopViewModel()
-        {
-            _viewModelChanger?.PopViewModel();
-        }
-
-        public void PushViewModel(BaseViewModel model)
-        {
-            _viewModelChanger?.PushViewModel(model);
-        }
-
-        #endregion
+        _viewModelChanger = viewModelChanger;
+        _topLevelGrabber = null;
    }
+
+    public ITopLevelGrabber? TopLevelGrabber
+    {
+        get => _topLevelGrabber;
+        set { _topLevelGrabber = value; }
+    }
+
+    public IChangeViewModel ViewModelChanger
+    {
+        get { return _viewModelChanger; }
+        set { _viewModelChanger = value; }
+    }
+
+    #region IChangeViewModel
+
+    public void PopViewModel()
+    {
+        _viewModelChanger?.PopViewModel();
+    }
+
+    public void PushViewModel(BaseViewModel model)
+    {
+        _viewModelChanger?.PushViewModel(model);
+    }
+
+    #endregion
 }
@@ -4,47 +4,46 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace MayShow.ViewModels
+namespace MayShow.ViewModels;
+
+class MainWindowViewModel : ChangeNotifier, IChangeViewModel
 {
-    class MainWindowViewModel : ChangeNotifier, IChangeViewModel
+    BaseViewModel _currentViewModel;
+    Stack<BaseViewModel> _viewModels;
+
+    public MainWindowViewModel(ITopLevelGrabber topLevelGrabber)
    {
-        BaseViewModel _currentViewModel;
-        Stack<BaseViewModel> _viewModels;
-
-        public MainWindowViewModel(ITopLevelGrabber topLevelGrabber)
+        _viewModels = new Stack<BaseViewModel>();
+        var initialViewModel = new MainViewModel(this)
        {
-            _viewModels = new Stack<BaseViewModel>();
-            var initialViewModel = new MainViewModel(this)
-            {
-                TopLevelGrabber = topLevelGrabber
-            };
-            _viewModels.Push(initialViewModel);
-            _currentViewModel = initialViewModel;
-        }
-
-        public BaseViewModel CurrentViewModel
-        {
-            get { return _currentViewModel; }
-            set { _currentViewModel = value; NotifyPropertyChanged(); }
-        }
-
-        #region IChangeViewModel
-
-        public void PushViewModel(BaseViewModel model)
-        {
-            _viewModels.Push(model);
-            CurrentViewModel = model;
-        }
-
-        public void PopViewModel()
-        {
-            if (_viewModels.Count > 1)
-            {
-                _viewModels.Pop();
-                CurrentViewModel = _viewModels.Peek();
-            }
-        }
-
-        #endregion
+            TopLevelGrabber = topLevelGrabber
+        };
+        _viewModels.Push(initialViewModel);
+        _currentViewModel = initialViewModel;
    }
+
+    public BaseViewModel CurrentViewModel
+    {
+        get { return _currentViewModel; }
+        set { _currentViewModel = value; NotifyPropertyChanged(); }
+    }
+
+    #region IChangeViewModel
+
+    public void PushViewModel(BaseViewModel model)
+    {
+        _viewModels.Push(model);
+        CurrentViewModel = model;
+    }
+
+    public void PopViewModel()
+    {
+        if (_viewModels.Count > 1)
+        {
+            _viewModels.Pop();
+            CurrentViewModel = _viewModels.Peek();
+        }
+    }
+
+    #endregion
 }
@@ -2,30 +2,29 @@
 using MayShow.Helpers;
 using MayShow.Models;

-namespace MayShow.ViewModels
+namespace MayShow.ViewModels;
+
+class WarningDeleteItemViewModel : ChangeNotifier
 {
-    class WarningDeleteItemViewModel : ChangeNotifier
+    ReportFile _file;
+
+    public WarningDeleteItemViewModel(ReportFile file)
    {
-        ReportFile _file;
+        _file = file;
+    }

-        public WarningDeleteItemViewModel(ReportFile file)
-        {
-            _file = file;
-        }
+    public ReportFile File
+    {
+        get => _file;
+    }

-        public ReportFile File
-        {
-            get => _file;
-        }
+    public void KeepItem()
+    {
+        DialogHost.Close("DialogHost", false);
+    }

-        public void KeepItem()
-        {
-            DialogHost.Close("DialogHost", false);
-        }
-
-        public void RemoveItem()
-        {
-            DialogHost.Close("DialogHost", true);
-        }
+    public void RemoveItem()
+    {
+        DialogHost.Close("DialogHost", true);
    }
 }