Fixed more obsolete method warnings

IngvarX · Oct 15, 2020 · 80bf72a · 80bf72a
1 parent 6200cc4
commit 80bf72a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Camelot.ViewModels/Implementations/MainWindow/FilePanels/SearchViewModel.cs b/src/Camelot.ViewModels/Implementations/MainWindow/FilePanels/SearchViewModel.cs
@@ -14,7 +14,7 @@
 
 namespace Camelot.ViewModels.Implementations.MainWindow.FilePanels
 {
-    public class SearchViewModel : ValidatableViewModelBase<SearchViewModel>, ISearchViewModel
+    public class SearchViewModel : ValidatableViewModelBase, ISearchViewModel
     {
         private readonly IRegexService _regexService;
 
@@ -42,10 +42,8 @@ public SearchViewModel(
             _regexService = regexService;
             Reset();
 
-            this.ValidationRule(vm => vm.SearchText,
-                vm =>
-                    this.WhenAnyValue(x => x.IsRegexSearchEnabled, x => x.SearchText).Select(_ => IsValid),
-                vm => resourceProvider.GetResourceByName(searchViewModelConfiguration.InvalidRegexResourceName));
+            this.ValidationRule(this.WhenAnyValue(x => x.IsRegexSearchEnabled, x => x.SearchText).Select(_ => IsValid),
+                resourceProvider.GetResourceByName(searchViewModelConfiguration.InvalidRegexResourceName));
             this.WhenAnyValue(x => x.SearchText, x => x.IsSearchEnabled,
                     x => x.IsRegexSearchEnabled, x => x.IsSearchCaseSensitive)
                 .Throttle(TimeSpan.FromMilliseconds(searchViewModelConfiguration.TimeoutMs))

diff --git a/src/Camelot.ViewModels/Implementations/ValidatableViewModelBase.cs b/src/Camelot.ViewModels/Implementations/ValidatableViewModelBase.cs
@@ -2,7 +2,7 @@
 
 namespace Camelot.ViewModels.Implementations
 {
-    public class ValidatableViewModelBase<TViewModel> : ReactiveValidationObject<TViewModel>
+    public class ValidatableViewModelBase : ReactiveValidationObject
     {
 
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     namespace Camelot.ViewModels.Implementations
     {
-        public class ValidatableViewModelBase<TViewModel> : ReactiveValidationObject<TViewModel>
+        public class ValidatableViewModelBase : ReactiveValidationObject
         {
         }
@@ Expand Down @@