clean up

gro-ove · Nov 26, 2018 · 5372072 · 5372072
1 parent d2b71be
commit 5372072
Show file tree

Hide file tree

Showing 134 changed files with 346 additions and 347 deletions.
diff --git a/AcManager.ContentRepair/CarRepair.cs b/AcManager.ContentRepair/CarRepair.cs
@@ -60,7 +60,7 @@ public virtual bool IsAvailable(IEnumerable<CarRepairBase> repairs) {
 
     public abstract class CarSimpleRepairBase : CarRepairBase {
         protected virtual Task<bool> FixAsync([NotNull] CarObject car, IProgress<AsyncProgressEntry> progress = null,
-                CancellationToken cancellation = default(CancellationToken)) {
+                CancellationToken cancellation = default) {
             progress?.Report(AsyncProgressEntry.FromStringIndetermitate("Fixing car…"));
             return Task.Run(() => {
                 var data = car.AcdData;

diff --git a/AcManager.ContentRepair/ContentRepairSuggestion.cs b/AcManager.ContentRepair/ContentRepairSuggestion.cs
@@ -36,7 +36,7 @@ public ContentRepairSuggestionFix(ContentRepairSuggestion parent, string fixCapt
             _fix = fix;
         }
 
-        public Task<bool> Fix(IProgress<AsyncProgressEntry> progress = null, CancellationToken cancellation = default(CancellationToken)) {
+        public Task<bool> Fix(IProgress<AsyncProgressEntry> progress = null, CancellationToken cancellation = default) {
             return _fix(progress, cancellation);
         }
 

diff --git a/AcManager.ContentRepair/Repairs/CarFlamesRepair.cs b/AcManager.ContentRepair/Repairs/CarFlamesRepair.cs
@@ -22,7 +22,7 @@ public class CarFlamesRepair : CarRepairBase {
         private static byte[] _flamesTextures;
 
         private static async Task<byte[]> GetFlamesTexturesAsync(IProgress<AsyncProgressEntry> progress = null,
-                CancellationToken cancellation = default(CancellationToken)) {
+                CancellationToken cancellation = default) {
             if (_flamesTextures == null) {
                 progress?.Report(AsyncProgressEntry.FromStringIndetermitate("Loading flames textures…"));
                 _flamesTextures = await CmApiProvider.GetStaticDataBytesAsync("flames", TimeSpan.FromDays(3), cancellation: cancellation);
@@ -35,7 +35,7 @@ private static async Task<byte[]> GetFlamesTexturesAsync(IProgress<AsyncProgress
         public override bool AffectsData => true;
 
         public static async Task<bool> UpgradeToSecondVersionAsync(CarObject car, IProgress<AsyncProgressEntry> progress = null,
-                CancellationToken cancellation = default(CancellationToken)) {
+                CancellationToken cancellation = default) {
             progress?.Report(AsyncProgressEntry.FromStringIndetermitate("Updating data…"));
             if (!await Task.Run(() => {
                 var data = car.AcdData;
@@ -73,7 +73,7 @@ public static async Task<bool> UpgradeToSecondVersionAsync(CarObject car, IProgr
         }
 
         public static async Task<bool> FixMissingTexturesAsync(CarObject car, IProgress<AsyncProgressEntry> progress = null,
-                CancellationToken cancellation = default(CancellationToken)) {
+                CancellationToken cancellation = default) {
             var flamesTextures = await GetFlamesTexturesAsync(progress, cancellation);
             if (cancellation.IsCancellationRequested) return false;
 

diff --git a/AcManager.ContentRepair/Repairs/CarModelRepair.cs b/AcManager.ContentRepair/Repairs/CarModelRepair.cs
@@ -17,7 +17,7 @@ public class CarModelRepair : CarRepairBase {
         private static readonly string[] SuspensionNodes = { "SUSP_LF", "SUSP_RF", "SUSP_LR", "SUSP_RR" };
 
         private Task<bool> FixAsync([NotNull] CarObject car, Action<Kn5> fix, IProgress<AsyncProgressEntry> progress = null,
-                CancellationToken cancellation = default(CancellationToken)) {
+                CancellationToken cancellation = default) {
             progress?.Report(AsyncProgressEntry.FromStringIndetermitate("Fixing car…"));
             return Task.Run(() => {
                 var kn5Filename = AcPaths.GetMainCarFilename(car.Location, car.AcdData, false);
@@ -31,7 +31,7 @@ private Task<bool> FixAsync([NotNull] CarObject car, Action<Kn5> fix, IProgress<
         }
 
         public static async Task<bool> FixSuspensionNodesAsync(CarObject car, IProgress<AsyncProgressEntry> progress = null,
-                CancellationToken cancellation = default(CancellationToken)) {
+                CancellationToken cancellation = default) {
             progress?.Report(AsyncProgressEntry.FromStringIndetermitate("Fixing car…"));
             return await Task.Run(() => {
                 var kn5Filename = AcPaths.GetMainCarFilename(car.Location, car.AcdData, false);

diff --git a/AcManager.ContentRepair/Repairs/CarObsoleteTakenSoundRepair.cs b/AcManager.ContentRepair/Repairs/CarObsoleteTakenSoundRepair.cs
@@ -39,7 +39,7 @@ private static string GetSoundbankChecksum(string carId) {
         }
 
         private async Task<bool> FixAsync([NotNull] CarObject car, CarObject donor, IProgress<AsyncProgressEntry> progress = null,
-                CancellationToken cancellation = default(CancellationToken)) {
+                CancellationToken cancellation = default) {
             progress?.Report(AsyncProgressEntry.FromStringIndetermitate("Fixing sound…"));
             await car.ReplaceSound(donor);
             return true;

diff --git a/AcManager.Controls/AcListPage.cs b/AcManager.Controls/AcListPage.cs
@@ -637,7 +637,7 @@ private void OnBatchActionRunButtonClick(object sender, RoutedEventArgs args) {
                     if (_selectedBatchAction == null || _list == null) return;
 
                     if (_selectedBatchAction.InternalWaitingDialog) {
-                        await _selectedBatchAction.ApplyAsync(_list.SelectedItems, null, default(CancellationToken));
+                        await _selectedBatchAction.ApplyAsync(_list.SelectedItems, null, default);
                     } else {
                         using (var waiting = new WaitingDialog()) {
                             waiting.Report(AsyncProgressEntry.FromStringIndetermitate("Processing…"));

diff --git a/AcManager.Controls/AcObjectBase.cs b/AcManager.Controls/AcObjectBase.cs
@@ -89,15 +89,15 @@ public AcObjectNew AcObject {
                 typeof(AcObjectBase), new PropertyMetadata(false));
 
         public bool IsNameReadOnly {
-            get => GetValue(IsNameReadOnlyProperty) as bool? ?? default(bool);
+            get => GetValue(IsNameReadOnlyProperty) as bool? ?? default;
             set => SetValue(IsNameReadOnlyProperty, value);
         }
 
         public static readonly DependencyProperty ShowIconProperty = DependencyProperty.Register(nameof(ShowIcon), typeof(bool),
                 typeof(AcObjectBase));
 
         public bool ShowIcon {
-            get => GetValue(ShowIconProperty) as bool? ?? default(bool);
+            get => GetValue(ShowIconProperty) as bool? ?? default;
             set => SetValue(ShowIconProperty, value);
         }
 
@@ -145,15 +145,15 @@ public Collection<ToolBar> ToolBars {
                 typeof(AcObjectBase), new PropertyMetadata(true));
 
         public bool Scrollable {
-            get => GetValue(ScrollableProperty) as bool? ?? default(bool);
+            get => GetValue(ScrollableProperty) as bool? ?? default;
             set => SetValue(ScrollableProperty, value);
         }
 
         public static readonly DependencyProperty HeaderPaddingProperty = DependencyProperty.Register(nameof(HeaderPadding), typeof(Thickness),
                 typeof(AcObjectBase));
 
         public Thickness HeaderPadding {
-            get => GetValue(HeaderPaddingProperty) as Thickness? ?? default(Thickness);
+            get => GetValue(HeaderPaddingProperty) as Thickness? ?? default;
             set => SetValue(HeaderPaddingProperty, value);
         }
     }

diff --git a/AcManager.Controls/AvalonExtension.cs b/AcManager.Controls/AvalonExtension.cs
@@ -122,7 +122,7 @@ private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedE
         }
 
         public static AvalonEditMode GetMode(DependencyObject obj) {
-            return obj.GetValue(ModeProperty) as AvalonEditMode? ?? default(AvalonEditMode);
+            return obj.GetValue(ModeProperty) as AvalonEditMode? ?? default;
         }
 
         public static void SetMode(DependencyObject obj, AvalonEditMode value) {

diff --git a/AcManager.Controls/BestLapsList.cs b/AcManager.Controls/BestLapsList.cs
@@ -177,7 +177,7 @@ public bool ShowTitle {
                 typeof(BestLapsList), new FrameworkPropertyMetadata(new Thickness(20d, 0d, 0d, 0d)));
 
         public Thickness EntryPadding {
-            get => GetValue(EntryPaddingProperty) as Thickness? ?? default(Thickness);
+            get => GetValue(EntryPaddingProperty) as Thickness? ?? default;
             set => SetValue(EntryPaddingProperty, value);
         }
     }

diff --git a/AcManager.Controls/Converters/TimeSpanConverters.cs b/AcManager.Controls/Converters/TimeSpanConverters.cs
@@ -24,7 +24,7 @@ private static TimeSpan Convert(string s) {
                 case 2:
                     return TimeSpan.FromMinutes((p[0] < 0 ? -1 : 1) * (p[0].Abs() * 60 + p[1]));
                 default:
-                    return default(TimeSpan);
+                    return default;
             }
         }
 
@@ -56,7 +56,7 @@ private static TimeSpan Convert(string s) {
                 case 3:
                     return TimeSpan.FromSeconds((p[0] < 0 ? -1 : 1) * (p[0].Abs() * 3600 + p[1].Abs() * 60 + p[2].Abs()));
                 default:
-                    return default(TimeSpan);
+                    return default;
             }
         }
 

diff --git a/AcManager.Controls/Dialogs/BlurredPiece.cs b/AcManager.Controls/Dialogs/BlurredPiece.cs
@@ -107,7 +107,7 @@ private void UpdateOffset() {
             _updateOffset.Yield(() => {
                 try {
                     if (_loaded && _visual != null) {
-                        var offset = _visual.PointFromScreen(PointToScreen(default(Point)));
+                        var offset = _visual.PointFromScreen(PointToScreen(default));
                         Viewbox = new Rect(offset.X - _blurRadius, offset.Y - _blurRadius,
                                 ActualWidth + _blurRadius * 2, ActualHeight + _blurRadius * 2);
                     }

diff --git a/AcManager.Controls/Dialogs/ImageViewer.xaml.cs b/AcManager.Controls/Dialogs/ImageViewer.xaml.cs
@@ -64,7 +64,7 @@ public ImageViewer([NotNull] IEnumerable<T> items, int position, [CanBeNull] Ima
         public new T SelectDialog() {
             Model.SelectionMode = true;
             ShowDialog();
-            return IsSelected ? _list.ElementAtOrDefault(Model.CurrentPosition) : default(T);
+            return IsSelected ? _list.ElementAtOrDefault(Model.CurrentPosition) : default;
         }
 
         public new ViewModel<T> Model => (ViewModel<T>)DataContext;

diff --git a/AcManager.Controls/FavouriteButton.cs b/AcManager.Controls/FavouriteButton.cs
@@ -54,15 +54,15 @@ public PathData Data {
                 typeof(RatingBar), new FrameworkPropertyMetadata(0d, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
 
         public double Rating {
-            get => GetValue(RatingProperty) as double? ?? default(double);
+            get => GetValue(RatingProperty) as double? ?? default;
             set => SetValue(RatingProperty, value);
         }
 
         public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(nameof(IsReadOnly), typeof(bool),
                 typeof(RatingBar));
 
         public bool IsReadOnly {
-            get => GetValue(IsReadOnlyProperty) as bool? ?? default(bool);
+            get => GetValue(IsReadOnlyProperty) as bool? ?? default;
             set => SetValue(IsReadOnlyProperty, value);
         }
 

diff --git a/AcManager.Controls/Graphs/CustomTrackerControl.cs b/AcManager.Controls/Graphs/CustomTrackerControl.cs
@@ -14,7 +14,7 @@ static CustomTrackerControl() {
                 typeof(CustomTrackerControl), new PropertyMetadata(OnPositionOverrideChanged));
 
         public ScreenPoint PositionOverride {
-            get => GetValue(PositionOverrideProperty) as ScreenPoint? ?? default(ScreenPoint);
+            get => GetValue(PositionOverrideProperty) as ScreenPoint? ?? default;
             set => SetValue(PositionOverrideProperty, value);
         }
 
@@ -26,7 +26,7 @@ private static void OnPositionOverrideChanged(DependencyObject o, DependencyProp
                 typeof(CustomTrackerControl), new PropertyMetadata(OnLineExtentsOverrideChanged));
 
         public OxyRect LineExtentsOverride {
-            get => GetValue(LineExtentsOverrideProperty) as OxyRect? ?? default(OxyRect);
+            get => GetValue(LineExtentsOverrideProperty) as OxyRect? ?? default;
             set => SetValue(LineExtentsOverrideProperty, value);
         }
 

diff --git a/AcManager.Controls/Helpers/DelayedPropertyWrapper.cs b/AcManager.Controls/Helpers/DelayedPropertyWrapper.cs
@@ -25,7 +25,7 @@ public T Value {
 
                 var now = DateTime.Now;
                 if (Interval == TimeSpan.Zero || now - _previousChange > Interval) {
-                    _unappliedValue = default(T);
+                    _unappliedValue = default;
                     _hasUnappliedValue = false;
                     _value = value;
                     _changed(value);
@@ -43,7 +43,7 @@ public void ForceValue(T newValue) {
             if (Equals(newValue, _value)) return;
             _timer?.Stop();
             _value = newValue;
-            _unappliedValue = default(T);
+            _unappliedValue = default;
             _hasUnappliedValue = false;
             _changed(_value);
             _previousChange = DateTime.Now;
@@ -58,7 +58,7 @@ private void ResetTimer() {
                 _timer.Tick += (o, eventArgs) => {
                     _timer.Stop();
                     _value = _unappliedValue;
-                    _unappliedValue = default(T);
+                    _unappliedValue = default;
                     _hasUnappliedValue = false;
                     _changed(_value);
                     _previousChange = DateTime.Now;

diff --git a/AcManager.Controls/OriginIcon.cs b/AcManager.Controls/OriginIcon.cs
@@ -98,7 +98,7 @@ private static OriginIconDescription FindIcon([CanBeNull] string obj) {
                 }
             }
 
-            Cache[key] = default(OriginIconDescription);
+            Cache[key] = default;
             return null;
         }
 

diff --git a/AcManager.Controls/PropertiesGrid.cs b/AcManager.Controls/PropertiesGrid.cs
@@ -84,15 +84,15 @@ public FontFamily LabelFontFamily {
                 typeof(PropertiesGrid));
 
         public FontWeight LabelFontWeight {
-            get => GetValue(LabelFontWeightProperty) as FontWeight? ?? default(FontWeight);
+            get => GetValue(LabelFontWeightProperty) as FontWeight? ?? default;
             set => SetValue(LabelFontWeightProperty, value);
         }
 
         public static readonly DependencyProperty LabelPaddingProperty = DependencyProperty.Register(nameof(LabelPadding), typeof(Thickness),
                 typeof(PropertiesGrid));
 
         public Thickness LabelPadding {
-            get => GetValue(LabelPaddingProperty) as Thickness? ?? default(Thickness);
+            get => GetValue(LabelPaddingProperty) as Thickness? ?? default;
             set => SetValue(LabelPaddingProperty, value);
         }
 
@@ -332,7 +332,7 @@ private void UpdateComputedValues() {
         protected override Size MeasureOverride(Size constraint) {
             UpdateComputedValues();
 
-            if (_columns == 0 || _rows == 0) return default(Size);
+            if (_columns == 0 || _rows == 0) return default;
             var childConstraint =
                     new Size(Math.Max(constraint.Width - _totalSpacingWidth, 0d) / _columns,
                             Math.Max((constraint.Height - _totalSpacingHeight) / _rows, 0d));
@@ -363,7 +363,7 @@ protected override Size MeasureOverride(Size constraint) {
         }
 
         protected override Size ArrangeOverride(Size arrangeSize) {
-            if (_columns == 0 || _rows == 0) return default(Size);
+            if (_columns == 0 || _rows == 0) return default;
             UpdateLabels();
 
             var totalSpacingX = _columns == 0 ? 0 : _horizontalSpacing * (_columns - 1);

diff --git a/AcManager.Controls/TemperatureValueLabel.cs b/AcManager.Controls/TemperatureValueLabel.cs
@@ -53,7 +53,7 @@ public double Rounding {
                 typeof(TemperatureBlock), new PropertyMetadata(OnModeChanged));
 
         public TemperatureUnitMode Mode {
-            get => GetValue(ModeProperty) as TemperatureUnitMode? ?? default(TemperatureUnitMode);
+            get => GetValue(ModeProperty) as TemperatureUnitMode? ?? default;
             set => SetValue(ModeProperty, value);
         }
 
@@ -89,7 +89,7 @@ static TemperatureValueLabel() {
                 typeof(TemperatureValueLabel));
 
         public TemperatureUnitMode Mode {
-            get => GetValue(ModeProperty) as TemperatureUnitMode? ?? default(TemperatureUnitMode);
+            get => GetValue(ModeProperty) as TemperatureUnitMode? ?? default;
             set => SetValue(ModeProperty, value);
         }
 
@@ -111,7 +111,7 @@ static DoubleTemperatureValueLabel() {
                 typeof(DoubleTemperatureValueLabel));
 
         public TemperatureUnitMode Mode {
-            get => GetValue(ModeProperty) as TemperatureUnitMode? ?? default(TemperatureUnitMode);
+            get => GetValue(ModeProperty) as TemperatureUnitMode? ?? default;
             set => SetValue(ModeProperty, value);
         }
 

diff --git a/AcManager.Controls/UserControls/ModernPopup.xaml.cs b/AcManager.Controls/UserControls/ModernPopup.xaml.cs
@@ -24,7 +24,7 @@ private static CustomPopupPlacement[] OnPlacementCallback(Size popupSize, Size t
                 typeof(ModernPopup), new PropertyMetadata(new Thickness(4d)));
 
         public Thickness Padding {
-            get => GetValue(PaddingProperty) as Thickness? ?? default(Thickness);
+            get => GetValue(PaddingProperty) as Thickness? ?? default;
             set => SetValue(PaddingProperty, value);
         }
 

diff --git a/AcManager.Controls/UserControls/Web/JsBridgeBase.cs b/AcManager.Controls/UserControls/Web/JsBridgeBase.cs
@@ -41,7 +41,7 @@ protected T Sync<T>(Func<T> action) {
                     return action();
                 } catch (Exception e) {
                     Logging.Warning(e);
-                    return default(T);
+                    return default;
                 }
             });
         }

diff --git a/AcManager.Controls/Video/IVideoPlayer.cs b/AcManager.Controls/Video/IVideoPlayer.cs
@@ -82,7 +82,7 @@ public bool AutoPlay {
                 new PropertyMetadata(Stretch.Uniform, OnStretchChanged));
 
         public Stretch Stretch {
-            get => GetValue(StretchProperty) as Stretch? ?? default(Stretch);
+            get => GetValue(StretchProperty) as Stretch? ?? default;
             set => SetValue(StretchProperty, value);
         }
 

diff --git a/AcManager.Controls/Video/WindowsMediaPlayer.cs b/AcManager.Controls/Video/WindowsMediaPlayer.cs
@@ -113,7 +113,7 @@ private void MediaPlayer_MediaOpened(object sender, RoutedEventArgs e) {
             }
         }
 
-        private void ResetAndPlay(TimeSpan position = default(TimeSpan)) {
+        private void ResetAndPlay(TimeSpan position = default) {
             _mediaPlayer.Position = position;
             _mediaPlayer.Play();
         }

diff --git a/AcManager.Controls/ViewModels/RaceGridViewModel.cs b/AcManager.Controls/ViewModels/RaceGridViewModel.cs
@@ -792,7 +792,7 @@ public string ErrorMessage {
         }
 
         [ItemCanBeNull]
-        private async Task<IReadOnlyList<RaceGridEntry>> FindCandidates(CancellationToken cancellation = default(CancellationToken)) {
+        private async Task<IReadOnlyList<RaceGridEntry>> FindCandidates(CancellationToken cancellation = default) {
             var mode = Mode;
 
             // Don’t change anything in Fixed or Manual mode
@@ -1321,7 +1321,7 @@ public bool ForceFixedSeed {
         }
 
         [ItemCanBeNull]
-        public async Task<IList<Game.AiCar>> GenerateGameEntries(CancellationToken cancellation = default(CancellationToken)) {
+        public async Task<IList<Game.AiCar>> GenerateGameEntries(CancellationToken cancellation = default) {
             if (IsBusy) {
                 await RebuildGridAsync();
                 if (cancellation.IsCancellationRequested) return null;

diff --git a/AcManager.Controls/ViewModels/UploaderParams.cs b/AcManager.Controls/ViewModels/UploaderParams.cs
@@ -89,7 +89,7 @@ public int IsBusy {
         public async Task Prepare() {
             try {
                 IsBusy++;
-                await SelectedUploader.PrepareAsync(default(CancellationToken));
+                await SelectedUploader.PrepareAsync(default);
             } finally {
                 IsBusy--;
             }

diff --git a/AcManager.DiscordRpc/DiscordConnection.cs b/AcManager.DiscordRpc/DiscordConnection.cs
@@ -299,7 +299,7 @@ private byte[] Fit(int size) {
         }
 
         [ItemCanBeNull]
-        private async Task<JToken> ReadAsync(CancellationToken cancellation = default(CancellationToken)) {
+        private async Task<JToken> ReadAsync(CancellationToken cancellation = default) {
             if (IsDisposed) throw new DiscordException("Disposed");
 
             // 400 bytes to fit all necessary stuff

diff --git a/AcManager.LargeFilesSharing/Implementations/GoogleDriveUploaderBase.cs b/AcManager.LargeFilesSharing/Implementations/GoogleDriveUploaderBase.cs
@@ -63,7 +63,7 @@ internal class RefreshResponse {
         public override async Task ResetAsync(CancellationToken cancellation) {
             await base.ResetAsync(cancellation);
             _authToken = null;
-            _authExpiration = default(DateTime);
+            _authExpiration = default;
             Storage.Remove(KeyAuthToken);
             Storage.Remove(KeyAuthExpiration);
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
-                Cache[key] = default(OriginIconDescription);
+                Cache[key] = default;
                 return null;
             }
@@ Expand Down @@