Replacing EventHandler with generics EventHandler

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@210 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/BreakPointsPad.cs

@@ -75,11 +75,11 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
 			debuggerCore = debugger.DebuggerCore;
 
-			debuggerCore.DebuggingResumed += new DebuggerEventHandler(debuggerService_OnDebuggingResumed);
+			debuggerCore.DebuggingResumed += new EventHandler<DebuggerEventArgs>(debuggerService_OnDebuggingResumed);
-			debuggerCore.BreakpointAdded += new DebuggerLibrary.BreakpointEventHandler(AddBreakpoint);
+			debuggerCore.BreakpointAdded += new EventHandler<BreakpointEventArgs>(AddBreakpoint);
-			debuggerCore.BreakpointStateChanged += new DebuggerLibrary.BreakpointEventHandler(RefreshBreakpoint);
+			debuggerCore.BreakpointStateChanged += new EventHandler<BreakpointEventArgs>(RefreshBreakpoint);
-			debuggerCore.BreakpointRemoved += new DebuggerLibrary.BreakpointEventHandler(RemoveBreakpoint);
+			debuggerCore.BreakpointRemoved += new EventHandler<BreakpointEventArgs>(RemoveBreakpoint);
-			debuggerCore.BreakpointHit += new DebuggerLibrary.BreakpointEventHandler(Breakpoints_OnBreakpointHit);
+			debuggerCore.BreakpointHit += new EventHandler<BreakpointEventArgs>(Breakpoints_OnBreakpointHit);
 
 			RefreshList();
 		}

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs

@@ -73,8 +73,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
 			debuggerCore = debugger.DebuggerCore;
 
-			debuggerCore.IsDebuggingChanged += new DebuggerEventHandler(DebuggerStateChanged);
+			debuggerCore.IsDebuggingChanged += new EventHandler<DebuggerEventArgs>(DebuggerStateChanged);
-			debuggerCore.IsProcessRunningChanged += new DebuggerEventHandler(DebuggerStateChanged);
+			debuggerCore.IsProcessRunningChanged += new EventHandler<DebuggerEventArgs>(DebuggerStateChanged);
 
 			RefreshList();
 		}

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs

@@ -75,8 +75,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
 			debuggerCore = debugger.DebuggerCore;
 
-			debuggerCore.IsDebuggingChanged += new DebuggerEventHandler(DebuggerStateChanged);
+			debuggerCore.IsDebuggingChanged += new EventHandler<DebuggerEventArgs>(DebuggerStateChanged);
-			debuggerCore.IsProcessRunningChanged += new DebuggerEventHandler(DebuggerStateChanged);
+			debuggerCore.IsProcessRunningChanged += new EventHandler<DebuggerEventArgs>(DebuggerStateChanged);
 
 			RefreshList();
 		}

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs

@@ -84,8 +84,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
 			debuggerCore = debugger.DebuggerCore;
 
-			debuggerCore.ModuleLoaded += new DebuggerLibrary.ModuleEventHandler(AddModule);
+			debuggerCore.ModuleLoaded += new EventHandler<ModuleEventArgs>(AddModule);
-			debuggerCore.ModuleUnloaded += new DebuggerLibrary.ModuleEventHandler(RemoveModule);
+			debuggerCore.ModuleUnloaded += new EventHandler<ModuleEventArgs>(RemoveModule);
 
 			RefreshList();
 		}

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs

@@ -82,7 +82,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
 			debuggerCore = debugger.DebuggerCore;
 
-			debuggerCore.DebuggingPaused += new DebuggingPausedEventHandler(debuggerService_OnDebuggingPaused);
+			debuggerCore.DebuggingPaused += new EventHandler<DebuggingPausedEventArgs>(debuggerService_OnDebuggingPaused);
 
 			RefreshList();
 		}
@@ -152,7 +152,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
  				RefreshVariable(var);
  				
  				if (var is PropertyVariable) {
- 					((PropertyVariable)var).ValueEvaluated += new DebuggerEventHandler(PropertyEvaluated);
+ 					((PropertyVariable)var).ValueEvaluated += new EventHandler<DebuggerEventArgs>(PropertyEvaluated);
  				}
 			}           
 		}

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs

