From 8b035ffb2b90edb447bdb584d9da754b714ce659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Wed, 31 Aug 2016 15:34:29 +0200 Subject: [PATCH] Renamed typeparam to fix build --- src/Avalonia.Controls/AppBuilder.cs | 39 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/Avalonia.Controls/AppBuilder.cs b/src/Avalonia.Controls/AppBuilder.cs index 82698acde7..5afbb444ee 100644 --- a/src/Avalonia.Controls/AppBuilder.cs +++ b/src/Avalonia.Controls/AppBuilder.cs @@ -10,7 +10,8 @@ namespace Avalonia.Controls /// /// Initializes up platform-specific services for an . /// - public abstract class AppBuilderBase where AppBuilder : AppBuilderBase, new() + /// + public abstract class AppBuilderBase where TAppBuilder : AppBuilderBase, new() { /// /// Gets or sets the instance. @@ -41,7 +42,7 @@ namespace Avalonia.Controls /// Gets or sets a method to call before is called on the /// . /// - public Action BeforeStartCallback { get; set; } + public Action BeforeStartCallback { get; set; } protected AppBuilderBase(IRuntimePlatform platform, Action platformSevices) { @@ -53,8 +54,8 @@ namespace Avalonia.Controls /// Begin configuring an . /// /// The subclass of to configure. - /// An instance. - public static AppBuilder Configure() + /// An instance. + public static TAppBuilder Configure() where TApp : Application, new() { return Configure(new TApp()); @@ -63,26 +64,26 @@ namespace Avalonia.Controls /// /// Begin configuring an . /// - /// An instance. - public static AppBuilder Configure(Application app) + /// An instance. + public static TAppBuilder Configure(Application app) { AvaloniaLocator.CurrentMutable.BindToSelf(app); - return new AppBuilder() + return new TAppBuilder() { Instance = app, }; } - protected AppBuilder Self => (AppBuilder) this; + protected TAppBuilder Self => (TAppBuilder) this; /// /// Registers a callback to call before is called on the /// . /// /// The callback. - /// An instance. - public AppBuilder BeforeStarting(Action callback) + /// An instance. + public TAppBuilder BeforeStarting(Action callback) { BeforeStartCallback = callback; return Self; @@ -107,7 +108,7 @@ namespace Avalonia.Controls /// Sets up the platform-specific services for the application, but does not run it. /// /// - public AppBuilder SetupWithoutStarting() + public TAppBuilder SetupWithoutStarting() { Setup(); return Self; @@ -117,8 +118,8 @@ namespace Avalonia.Controls /// Specifies a windowing subsystem to use. /// /// The method to call to initialize the windowing subsystem. - /// An instance. - public AppBuilder UseWindowingSubsystem(Action initializer) + /// An instance. + public TAppBuilder UseWindowingSubsystem(Action initializer) { WindowingSubsystem = initializer; return Self; @@ -128,15 +129,15 @@ namespace Avalonia.Controls /// Specifies a windowing subsystem to use. /// /// The dll in which to look for subsystem. - /// An instance. - public AppBuilder UseWindowingSubsystem(string dll) => UseWindowingSubsystem(GetInitializer(dll)); + /// An instance. + public TAppBuilder UseWindowingSubsystem(string dll) => UseWindowingSubsystem(GetInitializer(dll)); /// /// Specifies a rendering subsystem to use. /// /// The method to call to initialize the rendering subsystem. - /// An instance. - public AppBuilder UseRenderingSubsystem(Action initializer) + /// An instance. + public TAppBuilder UseRenderingSubsystem(Action initializer) { RenderingSubsystem = initializer; return Self; @@ -146,8 +147,8 @@ namespace Avalonia.Controls /// Specifies a rendering subsystem to use. /// /// The dll in which to look for subsystem. - /// An instance. - public AppBuilder UseRenderingSubsystem(string dll) => UseRenderingSubsystem(GetInitializer(dll)); + /// An instance. + public TAppBuilder UseRenderingSubsystem(string dll) => UseRenderingSubsystem(GetInitializer(dll)); static Action GetInitializer(string assemblyName) => () => {