gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-02-24 12:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GormCore/GormClassInspector.m

Browse source 
* GormCore/GormClassManager.m
	* GormCore/GormDocument.m
	* GormCore/GormGenericEditor.m
	* GormCore/GormObjectInspector.m
	* GormCore/GormOutlineView.m
	* GormCore/GormPrivate.h
	* GormCore/GormPrivate.m
	* Palettes/0Menus/GormMenuEditor.m
	* Palettes/1Windows/GormDrawerAttributesInspector.m
	* Palettes/3Containers/GormTableColumnAttributesInspector.m
	* Palettes/3Containers/GormTableViewEditor.m
	* Palettes/4Data/DataPalette.m
	* Palettes/4Data/GormNumberFormatterAttributesInspector.m: Change int/unsigned int to NSInteger
	and NSUInteger to address 64-bit issues.  Patch by
	Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
	* Plugins/Gorm/GormGormWrapperLoader.m
	* Plugins/Nib/GormNibWrapperBuilder.m
	* Plugins/Nib/GormNibWrapperLoader.m
	* Plugins/Xib/GormXibWrapperLoader.m: Clean up warnings found by clang.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@35091 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2012-04-20 06:12:32 +00:00
parent 4bc5ea7ede
commit 4671ec0870
19 changed files with 57 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ChangeLog
View file

@ -1,3 +1,26 @@
2012-04-20 02:11-EDT Gregory John Casamento <greg.casamento@gmail.com>
* GormCore/GormClassInspector.m
* GormCore/GormClassManager.m
* GormCore/GormDocument.m
* GormCore/GormGenericEditor.m
* GormCore/GormObjectInspector.m
* GormCore/GormOutlineView.m
* GormCore/GormPrivate.h
* GormCore/GormPrivate.m
* Palettes/0Menus/GormMenuEditor.m
* Palettes/1Windows/GormDrawerAttributesInspector.m
* Palettes/3Containers/GormTableColumnAttributesInspector.m
* Palettes/3Containers/GormTableViewEditor.m
* Palettes/4Data/DataPalette.m
* Palettes/4Data/GormNumberFormatterAttributesInspector.m: Change int/unsigned int to NSInteger
and NSUInteger to address 64-bit issues. Patch by
Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* Plugins/Gorm/GormGormWrapperLoader.m
* Plugins/Nib/GormNibWrapperBuilder.m
* Plugins/Nib/GormNibWrapperLoader.m
* Plugins/Xib/GormXibWrapperLoader.m: Clean up warnings found by clang.
2012-04-05 14:38-EDT Gregory John Casamento <greg.casamento@gmail.com> 2012-04-05 14:38-EDT Gregory John Casamento <greg.casamento@gmail.com>
* GormCore/GormMatrixEditor.m: Change modifier to Ctrl+Shift since * GormCore/GormMatrixEditor.m: Change modifier to Ctrl+Shift since

2
GormCore/GormClassInspector.m
View file

@ -667,7 +667,7 @@ objectValueForTableColumn: (NSTableColumn *)tc
} }
else else
{ {
NSLog(@"Got %@ set to class edit inspector"); NSLog(@"Got %@ set to class edit inspector",anObject);
} }
} }

2
GormCore/GormClassManager.m
View file

