* 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


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@36241 72102866-910b-0410-8b05-ffd578937521

Apps/EOModelEditor/AdaptorsPanel.m

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

Apps/EOModelEditor/Preferences.m

@@ -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;
 }
 
-- (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];
   return ov;
@@ -198,7 +200,7 @@ static NSString *_switches[][2] =
 - (void) tableView:(NSTableView *)tv
 setObjectValue:(id)newVal
 forTableColumn:(NSTableColumn *)tc
-           row:(int)rowIndex
+           row:(NSInteger)rowIndex
 {
   [_bundles replaceObjectAtIndex:rowIndex withObject:newVal];
   [ud setObject:_bundles forKey:BundlesToLoad];

ChangeLog

@@ -28,6 +28,21 @@
 	* EOControl/EOQualifier.m
 	* Tools/gsdoc-model.m
 	  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>
 	* EOControl/EODebug.m

EOAccess/EOAttribute.m

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

EOAccess/EOExpressionArray.m

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

EOAccess/EORelationship.m

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

EOAdaptors/PostgreSQLAdaptor/LoginPanel/PostgreSQLLoginPanel.m

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

EOAdaptors/SQLiteAdaptor/SQLite3Channel.m

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

EOControl/EOCheapArray.m

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

EOControl/EOMutableKnownKeyDictionary.m

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

EOControl/EOPrivate.m

@@ -523,9 +523,9 @@ static SEL eqSel;
   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];
   for (i = 0; i < count; i++)
     GSIArrayAddItem(_contents, (GSIArrayItem)objects[i]);

GDL2Palette/ConnectionInspector.m

@@ -600,8 +600,8 @@
   [NSApp displayConnectionBetween:object and:[_currentConnector destination]];
 }
 
-- (int) browser:(NSBrowser *)browser
-numberOfRowsInColumn:(int)column
+- (NSInteger) browser:(NSBrowser *)browser
+ numberOfRowsInColumn:(NSInteger)column
 {
   id repObj = [[popUp selectedItem] representedObject];
   if (browser == oaBrowser)
@@ -656,7 +656,7 @@ numberOfRowsInColumn:(int)column
 }
 
 - (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];
   // FIXME -objectKeysTaken

GDL2Palette/DisplayGroupInspector.m

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