gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-02-15 16:10:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Apps/EOModelEditor/AdaptorsPanel.m

Browse source 
* Apps/EOModelEditor/Preferences.m
        * EOAccess/EOAttribute.m
        * EOAccess/EOExpressionArray.m
        * EOAccess/EORelationship.m
        * EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m
        * EOAdaptors/SQLiteAdaptor/SQLite3Channel.m
        * EOControl/EOCheapArray.m
        * EOControl/EOMutableKnownKeyDictionary.m
        * EOControl/EOPrivate.h
        * EOControl/EOPrivate.m
        * EOControl/Makefile.preamble
        * GDL2Palette/ConnectionInspector.m
        * GDL2Palette/DisplayGroupInspector.m
          Fix warnings about conflicting return types or paramters


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@36241 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Sebastian Reitenbach 2013-03-02 18:20:35 +00:00
parent a6e98220c2
commit 829a02e46a
13 changed files with 56 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Apps/EOModelEditor/AdaptorsPanel.m
View file

@ -153,15 +153,15 @@ static NSArray *_adaptorNames;
/* NSBrowser delegate stuff */ /* NSBrowser delegate stuff */
- (int) browser:(id)sender numberOfRowsInColumn:(int)column - (NSInteger) browser:(id)sender numberOfRowsInColumn:(NSInteger)column
{ {
return [_adaptorNames count]; return [_adaptorNames count];
} }
- (void)browser:(NSBrowser*)sender - (void)browser:(NSBrowser*)sender
willDisplayCell:(NSBrowserCell*)cell willDisplayCell:(NSBrowserCell*)cell
atRow:(int)row atRow:(NSInteger)row
column:(int)column column:(NSInteger)column
{ {
[cell setLeaf:YES]; [cell setLeaf:YES];
[cell setTitle: [_adaptorNames objectAtIndex:row]]; [cell setTitle: [_adaptorNames objectAtIndex:row]];

10
Apps/EOModelEditor/Preferences.m
View file

@ -183,13 +183,15 @@ static NSString *_switches[][2] =
} }
- (int) numberOfRowsInTableView:(NSTableView *)tv - (NSInteger) numberOfRowsInTableView:(NSTableView *)tv
{ {
int num = [_bundles count]; NSInteger num = [_bundles count];
return num; return num;
} }
- (id) tableView:(NSTableView *)tv objectValueForTableColumn:(NSTableColumn *)tc row:(int)rowIndex - (id) tableView:(NSTableView *)tv
objectValueForTableColumn:(NSTableColumn *)tc
row:(NSInteger)rowIndex
{ {
id ov = [_bundles objectAtIndex:rowIndex]; id ov = [_bundles objectAtIndex:rowIndex];
return ov; return ov;
@ -198,7 +200,7 @@ static NSString *_switches[][2] =
- (void) tableView:(NSTableView *)tv - (void) tableView:(NSTableView *)tv
setObjectValue:(id)newVal setObjectValue:(id)newVal
forTableColumn:(NSTableColumn *)tc forTableColumn:(NSTableColumn *)tc
row:(int)rowIndex row:(NSInteger)rowIndex
{ {
[_bundles replaceObjectAtIndex:rowIndex withObject:newVal]; [_bundles replaceObjectAtIndex:rowIndex withObject:newVal];
[ud setObject:_bundles forKey:BundlesToLoad]; [ud setObject:_bundles forKey:BundlesToLoad];

15
ChangeLog
View file

@ -28,6 +28,21 @@
* EOControl/EOQualifier.m * EOControl/EOQualifier.m
* Tools/gsdoc-model.m * Tools/gsdoc-model.m
fix warnings related to format strings fix warnings related to format strings
* Apps/EOModelEditor/AdaptorsPanel.m
* Apps/EOModelEditor/Preferences.m
* EOAccess/EOAttribute.m
* EOAccess/EOExpressionArray.m
* EOAccess/EORelationship.m
* EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m
* EOAdaptors/SQLiteAdaptor/SQLite3Channel.m
* EOControl/EOCheapArray.m
* EOControl/EOMutableKnownKeyDictionary.m
* EOControl/EOPrivate.h
* EOControl/EOPrivate.m
* EOControl/Makefile.preamble
* GDL2Palette/ConnectionInspector.m
* GDL2Palette/DisplayGroupInspector.m
Fix warnings about conflicting return types or paramters
2013-03-01: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de> 2013-03-01: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* EOControl/EODebug.m * EOControl/EODebug.m

2
EOAccess/EOAttribute.m
View file

@ -389,7 +389,7 @@ RCS_ID("$Id$")
[super dealloc]; [super dealloc];
} }
- (unsigned)hash - (NSUInteger)hash
{ {
return [_name hash]; return [_name hash];
} }

16
EOAccess/EOExpressionArray.m
View file

@ -111,7 +111,7 @@ static SEL eqSel;
} }
/* designated initializer */ /* designated initializer */
- (id) initWithCapacity:(unsigned)capacity - (id) initWithCapacity:(NSUInteger)capacity
{ {
self = [super init]; self = [super init];
_contents = NSZoneMalloc([self zone], sizeof(GSIArray_t)); _contents = NSZoneMalloc([self zone], sizeof(GSIArray_t));
@ -119,9 +119,9 @@ static SEL eqSel;
return self; return self;
} }
- (id) initWithObjects:(id *)objects count:(unsigned)count - (id) initWithObjects:(const id[])objects count:(NSUInteger)count
{ {
int i; NSUInteger i;
self = [self initWithCapacity:count]; self = [self initWithCapacity:count];
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
GSIArrayAddItem(_contents, (GSIArrayItem)objects[i]); GSIArrayAddItem(_contents, (GSIArrayItem)objects[i]);
@ -385,12 +385,12 @@ if it's a string return NO
} }
/* These are *this* subclasses responsibility */ /* These are *this* subclasses responsibility */
- (unsigned) count - (NSUInteger) count
{ {
return GSIArrayCount(_contents); return GSIArrayCount(_contents);
} }
- (id) objectAtIndex:(unsigned) index - (id) objectAtIndex:(NSUInteger) index
{ {
if (index >= GSIArrayCount(_contents)) if (index >= GSIArrayCount(_contents))
[self _raiseRangeExceptionWithIndex:index from:_cmd]; [self _raiseRangeExceptionWithIndex:index from:_cmd];
@ -410,7 +410,7 @@ if it's a string return NO
GSIArrayAddItem(_contents, (GSIArrayItem)object); GSIArrayAddItem(_contents, (GSIArrayItem)object);
} }
- (void) replaceObjectAtIndex:(unsigned)index withObject:(id)object - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)object
{ {
if (object == nil) if (object == nil)
{ {
@ -427,7 +427,7 @@ if it's a string return NO
GSIArraySetItemAtIndex(_contents, (GSIArrayItem)object, index); GSIArraySetItemAtIndex(_contents, (GSIArrayItem)object, index);
} }
- (void) insertObject:(id)object atIndex:(unsigned)index - (void) insertObject:(id)object atIndex:(NSUInteger)index
{ {
if (object == nil) if (object == nil)
{ {
@ -443,7 +443,7 @@ if it's a string return NO
GSIArrayInsertItem(_contents, (GSIArrayItem)object, index); GSIArrayInsertItem(_contents, (GSIArrayItem)object, index);
} }
- (void) removeObjectAtIndex:(unsigned)index - (void) removeObjectAtIndex:(NSUInteger)index
{ {
if (index >= GSIArrayCount(_contents)) if (index >= GSIArrayCount(_contents))
{ {

2
EOAccess/EORelationship.m
View file

@ -190,7 +190,7 @@ RCS_ID("$Id$")
[super dealloc]; [super dealloc];
} }
- (unsigned)hash - (NSUInteger)hash
{ {
return [_name hash]; return [_name hash];
} }

4
EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m
View file

@ -646,13 +646,13 @@ vfmaxf (int n, float aFloat, ...)
/* databases table stuff */ /* databases table stuff */
-(int)numberOfItemsInComboBox:(NSComboBox*)cbox -(NSInteger)numberOfItemsInComboBox:(NSComboBox*)cbox
{ {
return [_databases count]; return [_databases count];
} }
- (id)comboBox:(NSComboBox*) cbox - (id)comboBox:(NSComboBox*) cbox
objectValueForItemAtIndex:(int)row objectValueForItemAtIndex:(NSInteger)row
{ {
return [_databases objectAtIndex:row]; return [_databases objectAtIndex:row];
} }

10
EOAdaptors/SQLiteAdaptor/SQLite3Channel.m
View file

@ -188,11 +188,11 @@ static id newNumberValue(const char *data, EOAttribute *attrib)
[self evaluateExpression:expr]; [self evaluateExpression:expr];
} }
- (unsigned)deleteRowsDescribedByQualifier: (EOQualifier *)qualifier - (NSUInteger)deleteRowsDescribedByQualifier: (EOQualifier *)qualifier
entity: (EOEntity *)entity entity: (EOEntity *)entity
{ {
EOSQLExpression *sqlexpr = nil; EOSQLExpression *sqlexpr = nil;
unsigned rows = 0; NSUInteger rows = 0;
SQLite3Context *adaptorContext; SQLite3Context *adaptorContext;
NSAssert([self isOpen], @"channel is not open"); NSAssert([self isOpen], @"channel is not open");
@ -207,7 +207,7 @@ static id newNumberValue(const char *data, EOAttribute *attrib)
[self evaluateExpression: sqlexpr]; [self evaluateExpression: sqlexpr];
rows = (unsigned)sqlite3_changes(_sqlite3Conn); rows = (NSUInteger)sqlite3_changes(_sqlite3Conn);
return rows; return rows;
} }
@ -449,7 +449,7 @@ static id newNumberValue(const char *data, EOAttribute *attrib)
return AUTORELEASE([ret copy]); return AUTORELEASE([ret copy]);
} }
- (unsigned int) updateValues:(NSDictionary *)values - (NSUInteger) updateValues:(NSDictionary *)values
inRowsDescribedByQualifier:(EOQualifier *)qualifier inRowsDescribedByQualifier:(EOQualifier *)qualifier
entity:(EOEntity *)ent entity:(EOEntity *)ent
{ {
@ -466,7 +466,7 @@ entity:(EOEntity *)ent
qualifier:qualifier qualifier:qualifier
entity:ent]; entity:ent];
[self evaluateExpression:expr]; [self evaluateExpression:expr];
return sqlite3_changes(_sqlite3Conn); return (NSUInteger)sqlite3_changes(_sqlite3Conn);
} }
- (NSArray *) describeTableNames - (NSArray *) describeTableNames