@ -1117,7 +1117,7 @@
if (classInfo != nil && [classInformation objectForKey: name] == nil) if (classInfo != nil && [classInformation objectForKey: name] == nil)
{ {
int index = 0; NSUInteger index = 0;
NSArray *subclasses = [self subClassesOf: oldName]; NSArray *subclasses = [self subClassesOf: oldName];
RETAIN(classInfo); // prevent loss of the information... RETAIN(classInfo); // prevent loss of the information...

2
GormCore/GormDocument.m
View file

@ -2490,7 +2490,7 @@ static void _real_close(GormDocument *self,
{ {
NSTableView *tv = (NSTableView *)[[(NSTableColumn*)object dataCell] controlView]; NSTableView *tv = (NSTableView *)[[(NSTableColumn*)object dataCell] controlView];
NSTableHeaderView *th = [tv headerView]; NSTableHeaderView *th = [tv headerView];
int index; NSUInteger index;
if (th == nil || tv == nil) if (th == nil || tv == nil)
{ {

10
GormCore/GormGenericEditor.m
View file

@ -245,7 +245,7 @@
*/ */
- (NSRect) rectForObject: (id)anObject - (NSRect) rectForObject: (id)anObject
{ {
unsigned pos = [objects indexOfObjectIdenticalTo: anObject]; NSUInteger pos = [objects indexOfObjectIdenticalTo: anObject];
NSRect rect; NSRect rect;
int r; int r;
int c; int c;
@ -266,8 +266,8 @@
- (void) refreshCells - (void) refreshCells
{ {
unsigned count = [objects count]; NSUInteger count = [objects count];
unsigned index = 0; NSUInteger index = 0;
int cols = 0; int cols = 0;
int rows = 0; int rows = 0;
int width = 0; int width = 0;
@ -317,7 +317,7 @@
- (void) removeObject: (id)anObject - (void) removeObject: (id)anObject
{ {
unsigned pos; NSUInteger pos;
pos = [objects indexOfObjectIdenticalTo: anObject]; pos = [objects indexOfObjectIdenticalTo: anObject];
if (pos == NSNotFound) if (pos == NSNotFound)
@ -341,7 +341,7 @@
return [NSArray arrayWithObject: selected]; return [NSArray arrayWithObject: selected];
} }
- (unsigned) selectionCount - (NSUInteger) selectionCount
{ {
return (selected == nil) ? 0 : 1; return (selected == nil) ? 0 : 1;
} }

4
GormCore/GormObjectInspector.m
View file

@ -103,7 +103,7 @@ selectCellWithString: (NSString*)title
- (void) ok: (id)sender - (void) ok: (id)sender
{ {
NSString *name = [[browser selectedCell] stringValue]; NSString *name = [[browser selectedCell] stringValue];
unsigned pos; NSUInteger pos;
if (name == nil || (pos = [sets indexOfObject: name]) == NSNotFound) if (name == nil || (pos = [sets indexOfObject: name]) == NSNotFound)
{ {
@ -331,7 +331,7 @@ selectCellWithString: (NSString*)title
- (void) update: (id)sender - (void) update: (id)sender
{ {
NSString *name = [[browser selectedCell] stringValue]; NSString *name = [[browser selectedCell] stringValue];
unsigned pos; NSUInteger pos;
isString = NO; isString = NO;
if (name == nil || (pos = [sets indexOfObject: name]) == NSNotFound) if (name == nil || (pos = [sets indexOfObject: name]) == NSNotFound)

4
GormCore/GormOutlineView.m
View file

@ -199,7 +199,7 @@ static NSColor *darkGreyBlueColor = nil;
- (void) _addNewOutletToObject: (id)item - (void) _addNewOutletToObject: (id)item
{ {
int insertionPoint = 0; NSUInteger insertionPoint = 0;
GormOutletActionHolder *holder = [[GormOutletActionHolder alloc] init]; GormOutletActionHolder *holder = [[GormOutletActionHolder alloc] init];
NSString *name = nil; NSString *name = nil;
@ -227,7 +227,7 @@ static NSColor *darkGreyBlueColor = nil;
{ {
int numchildren = 0; int numchildren = 0;
int i = 0; int i = 0;
int insertionPoint = 0; NSUInteger insertionPoint = 0;
id object = nil; id object = nil;
id sitem = (item == nil)?((id)[NSNull null]):((id)item); id sitem = (item == nil)?((id)[NSNull null]):((id)item);

4
GormCore/GormPrivate.h
View file

@ -99,7 +99,7 @@ extern NSString *GormResizeCellNotification;
+ (int) formatCount; + (int) formatCount;
+ (NSString *) formatAtIndex: (int)index; + (NSString *) formatAtIndex: (int)index;
+ (int) indexOfFormat: (NSString *) format; + (NSInteger) indexOfFormat: (NSString *) format;
+ (NSString *) defaultFormat; + (NSString *) defaultFormat;
+ (id) defaultFormatValue; + (id) defaultFormatValue;
@ -114,7 +114,7 @@ extern NSString *GormResizeCellNotification;
+ (NSString *) negativeFormatAtIndex: (int)index; + (NSString *) negativeFormatAtIndex: (int)index;
+ (NSDecimalNumber *) positiveValueAtIndex: (int)index; + (NSDecimalNumber *) positiveValueAtIndex: (int)index;
+ (NSDecimalNumber *) negativeValueAtIndex: (int)index; + (NSDecimalNumber *) negativeValueAtIndex: (int)index;
+ (int) indexOfFormat: (NSString *)format; + (NSInteger) indexOfFormat: (NSString *)format;
+ (NSString *) defaultFormat; + (NSString *) defaultFormat;
+ (id) defaultFormatValue; + (id) defaultFormatValue;
- (NSString *) zeroFormat; - (NSString *) zeroFormat;

2
GormCore/GormPrivate.m
View file

@ -130,7 +130,7 @@ static BOOL _isInInterfaceBuilder = NO;
} }
else else
{ {
int version = [aCoder versionForClassName: NSUInteger version = [aCoder versionForClassName:
NSStringFromClass([GSNibItem class])]; NSStringFromClass([GSNibItem class])];
int cv = [aCoder versionForClassName: int cv = [aCoder versionForClassName:
NSStringFromClass([GSNibContainer class])]; NSStringFromClass([GSNibContainer class])];

2
Palettes/0Menus/GormMenuEditor.m
View file

@ -895,7 +895,7 @@ void _attachAll(NSMenu *menu, id document)
{ {
if ([anArray isEqual: selection] == NO) if ([anArray isEqual: selection] == NO)
{ {
unsigned count; NSUInteger count;
NSMenuItem *item; NSMenuItem *item;
[selection removeAllObjects]; [selection removeAllObjects];

2
Palettes/1Windows/GormDrawerAttributesInspector.m
View file

@ -52,7 +52,7 @@
- (void) revert: (id) sender - (void) revert: (id) sender
{ {
id drawer = [self object]; id drawer = [self object];
int i = [preferredEdge indexOfItemWithTag: [drawer preferredEdge]]; NSUInteger i = [preferredEdge indexOfItemWithTag: [drawer preferredEdge]];
if(i != NSNotFound) if(i != NSNotFound)
{ {
[preferredEdge selectItemAtIndex: i]; [preferredEdge selectItemAtIndex: i];

4
Palettes/3Containers/GormTableColumnAttributesInspector.m
View file

@ -232,7 +232,7 @@
{ {
NSArray *list; NSArray *list;
NSString *cellClassName; NSString *cellClassName;
int index; NSUInteger index;
if ( object == nil ) if ( object == nil )
return; return;
@ -241,7 +241,7 @@
cellClassName = [self _getCellClassName]; cellClassName = [self _getCellClassName];
index = [list indexOfObject: cellClassName]; index = [list indexOfObject: cellClassName];
if(index != NSNotFound && index != -1) if(index != NSNotFound)
{ {
[cellTable selectRow: index byExtendingSelection: NO]; [cellTable selectRow: index byExtendingSelection: NO];
[cellTable scrollRowToVisible: index]; [cellTable scrollRowToVisible: index];

2
Palettes/3Containers/GormTableViewEditor.m
View file

@ -363,7 +363,7 @@ static NSText *_textObject;
NSTableColumn *tc; NSTableColumn *tc;
NSRect drawingRect; NSRect drawingRect;
int columnIndex = [th columnAtPoint: NSUInteger columnIndex = [th columnAtPoint:
[th convertPoint:[theEvent locationInWindow] [th convertPoint:[theEvent locationInWindow]
fromView: nil]]; fromView: nil]];

4
Palettes/4Data/DataPalette.m
View file

@ -89,7 +89,7 @@ int defaultNumberFormatIndex = 0;
[[predefinedNumberFormats objectAtIndex:i] objectAtIndex:2] ]; [[predefinedNumberFormats objectAtIndex:i] objectAtIndex:2] ];
} }
+ (int) indexOfFormat: (NSString *) format + (NSInteger) indexOfFormat: (NSString *) format
{ {
int i; int i;
NSString *fmt; NSString *fmt;
@ -148,7 +148,7 @@ int defaultDateFormatIndex = 3;
return [predefinedDateFormats objectAtIndex: index]; return [predefinedDateFormats objectAtIndex: index];
} }
+ (int) indexOfFormat: (NSString *) format + (NSInteger) indexOfFormat: (NSString *) format
{ {
return [predefinedDateFormats indexOfObject: format]; return [predefinedDateFormats indexOfObject: format];
} }

4
Palettes/4Data/GormNumberFormatterAttributesInspector.m
View file

@ -113,7 +113,7 @@ extern NSArray *predefinedNumberFormats;
} }
else if (sender == formatForm) else if (sender == formatForm)
{ {
int idx; NSUInteger idx;
positiveFmt = [[sender cellAtIndex:0] stringValue]; positiveFmt = [[sender cellAtIndex:0] stringValue];
zeroFmt = [[sender cellAtIndex:1] stringValue]; zeroFmt = [[sender cellAtIndex:1] stringValue];
@ -181,7 +181,7 @@ extern NSArray *predefinedNumberFormats;
- (void) revert: (id)sender - (void) revert: (id)sender
{ {
int idx; NSUInteger idx;
NSNumberFormatter *fmtr = [[object cell] formatter]; NSNumberFormatter *fmtr = [[object cell] formatter];
// Format form // Format form

2
Plugins/Gorm/GormGormWrapperLoader.m
View file

@ -345,7 +345,7 @@
NSDictionary *substituteClasses = [palettesManager substituteClasses]; NSDictionary *substituteClasses = [palettesManager substituteClasses];
NSEnumerator *en = [substituteClasses keyEnumerator]; NSEnumerator *en = [substituteClasses keyEnumerator];
NSString *subClassName = nil; NSString *subClassName = nil;
unsigned int version = NSNotFound; NSUInteger version = NSNotFound;
NSDictionary *fileWrappers = nil; NSDictionary *fileWrappers = nil;
GSNibContainer *container; GSNibContainer *container;
NSArray *visible; NSArray *visible;

3
Plugins/Nib/GormNibWrapperBuilder.m
View file

@ -27,6 +27,7 @@
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#include <AppKit/AppKit.h> #include <AppKit/AppKit.h>
#include <GNUstepGUI/GSNibLoading.h> #include <GNUstepGUI/GSNibLoading.h>
#include <GormCore/GormWrapperBuilder.h> #include <GormCore/GormWrapperBuilder.h>
#include <GormCore/GormClassManager.h> #include <GormCore/GormClassManager.h>
#include <GormCore/GormFilePrefsManager.h> #include <GormCore/GormFilePrefsManager.h>
@ -34,6 +35,8 @@
#include <GormCore/GormProtocol.h> #include <GormCore/GormProtocol.h>
#include <GormCore/GormPalettesManager.h> #include <GormCore/GormPalettesManager.h>
#include <GormCore/GormCustomView.h> #include <GormCore/GormCustomView.h>
#include <GormCore/GormPrivate.h>
#include <GormCore/GormFilesOwner.h>
// allow access to a private category... // allow access to a private category...
@interface NSIBObjectData (BuilderAdditions) @interface NSIBObjectData (BuilderAdditions)

5
Plugins/Nib/GormNibWrapperLoader.m
View file

@ -24,6 +24,7 @@
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
#include <AppKit/AppKit.h> #include <AppKit/AppKit.h>
#include <GormCore/GormPalettesManager.h> #include <GormCore/GormPalettesManager.h>
#include <GormCore/GormClassManager.h> #include <GormCore/GormClassManager.h>
#include <GormCore/GormImage.h> #include <GormCore/GormImage.h>
@ -33,6 +34,8 @@
#include <GormCore/GormFunctions.h> #include <GormCore/GormFunctions.h>
#include <GormCore/GormCustomView.h> #include <GormCore/GormCustomView.h>
#include <GormCore/GormWindowTemplate.h> #include <GormCore/GormWindowTemplate.h>
#include <GormCore/GormNSWindow.h>
#include "GormNibWrapperLoader.h" #include "GormNibWrapperLoader.h"
@class GormNSWindow; @class GormNSWindow;
@ -264,7 +267,7 @@
{ {
NSString *tag = [o label]; NSString *tag = [o label];
NSRange colonRange = [tag rangeOfString: @":"]; NSRange colonRange = [tag rangeOfString: @":"];
unsigned int location = colonRange.location; NSUInteger location = colonRange.location;
if(location == NSNotFound) if(location == NSNotFound)
{ {

1
Plugins/Xib/GormXibWrapperLoader.m
View file

@ -34,6 +34,7 @@
#include <GormCore/GormFunctions.h> #include <GormCore/GormFunctions.h>
#include <GormCore/GormCustomView.h> #include <GormCore/GormCustomView.h>
#include <GormCore/GormWindowTemplate.h> #include <GormCore/GormWindowTemplate.h>
#include <GormCore/GormNSWindow.h>
#include "GormXibWrapperLoader.h" #include "GormXibWrapperLoader.h"