From 30f4e9a6ff523043cd59af342812a4d7975140bb Mon Sep 17 00:00:00 2001 From: Sebastian Reitenbach Date: Sun, 26 May 2013 12:04:43 +0000 Subject: [PATCH] * Palettes/3Containers/GormNSOutlineView.m * GormCore/GormMatrixEditor.m * GormCore/GormClassEditor.m some int -> NSInteger and float -> CGFloat transitions spotted by libobjc2 runtime in debug mode git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@36656 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ GormCore/GormClassEditor.m | 4 ++-- GormCore/GormMatrixEditor.m | 6 +++--- Palettes/3Containers/GormNSOutlineView.m | 8 ++++---- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56b17d3a..54d7e883 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-05-26: Sebastian Reitenbach + * Palettes/3Containers/GormNSOutlineView.m + * GormCore/GormMatrixEditor.m + * GormCore/GormClassEditor.m + some int -> NSInteger and float -> CGFloat transitions + spotted by libobjc2 runtime in debug mode 2013-04-14 13:19-EDT Gregory John Casamento * ANNOUNCE diff --git a/GormCore/GormClassEditor.m b/GormCore/GormClassEditor.m index 3a0f5fa9..07f11832 100644 --- a/GormCore/GormClassEditor.m +++ b/GormCore/GormClassEditor.m @@ -1191,7 +1191,7 @@ objectValueForTableColumn: (NSTableColumn *)aTableColumn [gov setNeedsDisplay: YES]; } -- (int) outlineView: (NSOutlineView *)anOutlineView +- (NSInteger) outlineView: (NSOutlineView *)anOutlineView numberOfChildrenOfItem: (id)item { NSArray *subclasses = [classManager subClassesOf: item]; @@ -1213,7 +1213,7 @@ numberOfChildrenOfItem: (id)item } - (id) outlineView: (NSOutlineView *)anOutlineView - child: (int)index + child: (NSInteger)index ofItem: (id)item { NSArray *subclasses = [classManager subClassesOf: item]; diff --git a/GormCore/GormMatrixEditor.m b/GormCore/GormMatrixEditor.m index 3c796469..710a2695 100644 --- a/GormCore/GormMatrixEditor.m +++ b/GormCore/GormMatrixEditor.m @@ -51,12 +51,12 @@ @end @interface NSForm (GormAdditions) -- (float) titleWidth; +- (CGFloat) titleWidth; @end @implementation NSForm (GormAdditions) -- (float)titleWidth +- (CGFloat)titleWidth { int i, count = [self numberOfRows]; float new_title_width = 0; @@ -244,7 +244,7 @@ static BOOL done_editing; if (isForm) { /* Set the new title and resize the form to match the titles */ - float oldTitleWidth, titleWidth; + CGFloat oldTitleWidth, titleWidth; NSRect oldFrame; oldTitleWidth = [(NSForm *)_EO titleWidth]; [(NSFormCell *)selected setTitle: [editField stringValue]]; diff --git a/Palettes/3Containers/GormNSOutlineView.m b/Palettes/3Containers/GormNSOutlineView.m index 682e0901..f42d25cf 100644 --- a/Palettes/3Containers/GormNSOutlineView.m +++ b/Palettes/3Containers/GormNSOutlineView.m @@ -32,13 +32,13 @@ { } - (id)outlineView: (NSOutlineView *)outlineView - child: (int)index + child: (NSInteger)index ofItem: (id)item; - (BOOL)outlineView: (NSOutlineView *)outlineView isItemExpandable: (id)item; -- (int) outlineView: (NSOutlineView *)outlineView +- (NSInteger) outlineView: (NSOutlineView *)outlineView numberOfChildrenOfItem: (id)item; - (id) outlineView: (NSOutlineView *)outlineView @@ -50,7 +50,7 @@ @implementation NSOutlineViewDataSource // required methods for data source - (id)outlineView: (NSOutlineView *)outlineView - child: (int)index + child: (NSInteger)index ofItem: (id)item { if([item isEqual: @"NSObject"]) @@ -108,7 +108,7 @@ return NO; } -- (int) outlineView: (NSOutlineView *)outlineView +- (NSInteger) outlineView: (NSOutlineView *)outlineView numberOfChildrenOfItem: (id)item { if(item == nil)