From 5ccc8e0fdaf4e4f2a781f9a389aa23512cba0c76 Mon Sep 17 00:00:00 2001
From: de4dot <de4dot@gmail.com>
Date: Tue, 6 Dec 2011 02:45:28 +0100
Subject: [PATCH] Add prop/event override prefix

---
 de4dot.code/renamer/Renamer.cs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/de4dot.code/renamer/Renamer.cs b/de4dot.code/renamer/Renamer.cs
index 5ff6bdbc..eee9339a 100644
--- a/de4dot.code/renamer/Renamer.cs
+++ b/de4dot.code/renamer/Renamer.cs
@@ -480,7 +480,7 @@ namespace de4dot.renamer {
 			if (theProperty == null)
 				return;
 
-			createProperty(theProperty, propMethod);
+			createProperty(theProperty, propMethod, getOverridePrefix(scope, propMethod));
 		}
 
 		void restoreVirtualProperties(MethodNameScope scope) {
@@ -504,17 +504,18 @@ namespace de4dot.renamer {
 				return;
 
 			foreach (var method in missingProps)
-				createProperty(prop, method);
+				createProperty(prop, method, "");
 		}
 
-		void createProperty(PropertyDef propDef, MethodDef methodDef) {
+		void createProperty(PropertyDef propDef, MethodDef methodDef, string overridePrefix) {
 			if (!methodDef.Owner.HasModule)
 				return;
 
+			var newPropertyName = overridePrefix + propDef.PropertyDefinition.Name;
 			if (methodDef.MethodDefinition.MethodReturnType.ReturnType.FullName == "System.Void")
-				createPropertySetter(propDef.PropertyDefinition.Name, methodDef);
+				createPropertySetter(newPropertyName, methodDef);
 			else
-				createPropertyGetter(propDef.PropertyDefinition.Name, methodDef);
+				createPropertyGetter(newPropertyName, methodDef);
 		}
 
 		void restorePropertiesFromNames(IEnumerable<MethodNameScope> allScopes) {
@@ -660,7 +661,7 @@ namespace de4dot.renamer {
 			if (theEvent == null)
 				return;
 
-			createEvent(theEvent, eventMethod, getEventMethodType(overriddenMethod));
+			createEvent(theEvent, eventMethod, getEventMethodType(overriddenMethod), getOverridePrefix(scope, eventMethod));
 		}
 
 		void restoreVirtualEvents(MethodNameScope scope) {
@@ -687,19 +688,20 @@ namespace de4dot.renamer {
 				return;
 
 			foreach (var method in missingEvents)
-				createEvent(evt, method, methodType);
+				createEvent(evt, method, methodType, "");
 		}
 
-		void createEvent(EventDef eventDef, MethodDef methodDef, EventMethodType methodType) {
+		void createEvent(EventDef eventDef, MethodDef methodDef, EventMethodType methodType, string overridePrefix) {
 			if (!methodDef.Owner.HasModule)
 				return;
 
+			var newEventName = overridePrefix + eventDef.EventDefinition.Name;
 			switch (methodType) {
 			case EventMethodType.Adder:
-				createEventAdder(eventDef.EventDefinition.Name, methodDef);
+				createEventAdder(newEventName, methodDef);
 				break;
 			case EventMethodType.Remover:
-				createEventRemover(eventDef.EventDefinition.Name, methodDef);
+				createEventRemover(newEventName, methodDef);
 				break;
 			}
 		}