Merge pull request #1492 from mortend/obsolete

mortend · web-flow · commit cc9b5bc97fb2 · 2023-10-08T13:33:45.000+07:00
remove obsolete methods and properties (beta-3.0)
diff --git a/Source/Fuse.Common/Json.uno b/Source/Fuse.Common/Json.uno
@@ -103,41 +103,6 @@ namespace Fuse
 			else sb.Append("null");
 		}
 
-		[Obsolete("Use Uno.Data.Json.JsonWriter.QuoteString() instead")]
-		public static string Escape(string s)
-		{
-			var sb = new StringBuilder();
-			Escape(s, sb);
-			return sb.ToString();
-		}
-
-		[Obsolete("Use Uno.Data.Json.JsonWriter.QuoteString() instead")]
-		public static void Escape(string s, StringBuilder sb)
-		{
-			for (int i = 0; i < s.Length; i++)
-			{
-				if (s[i] == '\"')
-				{
-					if (sb == null) sb = new StringBuilder();
-					sb.Append("\\\"");
-				}
-				else if (s[i] == '\\')
-				{
-					if (sb == null) sb = new StringBuilder();
-					sb.Append("\\\\");
-				}
-				else if (s[i] == '\n')
-				{
-					if (sb == null) sb = new StringBuilder();
-					sb.Append("\\n");
-				}
-				else
-				{
-					sb.Append(s[i]);
-				}
-			}
-		}
-
 		/** Returns an escaped string encapsulated in Json quotes. */
 		public static string ToLiteral(string s)
 		{
diff --git a/Source/Fuse.Common/SystemFont.uno b/Source/Fuse.Common/SystemFont.uno
@@ -47,9 +47,6 @@ namespace Fuse
 			Bold,
 			Heavy,
 			Black,
-
-			[Obsolete]
-			SemiBold = Semibold
 		}
 
 		public enum Style
diff --git a/Source/Fuse.Controls.Panels/GraphicsView.ux.uno b/Source/Fuse.Controls.Panels/GraphicsView.ux.uno
@@ -284,6 +284,7 @@ namespace Fuse.Controls
 		{
 			get { return ActualPixelSize; }
 		}
+
 		public float2 ActualPixelSize
 		{
 			get { return ActualSize * PixelsPerPoint; }
diff --git a/Source/Fuse.Nodes/VisualBounds.uno b/Source/Fuse.Nodes/VisualBounds.uno
@@ -149,12 +149,6 @@ namespace Fuse
 			return Box(add);
 		}
 
-		[Obsolete("Please use the other overload (for performance)")]
-		public VisualBounds Transform(float4x4 matrix)
-		{
-			return Transform(FastMatrix.FromFloat4x4(matrix));
-		}
-
 		public VisualBounds Transform(FastMatrix fastMatrix)
 		{
 			if (IsInfinite || IsEmpty)
@@ -164,12 +158,6 @@ namespace Fuse
 			return Box(n);
 		}
 
-		[Obsolete("Please use the other overload (for performance)")]
-		public VisualBounds TransformFlatten(float4x4 matrix)
-		{
-			return TransformFlatten(FastMatrix.FromFloat4x4(matrix));
-		}
-
 		//OPT: This version could be optimized since it doesn't care about the Z results.
 		public VisualBounds TransformFlatten(FastMatrix fastMatrix)
 		{
@@ -263,12 +251,6 @@ namespace Fuse
 			return "" + _box.Minimum + " " + _box.Maximum;
 		}
 
-		[Obsolete("Please use the other overload (for performance)")]
-		public static Box BoxTransform(Box box, float4x4 transform)
-		{
-			return BoxTransform(box, FastMatrix.FromFloat4x4(transform));
-		}
-
 		static float Min8(float a, float b, float c, float d, float e, float f, float g, float h)
 		{
 			float min = a;
diff --git a/Source/Fuse.Scripting.JavaScript/Duktape/Function.uno b/Source/Fuse.Scripting.JavaScript/Duktape/Function.uno
@@ -50,11 +50,6 @@ namespace Fuse.Scripting.Duktape
 			return (Object)returnValue;
 		}
 
-		public override Fuse.Scripting.Object Construct(params object[] args)
-		{
-			return Construct(_ctx, args);
-		}
-
 		public override object Call(Scripting.Context context, params object[] args)
 		{
 			if (context != _ctx)
@@ -74,10 +69,5 @@ namespace Fuse.Scripting.Duktape
 			_ctx.DukContext.pop();
 			return returnValue;
 		}
