From b65cb87e58f953d093969ad28972934dbf98ae52 Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Thu, 26 Jul 2018 12:01:49 +0200
Subject: [PATCH] Minor code cleanup

---
 .../Views/UserControls/CompositeKeyUserControl.xaml.cs   | 6 ++----
 .../Views/UserControls/HamburgerMenuUserControl.xaml.cs  | 9 ++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ModernKeePass/Views/UserControls/CompositeKeyUserControl.xaml.cs b/ModernKeePass/Views/UserControls/CompositeKeyUserControl.xaml.cs
index c7253aa..10b9f89 100644
--- a/ModernKeePass/Views/UserControls/CompositeKeyUserControl.xaml.cs
+++ b/ModernKeePass/Views/UserControls/CompositeKeyUserControl.xaml.cs
@@ -76,10 +76,8 @@ namespace ModernKeePass.Views.UserControls
             InitializeComponent();
         }
 
-        public event PasswordCheckingEventHandler ValidationChecking;
-        public delegate void PasswordCheckingEventHandler(object sender, EventArgs e);
-        public event PasswordCheckedEventHandler ValidationChecked;
-        public delegate void PasswordCheckedEventHandler(object sender, PasswordEventArgs e);
+        public event EventHandler ValidationChecking;
+        public event EventHandler<PasswordEventArgs> ValidationChecked;
 
         private async void OpenButton_OnClick(object sender, RoutedEventArgs e)
         {
diff --git a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs
index 209416a..51acd3e 100644
--- a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs
+++ b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using ModernKeePass.Interfaces;
@@ -99,15 +100,13 @@ namespace ModernKeePass.Views.UserControls
                 typeof(HamburgerMenuUserControl),
                 new PropertyMetadata(null, (o, args) => { }));
 
-        public event SelectionChangedEventHandler SelectionChanged;
-        public delegate void SelectionChangedEventHandler(object sender, SelectionChangedEventArgs e);
+        public event EventHandler<SelectionChangedEventArgs> SelectionChanged;
         private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             SelectionChanged?.Invoke(sender, e);
         }
 
-        public event ButtonClickedEventHandler ButtonClicked;
-        public delegate void ButtonClickedEventHandler(object sender, RoutedEventArgs e);
+        public event EventHandler<RoutedEventArgs> ButtonClicked;
         private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
         {
             ButtonClicked?.Invoke(sender, e);