From 8cc075aff32f70417450d8f9575c1f18dd3e4199 Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Mon, 1 Jun 2015 14:35:12 -0700 Subject: [PATCH] Fixed: objj2objcskeleton does not work with categories on cappuccino class Previously, when making objj2objcskeleton on a category of a cappuccino class, the cocoa category was not a cocoa class but still a cappuccino class. For instance, a CPView category was still a CPView category instead of being a NSView category. Fixed #2344 --- Tools/objj2objcskeleton/objj2objcskeleton | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/objj2objcskeleton/objj2objcskeleton b/Tools/objj2objcskeleton/objj2objcskeleton index 771276f36..105b49573 100644 --- a/Tools/objj2objcskeleton/objj2objcskeleton +++ b/Tools/objj2objcskeleton/objj2objcskeleton @@ -175,7 +175,7 @@ function parser(args) if (aClass.superClass) ObjectiveCHeader += [CPString stringWithFormat:@"\n@interface %@ : %@", aClass.name, NSCompatibleClassName(aClass.superClass)]; else - ObjectiveCHeader += [CPString stringWithFormat:@"\n@interface %@ (%@)", aClass.name, aClass.category]; + ObjectiveCHeader += [CPString stringWithFormat:@"\n@interface %@ (%@)", NSCompatibleClassName(aClass.name, NO), aClass.category]; // add each outlet in header if (aClass.outlets.length > 0) @@ -201,7 +201,7 @@ function parser(args) ObjectiveCHeader += "\n@end\n"; // fill up the implementation file - ObjectiveCSource += "\n@implementation " + aClass.name + "\n@end\n"; + ObjectiveCSource += "\n@implementation " + NSCompatibleClassName(aClass.name, NO) + "\n@end\n"; }); if (ObjectiveCSource.length)