-
-		public override object Call(params object[] args)
-		{
-			return Call(_ctx, args);
-		}
 	}
 }
diff --git a/Source/Fuse.Scripting.JavaScript/Duktape/Object.uno b/Source/Fuse.Scripting.JavaScript/Duktape/Object.uno
@@ -47,11 +47,6 @@ namespace Fuse.Scripting.Duktape
 			return result;
 		}
 
-		public override bool InstanceOf(Fuse.Scripting.Function type)
-		{
-			return InstanceOf(_ctx, type);
-		}
-
 		public override object this[string key]
 		{
 			get
@@ -120,11 +115,6 @@ namespace Fuse.Scripting.Duktape
 			return returnVal;
 		}
 
-		public override object CallMethod(string name, params object[] args)
-		{
-			return CallMethod(_ctx, name, args);
-		}
-
 		public override bool ContainsKey(string key)
 		{
 			if (key == null) throw new ArgumentNullException(nameof(key));
@@ -133,6 +123,5 @@ namespace Fuse.Scripting.Duktape
 			_ctx.DukContext.pop();
 			return result;
 		}
-
 	}
 }
diff --git a/Source/Fuse.Scripting.JavaScript/JavaScriptCore/Function.uno b/Source/Fuse.Scripting.JavaScript/JavaScriptCore/Function.uno
@@ -40,11 +40,6 @@ namespace Fuse.Scripting.JavaScriptCore
 			return result;
 		}
 
-		public override object Call(params object[] args)
-		{
-			return Call(_context, args);
-		}
-
 		public override Scripting.Object Construct(Scripting.Context context, params object[] args)
 		{
 			// Ensure this function is being called from the context/vm it belongs to
@@ -62,11 +57,6 @@ namespace Fuse.Scripting.JavaScriptCore
 			return result;
 		}
 
-		public override Scripting.Object Construct(params object[] args)
-		{
-			return Construct(_context, args);
-		}
-
 		public override bool Equals(Scripting.Function f)
 		{
 			return f is Function && _value.Equals(((Function)f)._value);
diff --git a/Source/Fuse.Scripting.JavaScript/JavaScriptCore/Object.uno b/Source/Fuse.Scripting.JavaScript/JavaScriptCore/Object.uno
@@ -77,11 +77,6 @@ namespace Fuse.Scripting.JavaScriptCore
 					_context._onError);
 		}
 
-		public override bool InstanceOf(Scripting.Function type)
-		{
-			return InstanceOf(_context, type);
-		}
-
 		public override object CallMethod(Scripting.Context context, string name, params object[] args)
 		{
 			if (context != _context)
@@ -108,11 +103,6 @@ namespace Fuse.Scripting.JavaScriptCore
 			return result;
 		}
 
-		public override object CallMethod(string name, params object[] args)
-		{
-			return CallMethod(_context, name, args);
-		}
-
 		public override bool ContainsKey(string key)
 		{
 			bool result = false;
diff --git a/Source/Fuse.Scripting.JavaScript/V8/Function.uno b/Source/Fuse.Scripting.JavaScript/V8/Function.uno
@@ -54,11 +54,6 @@ namespace Fuse.Scripting.V8
 			return result;
 		}
 
-		public override object Call(params object[] args)
-		{
-			return Call(_context, args);
-		}
-
 		public override Scripting.Object Construct(Scripting.Context context, params object[] args)
 		{
 			if (context != _context)
@@ -81,11 +76,6 @@ namespace Fuse.Scripting.V8
 			return result;
 		}
 
-		public override Scripting.Object Construct(params object[] args)
-		{
-			return Construct(_context, args);
-		}
-
 		public override bool Equals(Scripting.Function f)
 		{
 			var that = f as Function;
diff --git a/Source/Fuse.Scripting.JavaScript/V8/Object.uno b/Source/Fuse.Scripting.JavaScript/V8/Object.uno
@@ -88,11 +88,6 @@ namespace Fuse.Scripting.V8
 			return (bool)_context._instanceOf.Call(_context, this, type);
 		}
 
-		public override bool InstanceOf(Scripting.Function type)
-		{
-			return InstanceOf(_context, type);
-		}
-
 		public override object CallMethod(Scripting.Context context, string name, params object[] args)
 		{
 			if (context != _context)
@@ -114,11 +109,6 @@ namespace Fuse.Scripting.V8
 			return result;
 		}
 
