more fixes to obsolete api

AssetIdRemapUtility/Editor/AssetIdRemapBuilderEditor.cs

@@ -47,7 +47,7 @@ static string namespaceRemapFilePath
         [SerializeField] string m_SourceDirectory;
         [SerializeField] string m_DestinationDirectory;
 
-        [SerializeField] TreeViewState m_TreeViewState;
+        [SerializeField] TreeViewState<int> m_TreeViewState;
         [SerializeField] MultiColumnHeaderState m_MultiColumnHeaderState;
         [SerializeField] bool m_DetailsExpanded;
 
@@ -85,7 +85,7 @@ void OnEnable()
             // Check whether there is already a serialized view state (state
             // that survived assembly reloading)
             if (m_TreeViewState == null)
-                m_TreeViewState = new TreeViewState();
+                m_TreeViewState = new TreeViewState<int>();
 
             if (m_MultiColumnHeaderState == null)
                 m_MultiColumnHeaderState = new MultiColumnHeaderState(new MultiColumnHeaderState.Column[]

AssetIdRemapUtility/Editor/AssetIdRemapBuilderTreeView.cs

@@ -4,13 +4,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using UnityEngine;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
 
 namespace UnityEngine.ProBuilder.AssetIdRemapUtility
 {
-    sealed class AssetIdRemapBuilderTreeView : TreeView
+    sealed class AssetIdRemapBuilderTreeView : TreeView<int>
     {
         AssetIdRemapObject m_RemapObject = null;
         const float k_RowHeight = 20f;
@@ -24,7 +23,7 @@ public AssetIdRemapObject remapObject
             set { m_RemapObject = value; }
         }
 
-        public AssetIdRemapBuilderTreeView(TreeViewState state, MultiColumnHeader header)
+        public AssetIdRemapBuilderTreeView(TreeViewState<int> state, MultiColumnHeader header)
             : base(state, header)
         {
             rowHeight = 20f;
@@ -33,13 +32,11 @@ public AssetIdRemapBuilderTreeView(TreeViewState state, MultiColumnHeader header
             extraSpaceBeforeIconAndLabel = 18f;
         }
 
-#pragma warning disable CS0618 // Type or member is obsolete
-        protected override TreeViewItem BuildRoot()
+        protected override TreeViewItem<int> BuildRoot()
         {
             StringTupleTreeElement root = new StringTupleTreeElement(0, -1, -1, "Root", "", "");
 
-            var all = new List<TreeViewItem>();
-#pragma warning restore CS0618
+            var all = new List<TreeViewItem<int>>();
 
             int index = 1;
 
@@ -108,9 +105,7 @@ void CellGUI(Rect rect, StringTupleTreeElement item, int visibleColumn, ref RowG
             GUI.Label(rect, m_CellContents);
         }
 
-#pragma warning disable CS0618 // Type or member is obsolete
-        protected override bool DoesItemMatchSearch(TreeViewItem element, string search)
-#pragma warning restore CS0618
+        protected override bool DoesItemMatchSearch(TreeViewItem<int> element, string search)
         {
             StringTupleTreeElement tup = element as StringTupleTreeElement;
 
@@ -201,9 +196,7 @@ protected override void CommandEventHandling()
         }
     }
 
-#pragma warning disable CS0618 // Type or member is obsolete
-    class StringTupleTreeElement : TreeViewItem
-#pragma warning restore CS0618
+    class StringTupleTreeElement : TreeViewItem<int>
     {
         public string item1;
         public string item2;

AssetIdRemapUtility/Editor/AssetIdRemapEditor.cs

@@ -129,10 +129,10 @@
         AssetTreeView m_AssetsToDeleteTreeView;
         MultiColumnHeader m_MultiColumnHeader;
         Rect m_AssetTreeRect = new Rect(0, 0, 0, 0);
-#pragma warning disable CS0618 // Type or member is obsolete
+
         [SerializeField]
-        TreeViewState m_TreeViewState = null;
-#pragma warning restore CS0618
+        TreeViewState<int> m_TreeViewState = null;
+
         [SerializeField]
         MultiColumnHeaderState m_MultiColumnHeaderState = null;
         GUIContent m_AssetTreeSettingsContent = null;
@@ -178,10 +178,8 @@
                 Debug.LogWarning("Could not find a valid asset id remap file!");
             }
 
-#pragma warning disable CS0618 // Type or member is obsolete
             if (m_TreeViewState == null)
-                m_TreeViewState = new TreeViewState();
-#pragma warning restore CS0618
+                m_TreeViewState = new TreeViewState<int>();
 
             if (m_MultiColumnHeaderState == null)
                 m_MultiColumnHeaderState = new MultiColumnHeaderState(new MultiColumnHeaderState.Column[]
@@ -477,9 +475,7 @@
             m_ConversionReadyState = GetReadyState();
         }
 
-#pragma warning disable CS0618 // Type or member is obsolete
-        bool RemoveAssetStoreFiles(TreeViewItem root, StringBuilder log)
-#pragma warning restore CS0618
+        bool RemoveAssetStoreFiles(TreeViewItem<int> root, StringBuilder log)
         {
             AssetTreeItem node = root as AssetTreeItem;
 

AssetIdRemapUtility/Editor/AssetTreeView.cs

@@ -11,9 +11,7 @@
 
 namespace UnityEngine.ProBuilder.AssetIdRemapUtility
 {
-#pragma warning disable CS0618 // Type or member is obsolete
-    sealed class AssetTreeItem : TreeViewItem
-#pragma warning restore CS0618
+    sealed class AssetTreeItem : TreeViewItem<int>
     {
         string m_RelativePath;
         string m_FullPath;
@@ -101,8 +99,7 @@
         }
     }
 
-#pragma warning disable CS0618 // Type or member is obsolete
-    class AssetTreeView : TreeView
+    class AssetTreeView : TreeView<int>
     {
         string m_RootDirectory = null;
         GUIContent m_TempContent = new GUIContent();
@@ -134,13 +131,13 @@
             m_FileIgnorePatterns = regexStrings.Select(x => new Regex(x));
         }
 
-        public AssetTreeView(TreeViewState state, MultiColumnHeader header) : base(state, header)
+        public AssetTreeView(TreeViewState<int> state, MultiColumnHeader header) : base(state, header)
         {
             showBorder = true;
             columnIndexForTreeFoldouts = 0;
             rowHeight = 18f;
         }
-        protected override TreeViewItem BuildRoot()
+        protected override TreeViewItem<int> BuildRoot()
         {
             AssetTreeItem root = new AssetTreeItem(0, Application.dataPath, "")
             {
@@ -151,7 +148,7 @@
             if (string.IsNullOrEmpty(m_RootDirectory) || !Directory.Exists(m_RootDirectory))
             {
                 // if root has no children and you SetupDepthsFromParentsAndChildren nullrefs are thrown
-                var list = new List<TreeViewItem>() {};
+                var list = new List<TreeViewItem<int>>() {};
                 SetupParentsAndChildrenFromDepths(root, list);
             }
             else
@@ -196,7 +193,7 @@
                 PopulateAssetTree(dir, leaf, ref nodeIdIndex);
         }
 
-        public void ApplyEnabledFilters(TreeViewItem root)
+        public void ApplyEnabledFilters(TreeViewItem<int> root)
         {
             AssetTreeItem node = root as AssetTreeItem;
             AssetTreeItem parent = root.parent as AssetTreeItem;
@@ -309,5 +306,4 @@
                         GatherTreeItems(child as AssetTreeItem, list);
         }
     }
-#pragma warning restore CS0618 // Type or member is obsolete
 }

Editor/EditorCore/HierarchyListener.cs

@@ -70,9 +70,7 @@ static void ObjectEventChangesPublished(ref ObjectChangeEventStream stream)
 
         static GameObject InstanceIDToObject(int instanceId)
         {
-#pragma warning disable CS0618
             return UnityEditor.EditorUtility.InstanceIDToObject(instanceId) as GameObject;
-#pragma warning restore CS0618
         }
 #endif