@@ -79,10 +79,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
 			debuggerCore = debugger.DebuggerCore;
 
-			debuggerCore.ThreadStarted += new ThreadEventHandler(AddThread);
+			debuggerCore.ThreadStarted += new EventHandler<ThreadEventArgs>(AddThread);
-			debuggerCore.ThreadStateChanged += new ThreadEventHandler(RefreshThread);
+			debuggerCore.ThreadStateChanged += new EventHandler<ThreadEventArgs>(RefreshThread);
-			debuggerCore.ThreadExited += new ThreadEventHandler(RemoveThread);
+			debuggerCore.ThreadExited += new EventHandler<ThreadEventArgs>(RemoveThread);
-			debuggerCore.IsProcessRunningChanged += new DebuggerEventHandler(DebuggerStateChanged);
+			debuggerCore.IsProcessRunningChanged += new EventHandler<DebuggerEventArgs>(DebuggerStateChanged);
 
 			RefreshList();
 		}

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs

@@ -170,15 +170,15 @@ namespace ICSharpCode.SharpDevelop.Services
 
 			debugger = new NDebugger();
 
-			debugger.DebuggerTraceMessage    += new MessageEventHandler(DebuggerTraceMessage);
+			debugger.DebuggerTraceMessage    += new EventHandler<MessageEventArgs>(DebuggerTraceMessage);
-			debugger.LogMessage              += new MessageEventHandler(LogMessage);
+			debugger.LogMessage              += new EventHandler<MessageEventArgs>(LogMessage);
-			debugger.ProcessStarted          += new ProcessEventHandler(ProcessStarted);
+			debugger.ProcessStarted          += new EventHandler<ProcessEventArgs>(ProcessStarted);
-			debugger.DebuggingPaused         += new DebuggingPausedEventHandler(DebuggingPaused);
+			debugger.DebuggingPaused         += new EventHandler<DebuggingPausedEventArgs>(DebuggingPaused);
-			debugger.DebuggingResumed        += new DebuggerEventHandler(DebuggingResumed);
+			debugger.DebuggingResumed        += new EventHandler<DebuggerEventArgs>(DebuggingResumed);
-			debugger.ProcessExited           += new ProcessEventHandler(ProcessExited);
+			debugger.ProcessExited           += new EventHandler<ProcessEventArgs>(ProcessExited);
-			debugger.IsDebuggingChanged      += new DebuggerEventHandler(OnIsDebuggingChanged);
+			debugger.IsDebuggingChanged      += new EventHandler<DebuggerEventArgs>(OnIsDebuggingChanged);
-			debugger.IsProcessRunningChanged += new DebuggerEventHandler(DebuggerStateChanged);
+			debugger.IsProcessRunningChanged += new EventHandler<DebuggerEventArgs>(DebuggerStateChanged);
-			debugger.BreakpointStateChanged  += new DebuggerLibrary.BreakpointEventHandler(RestoreSharpdevelopBreakpoint);
+			debugger.BreakpointStateChanged  += new EventHandler<BreakpointEventArgs>(RestoreSharpdevelopBreakpoint);
 
 			DebuggerService.BreakPointAdded   += new EventHandler(RestoreNDebuggerBreakpoints);
 			DebuggerService.BreakPointRemoved += new EventHandler(RestoreNDebuggerBreakpoints);