-		public override object CallMethod(string name, params object[] args)
-		{
-			return CallMethod(_context, name, args);
-		}
-
 		public override bool ContainsKey(string key)
 		{
 			var cxt = _context._context;
diff --git a/Source/Fuse.Scripting/Context.uno b/Source/Fuse.Scripting/Context.uno
@@ -9,10 +9,7 @@ namespace Fuse.Scripting
 {
 	public interface IThreadWorker
 	{
-		void Invoke(Uno.Action<Scripting.Context> action);
-
-		[Obsolete("Use Invoke(Action<Context>) instead")]
-		void Invoke(Uno.Action action);
+		void Invoke(Action<Scripting.Context> action);
 	}
 
 	internal interface IFunctionMirror
@@ -57,13 +54,7 @@ namespace Fuse.Scripting
 		public abstract object Unwrap(object obj);
 		public abstract object Reflect(object obj);
 
-		public void Invoke(Uno.Action<Scripting.Context> action)
-		{
-			ThreadWorker.Invoke(action);
-		}
-
-		[Obsolete("Use Invoke(Action<Context>) instead")]
-		public void Invoke(Uno.Action action)
+		public void Invoke(Action<Scripting.Context> action)
 		{
 			ThreadWorker.Invoke(action);
 		}
diff --git a/Source/Fuse.Scripting/ModuleResult.uno b/Source/Fuse.Scripting/ModuleResult.uno
@@ -14,17 +14,12 @@ namespace Fuse.Scripting
 		public readonly Module Module;
 
 		readonly Scripting.Object _object;
-		[Obsolete("Use GetObject(Context) instead")]
-		public Scripting.Object Object { get { return _object; } }
 
 		public Scripting.Object GetObject(Context c)
 		{
 			return _object;
 		}
 
-		[Obsolete("Use GetExports(Context)")]
-		public object Exports { get { return _object["exports"]; } }
-
 		public object GetExports(Context c) { return _object["exports"]; }
 
 		public ScriptException Error { get; internal set; }
diff --git a/Source/Fuse.Scripting/NativeEvent.uno b/Source/Fuse.Scripting/NativeEvent.uno
@@ -50,15 +50,6 @@ namespace Fuse.Scripting
 				threadWorker.Invoke(new CallDiscardingResultClosure(_jsFunction, _eventArgsQueue.Dequeue()).Run);
 		}
 
-		[Obsolete("Use `RaiseAsync(IThreadWorker, params object[])` instead")]
-		public void RaiseAsync(params object[] args)
-		{
-			if(Context != null || _queueEventsBeforeEvaluation)
-				_eventArgsQueue.Enqueue(args);
-
-			DispatchQueue(Context != null ? Context.ThreadWorker : null);
-		}
-
 		public void RaiseAsync(IThreadWorker threadWorker, params object[] args)
 		{
 			if (ThreadWorker != null || _queueEventsBeforeEvaluation)
diff --git a/Source/Fuse.Scripting/Types.uno b/Source/Fuse.Scripting/Types.uno
@@ -36,12 +36,8 @@ namespace Fuse.Scripting
 		public abstract string[] Keys { get; }
 
 		public abstract bool InstanceOf(Context context, Function type);
-		[Obsolete("use InstanceOf(Context, Function) instead")]
-		public abstract bool InstanceOf(Function type);
 
 		public abstract object CallMethod(Context context, string name, params object[] args);
-		[Obsolete("use CallMethod(Context, Function) instead")]
-		public abstract object CallMethod(string name, params object[] args);
 
 		public abstract bool ContainsKey(string key);
 		public abstract bool Equals(Object o);
@@ -66,17 +62,12 @@ namespace Fuse.Scripting
 	{
 		public abstract object Call(Context context, params object[] args);
 
-		[Obsolete("use Call(Context, params object[]) instead")]
-		public abstract object Call(params object[] args);
-
 		internal void CallDiscardingResult(Context context, params object[] args)
 		{
 			Call(context, args);
 		}
 
 		public abstract Scripting.Object Construct(Context context, params object[] args);
-		[Obsolete("use Construct(Context, params object[]) instead")]
-		public abstract Scripting.Object Construct(params object[] args);
 
 		public abstract bool Equals(Function f);
 

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,6 @@ namespace Fuse`
`47`	`47`	`Bold,`
`48`	`48`	`Heavy,`
`49`	`49`	`Black,`
`50`		`-`
`51`		`- [Obsolete]`
`52`		`- SemiBold = Semibold`
`53`	`50`	`}`
`54`	`51`
`55`	`52`	`public enum Style`
Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ namespace Fuse.Controls`
`284`	`284`	`{`
`285`	`285`	`get { return ActualPixelSize; }`
`286`	`286`	`}`
	`287`	`+`
`287`	`288`	`public float2 ActualPixelSize`
`288`	`289`	`{`
`289`	`290`	`get { return ActualSize * PixelsPerPoint; }`
Original file line number	Diff line number	Diff line change
`@@ -149,12 +149,6 @@ namespace Fuse`
`149`	`149`	`return Box(add);`
`150`	`150`	`}`
`151`	`151`
`152`		`- [Obsolete("Please use the other overload (for performance)")]`
`153`		`- public VisualBounds Transform(float4x4 matrix)`
`154`		`- {`
`155`		`- return Transform(FastMatrix.FromFloat4x4(matrix));`
`156`		`- }`
`157`		`-`
`158`	`152`	`public VisualBounds Transform(FastMatrix fastMatrix)`
`159`	`153`	`{`
`160`	`154`	`if (IsInfinite \|\| IsEmpty)`
`@@ -164,12 +158,6 @@ namespace Fuse`
`164`	`158`	`return Box(n);`
`165`	`159`	`}`
`166`	`160`
`167`		`- [Obsolete("Please use the other overload (for performance)")]`
`168`		`- public VisualBounds TransformFlatten(float4x4 matrix)`
`169`		`- {`
`170`		`- return TransformFlatten(FastMatrix.FromFloat4x4(matrix));`
`171`		`- }`
`172`		`-`
`173`	`161`	`//OPT: This version could be optimized since it doesn't care about the Z results.`
`174`	`162`	`public VisualBounds TransformFlatten(FastMatrix fastMatrix)`
`175`	`163`	`{`
`@@ -263,12 +251,6 @@ namespace Fuse`
`263`	`251`	`return "" + _box.Minimum + " " + _box.Maximum;`
`264`	`252`	`}`
`265`	`253`
`266`		`- [Obsolete("Please use the other overload (for performance)")]`
`267`		`- public static Box BoxTransform(Box box, float4x4 transform)`
`268`		`- {`
`269`		`- return BoxTransform(box, FastMatrix.FromFloat4x4(transform));`
`270`		`- }`
`271`		`-`
`272`	`254`	`static float Min8(float a, float b, float c, float d, float e, float f, float g, float h)`
`273`	`255`	`{`
`274`	`256`	`float min = a;`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,6 @@ namespace Fuse.Scripting.Duktape`
`50`	`50`	`return (Object)returnValue;`
`51`	`51`	`}`
`52`	`52`
`53`		`- public override Fuse.Scripting.Object Construct(params object[] args)`
`54`		`- {`
`55`		`- return Construct(_ctx, args);`
`56`		`- }`
`57`		`-`
`58`	`53`	`public override object Call(Scripting.Context context, params object[] args)`
`59`	`54`	`{`
`60`	`55`	`if (context != _ctx)`
`@@ -74,10 +69,5 @@ namespace Fuse.Scripting.Duktape`
`74`	`69`	`_ctx.DukContext.pop();`
`75`	`70`	`return returnValue;`
`76`	`71`	`}`
`77`		`-`
`78`		`- public override object Call(params object[] args)`
`79`		`- {`
`80`		`- return Call(_ctx, args);`
`81`		`- }`
`82`	`72`	`}`
`83`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,6 @@ namespace Fuse.Scripting.Duktape`
`47`	`47`	`return result;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public override bool InstanceOf(Fuse.Scripting.Function type)`
`51`		`- {`
`52`		`- return InstanceOf(_ctx, type);`
`53`		`- }`
`54`		`-`
`55`	`50`	`public override object this[string key]`
`56`	`51`	`{`
`57`	`52`	`get`
`@@ -120,11 +115,6 @@ namespace Fuse.Scripting.Duktape`
`120`	`115`	`return returnVal;`
`121`	`116`	`}`
`122`	`117`
`123`		`- public override object CallMethod(string name, params object[] args)`
`124`		`- {`
`125`		`- return CallMethod(_ctx, name, args);`
`126`		`- }`
`127`		`-`
`128`	`118`	`public override bool ContainsKey(string key)`
`129`	`119`	`{`
`130`	`120`	`if (key == null) throw new ArgumentNullException(nameof(key));`
`@@ -133,6 +123,5 @@ namespace Fuse.Scripting.Duktape`
`133`	`123`	`_ctx.DukContext.pop();`
`134`	`124`	`return result;`
`135`	`125`	`}`
`136`		`-`
`137`	`126`	`}`
`138`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,6 @@ namespace Fuse.Scripting.JavaScriptCore`
`40`	`40`	`return result;`
`41`	`41`	`}`
`42`	`42`
`43`		`- public override object Call(params object[] args)`
`44`		`- {`
`45`		`- return Call(_context, args);`
`46`		`- }`
`47`		`-`
`48`	`43`	`public override Scripting.Object Construct(Scripting.Context context, params object[] args)`
`49`	`44`	`{`
`50`	`45`	`// Ensure this function is being called from the context/vm it belongs to`
`@@ -62,11 +57,6 @@ namespace Fuse.Scripting.JavaScriptCore`
`62`	`57`	`return result;`
`63`	`58`	`}`
`64`	`59`
`65`		`- public override Scripting.Object Construct(params object[] args)`
`66`		`- {`
`67`		`- return Construct(_context, args);`
`68`		`- }`
`69`		`-`
`70`	`60`	`public override bool Equals(Scripting.Function f)`
`71`	`61`	`{`
`72`	`62`	`return f is Function && _value.Equals(((Function)f)._value);`
Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,6 @@ namespace Fuse.Scripting.JavaScriptCore`
`77`	`77`	`_context._onError);`
`78`	`78`	`}`
`79`	`79`
`80`		`- public override bool InstanceOf(Scripting.Function type)`
`81`		`- {`
`82`		`- return InstanceOf(_context, type);`
`83`		`- }`
`84`		`-`
`85`	`80`	`public override object CallMethod(Scripting.Context context, string name, params object[] args)`
`86`	`81`	`{`
`87`	`82`	`if (context != _context)`
`@@ -108,11 +103,6 @@ namespace Fuse.Scripting.JavaScriptCore`
`108`	`103`	`return result;`
`109`	`104`	`}`
`110`	`105`
`111`		`- public override object CallMethod(string name, params object[] args)`
`112`		`- {`
`113`		`- return CallMethod(_context, name, args);`
`114`		`- }`
`115`		`-`
`116`	`106`	`public override bool ContainsKey(string key)`
`117`	`107`	`{`
`118`	`108`	`bool result = false;`
Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,6 @@ namespace Fuse.Scripting.V8`
`54`	`54`	`return result;`
`55`	`55`	`}`
`56`	`56`
`57`		`- public override object Call(params object[] args)`
`58`		`- {`
`59`		`- return Call(_context, args);`
`60`		`- }`
`61`		`-`
`62`	`57`	`public override Scripting.Object Construct(Scripting.Context context, params object[] args)`
`63`	`58`	`{`
`64`	`59`	`if (context != _context)`
`@@ -81,11 +76,6 @@ namespace Fuse.Scripting.V8`
`81`	`76`	`return result;`
`82`	`77`	`}`
`83`	`78`
`84`		`- public override Scripting.Object Construct(params object[] args)`
`85`		`- {`
`86`		`- return Construct(_context, args);`
`87`		`- }`
`88`		`-`
`89`	`79`	`public override bool Equals(Scripting.Function f)`
`90`	`80`	`{`
`91`	`81`	`var that = f as Function;`
Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,6 @@ namespace Fuse.Scripting.V8`
`88`	`88`	`return (bool)_context._instanceOf.Call(_context, this, type);`
`89`	`89`	`}`
`90`	`90`
`91`		`- public override bool InstanceOf(Scripting.Function type)`
`92`		`- {`
`93`		`- return InstanceOf(_context, type);`
`94`		`- }`
`95`		`-`
`96`	`91`	`public override object CallMethod(Scripting.Context context, string name, params object[] args)`
`97`	`92`	`{`
`98`	`93`	`if (context != _context)`
`@@ -114,11 +109,6 @@ namespace Fuse.Scripting.V8`
`114`	`109`	`return result;`
`115`	`110`	`}`
`116`	`111`
`117`		`- public override object CallMethod(string name, params object[] args)`
`118`		`- {`
`119`		`- return CallMethod(_context, name, args);`
`120`		`- }`
`121`		`-`
`122`	`112`	`public override bool ContainsKey(string key)`
`123`	`113`	`{`
`124`	`114`	`var cxt = _context._context;`