From 6004f30d3abe9e4df70722bf011d8309c5e45b6f Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 15 Jun 2019 15:19:18 -0500
Subject: [PATCH] rename IStateManager.ClearStateHistory -> Clear,
 LastStatedFrame -> Last

---
 .../movie/conversions/MovieConversionExtensions.cs        | 4 ++--
 BizHawk.Client.Common/movie/tasproj/IStateManager.cs      | 8 +++-----
 BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs        | 2 +-
 BizHawk.Client.Common/movie/tasproj/TasMovie.cs           | 4 ++--
 BizHawk.Client.Common/movie/tasproj/TasStateManager.cs    | 4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
index ac88cba786..a15f250e0e 100644
--- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
+++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
@@ -168,7 +168,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
 			// States can't be easily moved over, because they contain the frame number.
 			// TODO? I'm not sure how this would be done.
 			tas.TasStateManager.MountWriteAccess();
-			old.TasStateManager.ClearStateHistory();
+			old.TasStateManager.Clear();
 
 			// Lag Log
 			tas.TasLagLog.FromLagLog(old.TasLagLog);
@@ -242,7 +242,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
 			}
 
 			var tas = new TasMovie(newFilename, true) { SaveRam = saveRam };
-			tas.TasStateManager.ClearStateHistory();
+			tas.TasStateManager.Clear();
 			tas.ClearLagLog();
 
 			var entries = old.GetLogEntries();
diff --git a/BizHawk.Client.Common/movie/tasproj/IStateManager.cs b/BizHawk.Client.Common/movie/tasproj/IStateManager.cs
index f0a259fdb2..e3fe175b82 100644
--- a/BizHawk.Client.Common/movie/tasproj/IStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/IStateManager.cs
@@ -7,7 +7,7 @@ namespace BizHawk.Client.Common
 
 	using BizHawk.Common;
 
-	public interface IStateManager : IDisposable
+	public interface IStateManager
 	{
 		// byte[] this[int frame] { get; } // TODO: I had it refactored to this back in the day
 		KeyValuePair<int, byte[]> this[int frame] { get; }
@@ -22,9 +22,8 @@ namespace BizHawk.Client.Common
 
 		bool Invalidate(int frame);
 
-		// TODO: rename to Clear()
 		// TODO: consider it passing a bool if anything was cleared, and the .Any() could go away
-		void ClearStateHistory();
+		void Clear();
 
 		void Save(BinaryWriter bw);
 
@@ -36,8 +35,7 @@ namespace BizHawk.Client.Common
 
 		int Count { get; }
 
-		// TODO: rename to Last
-		int LastStatedFrame { get; }
+		int Last { get; }
 
 		bool IsMarkerState(int frame);
 
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
index 221d235b89..cd99ea0766 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
@@ -272,7 +272,7 @@ namespace BizHawk.Client.Common
 		private void ClearTasprojExtras()
 		{
 			ClearLagLog();
-			_stateManager.ClearStateHistory();
+			_stateManager.Clear();
 			Markers.Clear();
 			ChangeLog.ClearLog();
 		}
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index 08e8023487..9b26f14e53 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -35,7 +35,7 @@ namespace BizHawk.Client.Common
 		public TasLagLog TasLagLog => _lagLog;
 		public IStringLog InputLog => Log;
 		public int BranchCount => Branches.Count;
-		public int LastStatedFrame => _stateManager.LastStatedFrame;
+		public int LastStatedFrame => _stateManager.Last;
 		public override string PreferredExtension => Extension;
 		public IStateManager TasStateManager => _stateManager;
 
@@ -218,7 +218,7 @@ namespace BizHawk.Client.Common
 		{
 			if (_stateManager.Any())
 			{
-				_stateManager.ClearStateHistory();
+				_stateManager.Clear();
 				Changes = true;
 			}
 		}
diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 78656b5c44..717516a1a1 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -317,7 +317,7 @@ namespace BizHawk.Client.Common
 			return ret;
 		}
 
-		public void ClearStateHistory()
+		public void Clear()
 		{
 			if (_states.Any())
 			{
@@ -450,7 +450,7 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public int LastStatedFrame
+		public int Last
 		{
 			get
 			{