@@ -198,15 +198,15 @@ namespace ICSharpCode.SharpDevelop.Services
 
 		public void UnloadService()
 		{
-			debugger.DebuggerTraceMessage    -= new MessageEventHandler(DebuggerTraceMessage);
+			debugger.DebuggerTraceMessage    -= new EventHandler<MessageEventArgs>(DebuggerTraceMessage);
-			debugger.LogMessage              -= new MessageEventHandler(LogMessage);
+			debugger.LogMessage              -= new EventHandler<MessageEventArgs>(LogMessage);
-			debugger.ProcessStarted          -= new ProcessEventHandler(ProcessStarted);
+			debugger.ProcessStarted          -= new EventHandler<ProcessEventArgs>(ProcessStarted);
-			debugger.DebuggingPaused         -= new DebuggingPausedEventHandler(DebuggingPaused);
+			debugger.DebuggingPaused         -= new EventHandler<DebuggingPausedEventArgs>(DebuggingPaused);
-			debugger.DebuggingResumed        -= new DebuggerEventHandler(DebuggingResumed);
+			debugger.DebuggingResumed        -= new EventHandler<DebuggerEventArgs>(DebuggingResumed);
-			debugger.ProcessExited           -= new ProcessEventHandler(ProcessExited);
+			debugger.ProcessExited           -= new EventHandler<ProcessEventArgs>(ProcessExited);
-			debugger.IsDebuggingChanged      -= new DebuggerEventHandler(OnIsDebuggingChanged);
+			debugger.IsDebuggingChanged      -= new EventHandler<DebuggerEventArgs>(OnIsDebuggingChanged);
-			debugger.IsProcessRunningChanged -= new DebuggerEventHandler(DebuggerStateChanged);
+			debugger.IsProcessRunningChanged -= new EventHandler<DebuggerEventArgs>(DebuggerStateChanged);
-			debugger.BreakpointStateChanged  -= new DebuggerLibrary.BreakpointEventHandler(RestoreSharpdevelopBreakpoint);
+			debugger.BreakpointStateChanged  -= new EventHandler<BreakpointEventArgs>(RestoreSharpdevelopBreakpoint);
 
 			DebuggerService.BreakPointAdded   -= new EventHandler(RestoreNDebuggerBreakpoints);
 			DebuggerService.BreakPointRemoved -= new EventHandler(RestoreNDebuggerBreakpoints);

src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj

@@ -40,12 +40,12 @@
   <ItemGroup>
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="Src\Breakpoints\Breakpoint.cs" />
-    <Compile Include="Src\Breakpoints\BreakpointEventHandler.cs" />
+    <Compile Include="Src\Breakpoints\BreakpointEventArgs.cs" />
     <Compile Include="Src\Breakpoints\NDebugger-Breakpoints.cs" />
-    <Compile Include="Src\Debugger\DebuggerEvents\DebuggerEventHandler.cs" />
+    <Compile Include="Src\Debugger\DebuggerEvents\DebuggerEventArgs.cs" />
-    <Compile Include="Src\Debugger\DebuggerEvents\DebuggingIsResumingEventHandler.cs" />
+    <Compile Include="Src\Debugger\DebuggerEvents\DebuggingIsResumingEventArgs.cs" />
-    <Compile Include="Src\Debugger\DebuggerEvents\DebuggingPausedEventHandler.cs" />
+    <Compile Include="Src\Debugger\DebuggerEvents\DebuggingPausedEventArgs.cs" />
-    <Compile Include="Src\Debugger\DebuggerEvents\MessageEventHandler.cs" />
+    <Compile Include="Src\Debugger\DebuggerEvents\MessageEventArgs.cs" />
     <Compile Include="Src\Debugger\DebuggerEvents\PausedReason.cs" />
     <Compile Include="Src\Debugger\Exceptions.cs" />
     <Compile Include="Src\Debugger\Internal\ManagedCallback.cs" />
@@ -65,7 +65,7 @@
     <Compile Include="Src\Interop enums\CorMethodAttr.cs" />
     <Compile Include="Src\Interop enums\CorTokenType.cs" />
     <Compile Include="Src\Modules\Module.cs" />
-    <Compile Include="Src\Modules\ModuleEventHandler.cs" />
+    <Compile Include="Src\Modules\ModuleEventArgs.cs" />
     <Compile Include="Src\Modules\NDebugger-Modules.cs" />
     <Compile Include="Src\RemotingSinks\PrivateEventHandlersSink\AsyncMessageResponseSink.cs" />
     <Compile Include="Src\RemotingSinks\PrivateEventHandlersSink\MyProxy.cs" />
@@ -76,13 +76,13 @@
     <Compile Include="Src\Threads\NDebugger-Processes.cs" />
     <Compile Include="Src\Threads\NDebugger-Threads.cs" />
     <Compile Include="Src\Threads\Process.cs" />
-    <Compile Include="Src\Threads\ProcessEventHandler.cs" />
+    <Compile Include="Src\Threads\ProcessEventArgs.cs" />
     <Compile Include="Src\Threads\SourcecodeSegment.cs" />
     <Compile Include="Src\Threads\Thread.cs" />
-    <Compile Include="Src\Threads\ThreadEventHandler.cs" />
+    <Compile Include="Src\Threads\ThreadEventArgs.cs" />
     <Compile Include="Src\Variables\ArrayVariable.cs" />
     <Compile Include="Src\Variables\BuiltInVariable.cs" />
-    <Compile Include="Src\Variables\Evals\CorDebugEvalEventHandler.cs" />
+    <Compile Include="Src\Variables\Evals\CorDebugEvalEventArgs.cs" />
     <Compile Include="Src\Variables\Evals\Eval.cs" />
     <Compile Include="Src\Variables\Evals\EvalQueue.cs" />
     <Compile Include="Src\Variables\NullRefVariable.cs" />

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/Breakpoint.cs

@@ -56,7 +56,7 @@ namespace DebuggerLibrary
 		}
 		
 
