Browse Source

Fixed unused member warnings.

That only show up on mono: seems the standard C# compiler silently
ignores most of these.
pull/734/head
Steven Kirk 10 years ago
parent
commit
1b32a6aac3
  1. 2
      src/Avalonia.Base/AvaloniaObject.cs
  2. 5
      src/Avalonia.Base/AvaloniaPropertyRegistry.cs
  3. 1
      src/Avalonia.Base/Collections/AvaloniaDictionary.cs
  4. 2
      src/Avalonia.Base/Collections/AvaloniaList.cs
  5. 1
      src/Avalonia.Controls/Classes.cs
  6. 4
      src/Avalonia.Controls/HotkeyManager.cs
  7. 2
      src/Avalonia.Controls/Platform/PlatformManager.cs
  8. 5
      src/Avalonia.Controls/Presenters/CarouselPresenter.cs
  9. 2
      src/Avalonia.Controls/Presenters/ItemVirtualizer.cs
  10. 1
      src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
  11. 2
      src/Avalonia.Controls/ScrollViewer.cs
  12. 2
      src/Avalonia.Controls/TextBox.cs
  13. 1
      src/Avalonia.Controls/TopLevel.cs
  14. 3
      src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs
  15. 1
      src/Avalonia.Input/Navigation/DirectionalNavigation.cs
  16. 8
      src/Avalonia.SceneGraph/Media/PathMarkupParser.cs
  17. 2
      src/Avalonia.SceneGraph/Media/StreamGeometry.cs
  18. 1
      src/Avalonia.Styling/Styling/Style.cs
  19. 2
      src/Shared/PlatformSupport/AssetLoader.cs
  20. 1
      tests/Avalonia.SceneGraph.UnitTests/Media/PathMarkupParserTests.cs

2
src/Avalonia.Base/AvaloniaObject.cs

@ -164,9 +164,7 @@ namespace Avalonia
set
{
var metadata = binding.Property.GetMetadata(GetType());
var sourceBinding = value as IBinding;
this.Bind(binding.Property, sourceBinding);
}
}

5
src/Avalonia.Base/AvaloniaPropertyRegistry.cs

