From a9e9ebde191c2156c27cd85038ee8e686a0a2d6b Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Sat, 23 Jun 2007 14:45:47 +0000 Subject: [PATCH] * Headers/AppKit/NSObjectController.h * Source/NSObjectController.m: Changed "class" to "aClass" to avoid issues with ObjC++ compilation in both the header and the .m file for consistency. This change was suggested by Rob Burns and he provided a short patch via IRC. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25290 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 8 ++++++++ Headers/AppKit/NSObjectController.h | 2 +- Source/NSObjectController.m | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e130dfae..fe11322e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-06-23 10:43-EDT Gregory John Casamento + + * Headers/AppKit/NSObjectController.h + * Source/NSObjectController.m: Changed "class" to "aClass" to + avoid issues with ObjC++ compilation in both the header and the + .m file for consistency. This change was suggested by Rob Burns + and he provided a short patch via IRC. + 2007-06-22 Richard Frith-Macdonald * Source/NSView.m: When setting frame and bounds, refrain from diff --git a/Headers/AppKit/NSObjectController.h b/Headers/AppKit/NSObjectController.h index efe00ffd9..3316387cc 100644 --- a/Headers/AppKit/NSObjectController.h +++ b/Headers/AppKit/NSObjectController.h @@ -57,7 +57,7 @@ - (id) content; - (void) setContent: (id)content; - (Class) objectClass; -- (void) setObjectClass: (Class)class; +- (void) setObjectClass: (Class)aClass; - (id) newObject; - (void) prepareContent; diff --git a/Source/NSObjectController.m b/Source/NSObjectController.m index 674dd4b0c..fe286def8 100644 --- a/Source/NSObjectController.m +++ b/Source/NSObjectController.m @@ -99,9 +99,9 @@ return _object_class; } -- (void) setObjectClass: (Class)class +- (void) setObjectClass: (Class)aClass { - _object_class = class; + _object_class = aClass; } - (id) newObject