-		public event BreakpointEventHandler BreakpointStateChanged;
+		public event EventHandler<BreakpointEventArgs> BreakpointStateChanged;
 
 		internal void OnBreakpointStateChanged()
 		{
@@ -64,7 +64,7 @@ namespace DebuggerLibrary
 				BreakpointStateChanged(this, new BreakpointEventArgs(debugger, this));
 		}
 
-		public event BreakpointEventHandler BreakpointHit;
+		public event EventHandler<BreakpointEventArgs> BreakpointHit;
 
 		internal void OnBreakpointHit()
 		{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/BreakpointEventArgs.cs

@@ -6,8 +6,6 @@ using System;
 
 namespace DebuggerLibrary 
 {	
-	public delegate void BreakpointEventHandler (object sender, BreakpointEventArgs e);
-	
 	[Serializable]
 	public class BreakpointEventArgs : DebuggerEventArgs
 	{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/NDebugger-Breakpoints.cs

@@ -15,10 +15,10 @@ namespace DebuggerLibrary
 	{
 		List<Breakpoint> breakpointCollection = new List<Breakpoint>();
 
-		public event BreakpointEventHandler BreakpointAdded;
+		public event EventHandler<BreakpointEventArgs> BreakpointAdded;
-		public event BreakpointEventHandler BreakpointRemoved;
+		public event EventHandler<BreakpointEventArgs> BreakpointRemoved;
-		public event BreakpointEventHandler BreakpointStateChanged;
+		public event EventHandler<BreakpointEventArgs> BreakpointStateChanged;
-		public event BreakpointEventHandler BreakpointHit;
+		public event EventHandler<BreakpointEventArgs> BreakpointHit;
 
 		protected virtual void OnBreakpointAdded(Breakpoint breakpoint)
 		{
@@ -70,8 +70,8 @@ namespace DebuggerLibrary
 			breakpointCollection.Add(breakpoint);
 
 			breakpoint.SetBreakpoint();
-			breakpoint.BreakpointStateChanged += new BreakpointEventHandler(OnBreakpointStateChanged);
+			breakpoint.BreakpointStateChanged += new EventHandler<BreakpointEventArgs>(OnBreakpointStateChanged);
-			breakpoint.BreakpointHit += new BreakpointEventHandler(OnBreakpointHit);
+			breakpoint.BreakpointHit += new EventHandler<BreakpointEventArgs>(OnBreakpointHit);
 
 			OnBreakpointAdded(breakpoint);
 
@@ -85,8 +85,8 @@ namespace DebuggerLibrary
 
 		public void RemoveBreakpoint(Breakpoint breakpoint)  
 		{
-			breakpoint.BreakpointStateChanged -= new BreakpointEventHandler(OnBreakpointStateChanged);
+			breakpoint.BreakpointStateChanged -= new EventHandler<BreakpointEventArgs>(OnBreakpointStateChanged);
-			breakpoint.BreakpointHit -= new BreakpointEventHandler(OnBreakpointHit);
+			breakpoint.BreakpointHit -= new EventHandler<BreakpointEventArgs>(OnBreakpointHit);
 	
             breakpoint.Enabled = false;
 			breakpointCollection.Remove( breakpoint );

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/DebuggerEventArgs.cs

@@ -6,8 +6,6 @@ using System;
 
 namespace DebuggerLibrary 
 {	
-	public delegate void DebuggerEventHandler (object sender, DebuggerEventArgs e);
-	
 	[Serializable]
 	public class DebuggerEventArgs : EventArgs 
 	{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/DebuggingIsResumingEventArgs.cs

@@ -6,8 +6,6 @@ using System;
 
 namespace DebuggerLibrary 
 {	
-	public delegate void DebuggingIsResumingEventHandler (object sender, DebuggingIsResumingEventArgs e);
-	
 	[Serializable]
 	public class DebuggingIsResumingEventArgs : DebuggerEventArgs
 	{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/DebuggingPausedEventArgs.cs

@@ -6,8 +6,6 @@ using System;
 
 namespace DebuggerLibrary 
 {	
-	public delegate void DebuggingPausedEventHandler (object sender, DebuggingPausedEventArgs e);
-	
 	[Serializable]
 	public class DebuggingPausedEventArgs : DebuggerEventArgs
 	{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/MessageEventArgs.cs

@@ -6,8 +6,6 @@ using System;
 
 namespace DebuggerLibrary 
 {	
-	public delegate void MessageEventHandler (object sender, MessageEventArgs e);
-	
 	[Serializable]
 	public class MessageEventArgs : DebuggerEventArgs
 	{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs

@@ -22,7 +22,7 @@ namespace DebuggerLibrary
 
 		bool handlingCallback = false;
 
-		public event CorDebugEvalEventHandler CorDebugEvalCompleted;
+		public event EventHandler<CorDebugEvalEventArgs> CorDebugEvalCompleted;
 
 		public ManagedCallback(NDebugger debugger)
 		{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NDebugger.cs

@@ -59,7 +59,7 @@ namespace DebuggerLibrary
 			InitDebugger();
 			ResetEnvironment();
 
-			this.ModuleLoaded += new ModuleEventHandler(SetBreakpointsInModule);
+			this.ModuleLoaded += new EventHandler<ModuleEventArgs>(SetBreakpointsInModule);
 		}
 		
 		~NDebugger() //TODO
@@ -108,7 +108,7 @@ namespace DebuggerLibrary
 
 		#region Public events
 
-		public event DebuggingPausedEventHandler DebuggingPaused;
+		public event EventHandler<DebuggingPausedEventArgs> DebuggingPaused;
 
 		protected internal virtual void OnDebuggingPaused(PausedReason reason)
 		{
@@ -123,7 +123,7 @@ namespace DebuggerLibrary
 		}
 
 
-		public event DebuggingIsResumingEventHandler DebuggingIsResuming;
+		public event EventHandler<DebuggingIsResumingEventArgs> DebuggingIsResuming;
 
 		protected internal virtual void OnDebuggingIsResuming(ref bool abort)
 		{
@@ -141,7 +141,7 @@ namespace DebuggerLibrary
 		}
 
 
-		public event DebuggerEventHandler DebuggingResumed;
+		public event EventHandler<DebuggerEventArgs> DebuggingResumed;
 
 		protected internal virtual void OnDebuggingResumed()
 		{
@@ -152,7 +152,7 @@ namespace DebuggerLibrary
 		}
 
 
-		public event DebuggerEventHandler IsProcessRunningChanged;
+		public event EventHandler<DebuggerEventArgs> IsProcessRunningChanged;
 
 		protected internal virtual void OnIsProcessRunningChanged()
 		{
@@ -163,7 +163,7 @@ namespace DebuggerLibrary
 		}
 
 		
-		public event DebuggerEventHandler IsDebuggingChanged;
+		public event EventHandler<DebuggerEventArgs> IsDebuggingChanged;
 
 		protected internal virtual void OnIsDebuggingChanged()
 		{
@@ -176,7 +176,7 @@ namespace DebuggerLibrary
 		/// <summary>
 		/// Fired when System.Diagnostics.Trace.WriteLine() is called in debuged process
 		/// </summary>
-		public event MessageEventHandler LogMessage;
+		public event EventHandler<MessageEventArgs> LogMessage;
 
 		protected internal virtual void OnLogMessage(string message)
 		{
@@ -189,7 +189,7 @@ namespace DebuggerLibrary
 		/// <summary>
 		/// Internal: Used to debug the debugger library.
 		/// </summary>
-		public event MessageEventHandler DebuggerTraceMessage;
+		public event EventHandler<MessageEventArgs> DebuggerTraceMessage;
 
 		protected internal virtual void OnDebuggerTraceMessage(string message)
 		{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/ModuleEventArgs.cs

@@ -6,8 +6,6 @@ using System;
 
 namespace DebuggerLibrary 
 {	
-	public delegate void ModuleEventHandler (object sender, ModuleEventArgs e);
-	
 	[Serializable]
 	public class ModuleEventArgs : DebuggerEventArgs
 	{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/NDebugger-Modules.cs

@@ -15,8 +15,8 @@ namespace DebuggerLibrary
 
 		List<Module> moduleCollection = new List<Module>();
 
-		public event ModuleEventHandler ModuleLoaded;
+		public event EventHandler<ModuleEventArgs> ModuleLoaded;
-		public event ModuleEventHandler ModuleUnloaded;
+		public event EventHandler<ModuleEventArgs> ModuleUnloaded;
 
 		protected void OnModuleLoaded(Module module)
 		{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/NDebugger-Processes.cs

@@ -11,8 +11,8 @@ namespace DebuggerLibrary
 
 		Process currentProcess;
 
-		public event ProcessEventHandler ProcessStarted;
+		public event EventHandler<ProcessEventArgs> ProcessStarted;
-		public event ProcessEventHandler ProcessExited;
+		public event EventHandler<ProcessEventArgs> ProcessExited;
 
 		public Process CurrentProcess {
 			get {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/NDebugger-Threads.cs

@@ -13,9 +13,9 @@ namespace DebuggerLibrary
 	{
 		List<Thread> threadCollection = new List<Thread>();
 
-		public event ThreadEventHandler ThreadStarted;
+		public event EventHandler<ThreadEventArgs> ThreadStarted;
-		public event ThreadEventHandler ThreadExited;
+		public event EventHandler<ThreadEventArgs> ThreadExited;
-		public event ThreadEventHandler ThreadStateChanged;
+		public event EventHandler<ThreadEventArgs> ThreadStateChanged;
 
 		protected void OnThreadStarted(Thread thread)
 		{
@@ -58,7 +58,7 @@ namespace DebuggerLibrary
 		internal void AddThread(Thread thread)
 		{
 			threadCollection.Add(thread);
-			thread.ThreadStateChanged += new ThreadEventHandler(OnThreadStateChanged);
+			thread.ThreadStateChanged += new EventHandler<ThreadEventArgs>(OnThreadStateChanged);
 			OnThreadStarted(thread);
 		}
 
@@ -70,7 +70,7 @@ namespace DebuggerLibrary
 		internal void RemoveThread(Thread thread)
 		{
 			threadCollection.Remove(thread);
-			thread.ThreadStateChanged -= new ThreadEventHandler(OnThreadStateChanged);
+			thread.ThreadStateChanged -= new EventHandler<ThreadEventArgs>(OnThreadStateChanged);
 			OnThreadExited(thread);
 		}
 
@@ -82,7 +82,7 @@ namespace DebuggerLibrary
 		internal void ClearThreads()
 		{
             foreach (Thread thread in threadCollection) {
-				thread.ThreadStateChanged -= new ThreadEventHandler(OnThreadStateChanged);
+				thread.ThreadStateChanged -= new EventHandler<ThreadEventArgs>(OnThreadStateChanged);
 				OnThreadExited(thread);
 			}
 			threadCollection.Clear();

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/ProcessEventArgs.cs

@@ -6,8 +6,6 @@ using System;
 
 namespace DebuggerLibrary
 {
-	public delegate void ProcessEventHandler (object sender, ProcessEventArgs args);
-
 	[Serializable]
 	public class ProcessEventArgs: DebuggerEventArgs
 	{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs

@@ -128,7 +128,7 @@ namespace DebuggerLibrary
 		}
 
 
-		public event ThreadEventHandler ThreadStateChanged;
+		public event EventHandler<ThreadEventArgs> ThreadStateChanged;
 
 		protected void OnThreadStateChanged()
 		{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/ThreadEventArgs.cs

@@ -6,8 +6,6 @@ using System;
 
 namespace DebuggerLibrary 
 {	
-	public delegate void ThreadEventHandler (object sender, ThreadEventArgs e);
-	
 	[Serializable]
 	public class ThreadEventArgs : DebuggerEventArgs
 	{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/CorDebugEvalEventArgs.cs

@@ -7,8 +7,7 @@ using DebuggerInterop.Core;
 
 namespace DebuggerLibrary 
 {	
-	delegate void CorDebugEvalEventHandler (object sender, CorDebugEvalEventArgs e);
+	[Serializable]
-	
 	class CorDebugEvalEventArgs : DebuggerEventArgs
 	{
 		ICorDebugEval corDebugEval;

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs

@@ -20,7 +20,7 @@ namespace DebuggerLibrary
 		ICorDebugValue[]  args;
 		bool              complete = false;
 		
-		public event DebuggerEventHandler EvalComplete;
+		public event EventHandler<DebuggerEventArgs> EvalComplete;
 
 		protected virtual void OnEvalComplete(DebuggerEventArgs e) 
 		{
@@ -34,7 +34,7 @@ namespace DebuggerLibrary
 			this.debugger = debugger;
 			this.corFunction = corFunction;
 			this.args = args;
-			debugger.ManagedCallback.CorDebugEvalCompleted += new CorDebugEvalEventHandler(CorDebugEvalCompletedInManagedCallback);
+			debugger.ManagedCallback.CorDebugEvalCompleted += new EventHandler<CorDebugEvalEventArgs>(CorDebugEvalCompletedInManagedCallback);
 		}
 		
 		/// <summary>

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/EvalQueue.cs

@@ -17,7 +17,7 @@ namespace DebuggerLibrary
 
 		ArrayList waitingEvals = new ArrayList();
 		
-		public event DebuggerEventHandler AllEvalsComplete;
+		public event EventHandler<DebuggerEventArgs> AllEvalsComplete;
 
 		public EvalQueue(NDebugger debugger)
 		{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/PropertyVariable.cs

@@ -12,12 +12,12 @@ namespace DebuggerLibrary
 	{
 		Eval           eval;
 		Variable       currentValue;
-		public event DebuggerEventHandler ValueEvaluated;
+		public event EventHandler<DebuggerEventArgs> ValueEvaluated;
 		
 		internal PropertyVariable(NDebugger debugger, Eval eval, string name):base(debugger, null, name)
 		{
 			this.eval = eval;
-			eval.EvalComplete += new DebuggerEventHandler(EvalComplete);
+			eval.EvalComplete += new EventHandler<DebuggerEventArgs>(EvalComplete);
 		}
 		
 		public bool IsEvaluated {