diff --git a/ILSpy/TreeNodes/AssemblyTreeNode.cs b/ILSpy/TreeNodes/AssemblyTreeNode.cs index 883822f11..07995544f 100644 --- a/ILSpy/TreeNodes/AssemblyTreeNode.cs +++ b/ILSpy/TreeNodes/AssemblyTreeNode.cs @@ -122,13 +122,13 @@ namespace ICSharpCode.ILSpy.TreeNodes void OnAssemblyLoaded(Task moduleTask) { // change from "Loading" icon to final icon - RaisePropertyChanged("Icon"); - RaisePropertyChanged("ExpandedIcon"); - RaisePropertyChanged("Tooltip"); + RaisePropertyChanged(nameof(Icon)); + RaisePropertyChanged(nameof(ExpandedIcon)); + RaisePropertyChanged(nameof(ToolTip)); if (moduleTask.IsFaulted) { - RaisePropertyChanged("ShowExpander"); // cannot expand assemblies with load error + RaisePropertyChanged(nameof(ShowExpander)); // cannot expand assemblies with load error } else { - RaisePropertyChanged("Text"); // shortname might have changed + RaisePropertyChanged(nameof(Text)); // shortname might have changed } } @@ -431,7 +431,7 @@ namespace ICSharpCode.ILSpy.TreeNodes var loadedAssm = ((AssemblyTreeNode)node).LoadedAssembly; if (!loadedAssm.HasLoadError && !loadedAssm.FileName.StartsWith("nupkg://")) { loadedAssm.IsAutoLoaded = false; - node.RaisePropertyChanged("Foreground"); + node.RaisePropertyChanged(nameof(Foreground)); } } MainWindow.Instance.CurrentAssemblyList.RefreshSave(); diff --git a/ILSpy/TreeNodes/ILSpyTreeNode.cs b/ILSpy/TreeNodes/ILSpyTreeNode.cs index b3463b956..7465f0856 100644 --- a/ILSpy/TreeNodes/ILSpyTreeNode.cs +++ b/ILSpy/TreeNodes/ILSpyTreeNode.cs @@ -144,7 +144,7 @@ namespace ICSharpCode.ILSpy.TreeNodes protected virtual void OnFilterSettingsChanged() { - RaisePropertyChanged("Text"); + RaisePropertyChanged(nameof(Text)); if (IsVisible) { foreach (ILSpyTreeNode node in this.Children.OfType()) ApplyFilterToChild(node); diff --git a/SharpTreeView/EditTextBox.cs b/SharpTreeView/EditTextBox.cs index 02d3d0378..e3191945d 100644 --- a/SharpTreeView/EditTextBox.cs +++ b/SharpTreeView/EditTextBox.cs @@ -75,7 +75,7 @@ namespace ICSharpCode.TreeView if (!Node.SaveEditText(Text)) { Item.Focus(); } - Node.RaisePropertyChanged("Text"); + Node.RaisePropertyChanged(nameof(Text)); //if (Node.SaveEditText(Text)) { // Node.IsEditing = false; diff --git a/SharpTreeView/SharpTreeNode.cs b/SharpTreeView/SharpTreeNode.cs index 4606e0b16..af568e067 100644 --- a/SharpTreeView/SharpTreeNode.cs +++ b/SharpTreeView/SharpTreeNode.cs @@ -148,9 +148,9 @@ namespace ICSharpCode.TreeView isHidden = value; if (modelParent != null) UpdateIsVisible(modelParent.isVisible && modelParent.isExpanded, true); - RaisePropertyChanged("IsHidden"); + RaisePropertyChanged(nameof(IsHidden)); if (Parent != null) - Parent.RaisePropertyChanged("ShowExpander"); + Parent.RaisePropertyChanged(nameof(ShowExpander)); } } } @@ -169,7 +169,7 @@ namespace ICSharpCode.TreeView set { if (isSelected != value) { isSelected = value; - RaisePropertyChanged("IsSelected"); + RaisePropertyChanged(nameof(IsSelected)); } } } @@ -233,7 +233,7 @@ namespace ICSharpCode.TreeView } } - RaisePropertyChanged("ShowExpander"); + RaisePropertyChanged(nameof(ShowExpander)); RaiseIsLastChangedIfNeeded(e); } #endregion @@ -266,7 +266,7 @@ namespace ICSharpCode.TreeView OnCollapsing(); } UpdateChildIsVisible(true); - RaisePropertyChanged("IsExpanded"); + RaisePropertyChanged(nameof(IsExpanded)); } } } @@ -286,11 +286,11 @@ namespace ICSharpCode.TreeView IsExpanded = false; if (canExpandRecursively) { canExpandRecursively = false; - RaisePropertyChanged("CanExpandRecursively"); + RaisePropertyChanged(nameof(CanExpandRecursively)); } } - RaisePropertyChanged("LazyLoading"); - RaisePropertyChanged("ShowExpander"); + RaisePropertyChanged(nameof(LazyLoading)); + RaisePropertyChanged(nameof(ShowExpander)); } } @@ -379,7 +379,7 @@ namespace ICSharpCode.TreeView { if (isEditing != value) { isEditing = value; - RaisePropertyChanged("IsEditing"); + RaisePropertyChanged(nameof(IsEditing)); } } } @@ -436,7 +436,7 @@ namespace ICSharpCode.TreeView } } - RaisePropertyChanged("IsChecked"); + RaisePropertyChanged(nameof(IsChecked)); } } @@ -645,15 +645,15 @@ namespace ICSharpCode.TreeView case NotifyCollectionChangedAction.Add: if (e.NewStartingIndex == Children.Count - 1) { if (Children.Count > 1) { - Children[Children.Count - 2].RaisePropertyChanged("IsLast"); + Children[Children.Count - 2].RaisePropertyChanged(nameof(IsLast)); } - Children[Children.Count - 1].RaisePropertyChanged("IsLast"); + Children[Children.Count - 1].RaisePropertyChanged(nameof(IsLast)); } break; case NotifyCollectionChangedAction.Remove: if (e.OldStartingIndex == Children.Count) { if (Children.Count > 0) { - Children[Children.Count - 1].RaisePropertyChanged("IsLast"); + Children[Children.Count - 1].RaisePropertyChanged(nameof(IsLast)); } } break;