applied improvements suggested by Daniel:

- changed ClassType mappings
- use cast with CodeGenerator.ConvertMember in XamlCompletionItemList
- pass on targetContext recursively in ConvertClass

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

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs

@@ -186,7 +186,7 @@ namespace ICSharpCode.XamlBinding
 					
 					discriminator--;
 					
-					ParametrizedNode node = CodeGenerator.ConvertMember(invokeMethod, new ClassFinder(part, context.Editor.Caret.Line, context.Editor.Caret.Column)) as ParametrizedNode;
+					ParametrizedNode node = (ParametrizedNode)CodeGenerator.ConvertMember(invokeMethod, new ClassFinder(part, context.Editor.Caret.Line, context.Editor.Caret.Column));
 					
 					node.Name = handlerName;
 					

src/Libraries/NRefactory/Project/Src/Ast/Enums.cs

@@ -84,11 +84,11 @@ namespace ICSharpCode.NRefactory.Ast
 	
 	public enum ClassType
 	{
-		Class = 0x0,
+		Class,
-		Module = 0x1,
+		Module,
-		Interface = 0x2,
+		Interface,
-		Struct = 0x3,
+		Struct,
-		Enum = 0x4
+		Enum
 	}
 	
 	public enum ParentType

src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Interfaces/ClassType.cs

@@ -8,11 +8,11 @@
 namespace ICSharpCode.SharpDevelop.Dom
 {
 	public enum ClassType {
-		Class = 0x0,
+		Class = ICSharpCode.NRefactory.Ast.ClassType.Class,
-		Enum = 0x4,
+		Enum = ICSharpCode.NRefactory.Ast.ClassType.Enum,
-		Interface = 0x2,
+		Interface = ICSharpCode.NRefactory.Ast.ClassType.Interface,
-		Struct = 0x3,
+		Struct = ICSharpCode.NRefactory.Ast.ClassType.Struct,
 		Delegate = 0x5,
-		Module = 0x1
+		Module = ICSharpCode.NRefactory.Ast.ClassType.Module
 	}
 }

src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/CodeGenerator.cs

@@ -375,7 +375,7 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring
 				}
 				
 				t.Children.AddRange(members);
-				t.Children.AddRange(c.InnerClasses.Select(c2 => ConvertClass(c2, null)));
+				t.Children.AddRange(c.InnerClasses.Select(c2 => ConvertClass(c2, targetContext)));
 				
 				return t;
 			}