6
EOControl/EOCheapArray.m
View file

@ -81,7 +81,7 @@ RCS_ID("$Id$")
return self; return self;
} }
- (id) initWithObjects: (id*)objects - (id) initWithObjects: (const id[])objects
count: (NSUInteger)count count: (NSUInteger)count
{ {
#ifdef DEBUG #ifdef DEBUG
@ -153,7 +153,7 @@ RCS_ID("$Id$")
return [super autorelease]; return [super autorelease];
} }
- (void) release - (oneway void) release
{ {
#ifdef DEBUG #ifdef DEBUG
NSDebugFLog(@"Release EOCheapCopyArray %p. %@ [super retainCount]=%d", NSDebugFLog(@"Release EOCheapCopyArray %p. %@ [super retainCount]=%d",
@ -217,7 +217,7 @@ RCS_ID("$Id$")
return self; return self;
} }
- (id) initWithObjects: (id*)objects - (id) initWithObjects: (const id[])objects
count: (NSUInteger)count count: (NSUInteger)count
{ {
self = [self initWithCapacity: count]; self = [self initWithCapacity: count];

6
EOControl/EOMutableKnownKeyDictionary.m
View file

@ -91,7 +91,7 @@ RCS_ID("$Id$")
initWithKeys: keys]; initWithKeys: keys];
} }
- (id)initWithKeys: (id*)keys - (id)initWithKeys: (const id[])keys
count: (NSUInteger)count count: (NSUInteger)count
{ {
if ((self = [self init])) if ((self = [self init]))
@ -752,8 +752,8 @@ RCS_ID("$Id$")
} }
// This is the designated initializer // This is the designated initializer
- (id) initWithObjects: (id*)objects - (id) initWithObjects: (const id[])objects
forKeys: (id*)keys forKeys: (const id[])keys
count: (NSUInteger)count count: (NSUInteger)count
{ {
//OK //OK

4
EOControl/EOPrivate.m
View file

@ -523,9 +523,9 @@ static SEL eqSel;
return self; return self;
} }
- (id) initWithObjects:(id *)objects count:(NSUInteger)count - (id) initWithObjects:(const id[])objects count:(NSUInteger)count
{ {
int i; NSUInteger i;
self = [self initWithCapacity:count]; self = [self initWithCapacity:count];
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
GSIArrayAddItem(_contents, (GSIArrayItem)objects[i]); GSIArrayAddItem(_contents, (GSIArrayItem)objects[i]);

6
GDL2Palette/ConnectionInspector.m
View file

@ -600,8 +600,8 @@
[NSApp displayConnectionBetween:object and:[_currentConnector destination]]; [NSApp displayConnectionBetween:object and:[_currentConnector destination]];
} }
- (int) browser:(NSBrowser *)browser - (NSInteger) browser:(NSBrowser *)browser
numberOfRowsInColumn:(int)column numberOfRowsInColumn:(NSInteger)column
{ {
id repObj = [[popUp selectedItem] representedObject]; id repObj = [[popUp selectedItem] representedObject];
if (browser == oaBrowser) if (browser == oaBrowser)
@ -656,7 +656,7 @@ numberOfRowsInColumn:(int)column
} }
- (void) browser:(NSBrowser *)sender - (void) browser:(NSBrowser *)sender
willDisplayCell:(id)cell atRow:(int)row column:(int)column willDisplayCell:(id)cell atRow:(NSInteger)row column:(NSInteger)column
{ {
id repObj = [[popUp selectedItem] representedObject]; id repObj = [[popUp selectedItem] representedObject];
// FIXME -objectKeysTaken // FIXME -objectKeysTaken

7
GDL2Palette/DisplayGroupInspector.m
View file

@ -92,13 +92,14 @@
} }
} }
- (int) numberOfRowsInTableView:(NSTableView *)tv - (NSInteger) numberOfRowsInTableView:(NSTableView *)tv
{ {
return [_localKeys count]; return [_localKeys count];
} }
- (id) tableView:(NSTableView *)tv objectValueForTableColumn:(NSTableColumn *)tc - (id) tableView:(NSTableView *)tv
row:(int)row objectValueForTableColumn:(NSTableColumn *)tc
row:(NSInteger)row
{ {
return [_localKeys objectAtIndex:row]; return [_localKeys objectAtIndex:row];
} }