@ -64,8 +64,6 @@ namespace Avalonia
{
Contract.Requires<ArgumentNullException>(type != null);
var i = type.GetTypeInfo();
while (type != null)
{
// Ensure the type's static ctor has been run.
@ -265,7 +263,8 @@ namespace Avalonia
/// <param name="property">The property.</param>
/// <remarks>
/// You won't usually want to call this method directly, instead use the
/// <see cref="AvaloniaProperty.Register"/> method.
/// <see cref="AvaloniaProperty.Register{TOwner, TValue}(string, TValue, bool, Data.BindingMode, Func{TOwner, TValue, TValue}, Action{IAvaloniaObject, bool})"/>
/// method.
/// </remarks>
public void Register(Type type, AvaloniaProperty property)
{

1
src/Avalonia.Base/Collections/AvaloniaDictionary.cs

@ -207,7 +207,6 @@ namespace Avalonia.Collections
if (CollectionChanged != null)
{
var val = new KeyValuePair<TKey, TValue>(key, value);
var e = new NotifyCollectionChangedEventArgs(
NotifyCollectionChangedAction.Add,
new[] { new KeyValuePair<TKey, TValue>(key, value) },

2
src/Avalonia.Base/Collections/AvaloniaList.cs

@ -397,8 +397,6 @@ namespace Avalonia.Collections
{
Contract.Requires<ArgumentNullException>(items != null);
var list = (items as IList) ?? items.ToList();
foreach (var i in items)
{
// TODO: Optimize to only send as many notifications as necessary.

1
src/Avalonia.Controls/Classes.cs

@ -197,7 +197,6 @@ namespace Avalonia.Controls
/// <param name="count">The number of items to remove.</param>
public override void RemoveRange(int index, int count)
{
var names = GetRange(index, count);
base.RemoveRange(index, count);
}

4
src/Avalonia.Controls/HotkeyManager.cs

@ -30,9 +30,9 @@ namespace Avalonia.Controls
public void Execute(object parameter) => GetCommand()?.Execute(parameter);
#pragma warning disable CS0067 // Event not used
#pragma warning disable 67 // Event not used
public event EventHandler CanExecuteChanged;
#pragma warning restore CS0067
#pragma warning restore 67
}

2
src/Avalonia.Controls/Platform/PlatformManager.cs

@ -11,7 +11,6 @@ namespace Avalonia.Controls.Platform
=> AvaloniaLocator.Current.GetService<IPlatformSettings>();
static bool s_designerMode;
private static double _designerScalingFactor = 1;
public static IRenderTarget CreateRenderTarget(ITopLevelImpl window)
{
@ -28,7 +27,6 @@ namespace Avalonia.Controls.Platform
public static void SetDesignerScalingFactor(double factor)
{
_designerScalingFactor = factor;
}
public static IWindowImpl CreateWindow()

5
src/Avalonia.Controls/Presenters/CarouselPresenter.cs

@ -97,7 +97,9 @@ namespace Avalonia.Controls.Presenters
/// <inheritdoc/>
protected override void PanelCreated(IPanel panel)
{
var task = MoveToPage(-1, SelectedIndex);
#pragma warning disable 4014
MoveToPage(-1, SelectedIndex);
#pragma warning restore 4014
}
/// <inheritdoc/>
@ -139,7 +141,6 @@ namespace Avalonia.Controls.Presenters
if (toIndex != -1)
{
var item = Items.Cast<object>().ElementAt(toIndex);
to = GetOrCreateContainer(toIndex);
}

2
src/Avalonia.Controls/Presenters/ItemVirtualizer.cs

@ -16,8 +16,6 @@ namespace Avalonia.Controls.Presenters
/// </summary>
internal abstract class ItemVirtualizer : IVirtualizingController, IDisposable
{
private bool disposedValue;
/// <summary>
/// Initializes a new instance of the <see cref="ItemVirtualizer"/> class.
/// </summary>

1
src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs

@ -359,7 +359,6 @@ namespace Avalonia.Controls.Presenters
var count = Math.Min(Math.Abs(delta), panel.Children.Count);
var move = count < panel.Children.Count;
var first = delta < 0 && move ? panel.Children.Count + delta : 0;
var containers = panel.Children.GetRange(first, count).ToList();
for (var i = 0; i < count; ++i)
{

2
src/Avalonia.Controls/ScrollViewer.cs

@ -157,7 +157,7 @@ namespace Avalonia.Controls
/// </summary>
public ScrollViewer()
{
var extentAndViewport = Observable.CombineLatest(
Observable.CombineLatest(
this.GetObservable(ExtentProperty),
this.GetObservable(ViewportProperty))
.Select(x => new { Extent = x[0], Viewport = x[1] });

2
src/Avalonia.Controls/TextBox.cs

@ -105,7 +105,7 @@ namespace Avalonia.Controls
public TextBox()
{
var canScrollHorizontally = this.GetObservable(TextWrappingProperty)
this.GetObservable(TextWrappingProperty)
.Select(x => x == TextWrapping.NoWrap)
.Subscribe(x => CanScrollHorizontally = x);

1
src/Avalonia.Controls/TopLevel.cs

@ -88,7 +88,6 @@ namespace Avalonia.Controls
PlatformImpl = impl;
dependencyResolver = dependencyResolver ?? AvaloniaLocator.Current;
var renderInterface = TryGetService<IPlatformRenderInterface>(dependencyResolver);
var styler = TryGetService<IStyler>(dependencyResolver);
_accessKeyHandler = TryGetService<IAccessKeyHandler>(dependencyResolver);
_inputManager = TryGetService<IInputManager>(dependencyResolver);

3
src/Avalonia.Diagnostics/ViewModels/DevToolsViewModel.cs

@ -11,8 +11,6 @@ namespace Avalonia.Diagnostics.ViewModels
{
internal class DevToolsViewModel : ReactiveObject
{
private IControl _root;
private ReactiveObject _content;
private int _selectedTab;
@ -27,7 +25,6 @@ namespace Avalonia.Diagnostics.ViewModels
public DevToolsViewModel(IControl root)
{
_root = root;
_logicalTree = new TreePageViewModel(LogicalTreeNode.Create(root));
_visualTree = new TreePageViewModel(VisualTreeNode.Create(root));

1
src/Avalonia.Input/Navigation/DirectionalNavigation.cs

@ -90,7 +90,6 @@ namespace Avalonia.Input.Navigation
/// <returns>The element's focusable descendents.</returns>
private static IEnumerable<IInputElement> GetFocusableDescendents(IInputElement element)
{
var mode = KeyboardNavigation.GetDirectionalNavigation((InputElement)element);
var children = element.GetVisualChildren().OfType<IInputElement>();
foreach (var child in children)

8
src/Avalonia.SceneGraph/Media/PathMarkupParser.cs

@ -32,18 +32,14 @@ namespace Avalonia.Media
{'1', FillRule.NonZero }
};
private StreamGeometry _geometry;
private readonly StreamGeometryContext _context;
/// <summary>
/// Initializes a new instance of the <see cref="PathMarkupParser"/> class.
/// </summary>
/// <param name="geometry">The geometry in which the path should be stored.</param>
/// <param name="context">The context for <paramref name="geometry"/>.</param>
public PathMarkupParser(StreamGeometry geometry, StreamGeometryContext context)
/// <param name="context">The context for the geometry.</param>
public PathMarkupParser(StreamGeometryContext context)
{
_geometry = geometry;
_context = context;
}

2
src/Avalonia.SceneGraph/Media/StreamGeometry.cs

@ -39,7 +39,7 @@ namespace Avalonia.Media
using (StreamGeometryContext ctx = result.Open())
{
PathMarkupParser parser = new PathMarkupParser(result, ctx);
PathMarkupParser parser = new PathMarkupParser(ctx);
parser.Parse(s);
return result;
}

1
src/Avalonia.Styling/Styling/Style.cs

@ -82,7 +82,6 @@ namespace Avalonia.Styling
{
if (Selector != null)
{
var description = "Style " + Selector.ToString();
var match = Selector.Match(control);
if (match.ImmediateResult != false)

2
src/Shared/PlatformSupport/AssetLoader.cs

@ -83,8 +83,6 @@ namespace Avalonia.Shared.PlatformSupport
{
if (!uri.IsAbsoluteUri || uri.Scheme == "resm")
{
var uriQueryParams = ParseQueryString(uri);
var baseUriQueryParams = uri != null ? ParseQueryString(uri) : null;
var asm = GetAssembly(uri) ?? GetAssembly(baseUri) ?? _defaultAssembly;
if (asm == null && _defaultAssembly == null)

1
tests/Avalonia.SceneGraph.UnitTests/Media/PathMarkupParserTests.cs

@ -92,7 +92,6 @@ namespace Avalonia.SceneGraph.UnitTests.Media
.ToConstant(Mock.Of<IPlatformRenderInterface>());
return new PathMarkupParser(
new StreamGeometry(),
new StreamGeometryContext(implMock != null ? implMock.Object : Mock.Of<IStreamGeometryContextImpl>()));
}
}

Loading…
Cancel
Save