$OpenBSD$
--- GormCore/GormClassInspector.m.orig	Mon Apr  9 19:14:12 2012
+++ GormCore/GormClassInspector.m	Mon Apr  9 19:15:53 2012
@@ -508,7 +508,7 @@ objectValueForTableColumn: (NSTableColumn *)tc
 {
   NSArray *list = [classManager allClassNames];
   NSString *stringValue = [searchText stringValue];
-  int index = [list indexOfObject: stringValue];
+  NSUInteger index = [list indexOfObject: stringValue];
 
   NSLog(@"Search... %@",[searchText stringValue]);
   if(index != NSNotFound && list != nil && 
$OpenBSD$
--- GormCore/GormClassManager.m.orig	Mon Apr  9 19:16:14 2012
+++ GormCore/GormClassManager.m	Mon Apr  9 19:16:48 2012
@@ -1117,7 +1117,7 @@
 
   if (classInfo != nil && [classInformation objectForKey: name] == nil)
     {
-      int index = 0;
+      NSUInteger index = 0;
       NSArray *subclasses = [self subClassesOf: oldName];
 
       RETAIN(classInfo); // prevent loss of the information...
$OpenBSD$
--- GormCore/GormDocument.m.orig	Mon Apr  9 19:17:52 2012
+++ GormCore/GormDocument.m	Mon Apr  9 19:18:07 2012
@@ -2490,7 +2490,7 @@ static void _real_close(GormDocument *self,
     {
       NSTableView *tv = (NSTableView *)[[(NSTableColumn*)object dataCell] controlView];
       NSTableHeaderView *th =  [tv headerView];
-      int index;
+      NSUInteger index;
 
       if (th == nil || tv == nil)
 	{
$OpenBSD$
--- GormCore/GormGenericEditor.m.orig	Mon Apr  9 19:20:07 2012
+++ GormCore/GormGenericEditor.m	Mon Apr  9 19:22:42 2012
@@ -245,10 +245,10 @@
  */
 - (NSRect) rectForObject: (id)anObject
 {
-  unsigned	pos = [objects indexOfObjectIdenticalTo: anObject];
+  NSUInteger	pos = [objects indexOfObjectIdenticalTo: anObject];
   NSRect	rect;
-  int		r;
-  int		c;
+  NSUInteger	r;
+  NSUInteger	c;
 
   if (pos == NSNotFound)
     return NSZeroRect;
@@ -317,7 +317,7 @@
 
 - (void) removeObject: (id)anObject
 {
-  unsigned	pos;
+  NSUInteger	pos;
 
   pos = [objects indexOfObjectIdenticalTo: anObject];
   if (pos == NSNotFound)
$OpenBSD$
--- GormCore/GormObjectInspector.m.orig	Mon Apr  9 19:22:53 2012
+++ GormCore/GormObjectInspector.m	Mon Apr  9 19:25:30 2012
@@ -103,7 +103,7 @@ selectCellWithString: (NSString*)title
 - (void) ok: (id)sender
 {
   NSString	*name = [[browser selectedCell] stringValue];
-  unsigned	pos;
+  NSUInteger	pos;
 
   if (name == nil || (pos = [sets indexOfObject: name]) == NSNotFound)
     {
@@ -331,7 +331,7 @@ selectCellWithString: (NSString*)title
 - (void) update: (id)sender
 {
   NSString	*name = [[browser selectedCell] stringValue];
-  unsigned	pos;
+  NSUInteger	pos;
 
   isString = NO;
   if (name == nil || (pos = [sets indexOfObject: name]) == NSNotFound)
$OpenBSD$
--- GormCore/GormOutlineView.m.orig	Mon Apr  9 19:25:43 2012
+++ GormCore/GormOutlineView.m	Mon Apr  9 19:28:11 2012
@@ -227,7 +227,7 @@ static NSColor *darkGreyBlueColor = nil;
 {
   int numchildren = 0;
   int i = 0;
-  int insertionPoint = 0;
+  NSUInteger insertionPoint = 0;
   id object = nil;
   id sitem = (item == nil)?((id)[NSNull null]):((id)item);
 
@@ -269,7 +269,7 @@ static NSColor *darkGreyBlueColor = nil;
 {
   int numchildren = 0;
   int i = 0;
-  int insertionPoint = 0;
+  NSUInteger insertionPoint = 0;
   id object = nil;
   id sitem = (item == nil)?((id)[NSNull null]):((id)item);
 
$OpenBSD$
--- GormCore/GormPrivate.h.orig	Fri Dec 16 18:26:10 2011
+++ GormCore/GormPrivate.h	Tue Apr 10 09:47:50 2012
@@ -99,7 +99,7 @@ extern NSString *GormResizeCellNotification;
 
 + (int) formatCount;
 + (NSString *) formatAtIndex: (int)index;
-+ (int) indexOfFormat: (NSString *) format;
++ (NSInteger) indexOfFormat: (NSString *) format;
 + (NSString *) defaultFormat;
 + (id) defaultFormatValue;
 
@@ -114,7 +114,7 @@ extern NSString *GormResizeCellNotification;
 + (NSString *) negativeFormatAtIndex: (int)index;
 + (NSDecimalNumber *) positiveValueAtIndex: (int)index;
 + (NSDecimalNumber *) negativeValueAtIndex: (int)index;
-+ (int) indexOfFormat: (NSString *)format;
++ (NSInteger) indexOfFormat: (NSString *)format;
 + (NSString *) defaultFormat;
 + (id) defaultFormatValue;
 - (NSString *) zeroFormat;
$OpenBSD$
--- GormCore/GormPrivate.m.orig	Mon Apr  9 19:28:21 2012
+++ GormCore/GormPrivate.m	Mon Apr  9 19:29:56 2012
@@ -127,7 +127,7 @@ static BOOL _isInInterfaceBuilder = NO;
     }
   else
     {
-      int version = [aCoder versionForClassName: 
+      NSInteger version = [aCoder versionForClassName: 
 			      NSStringFromClass([GSNibItem class])];
       int cv = [aCoder versionForClassName:
 			 NSStringFromClass([GSNibContainer class])];
$OpenBSD$
--- Palettes/0Menus/GormMenuEditor.m.orig	Mon Apr  9 19:30:39 2012
+++ Palettes/0Menus/GormMenuEditor.m	Mon Apr  9 19:34:10 2012
@@ -895,7 +895,7 @@ void _attachAll(NSMenu *menu, id document)
 {
   if ([anArray isEqual: selection] == NO)
     {
-      unsigned		count;
+      NSUInteger	count;
       NSMenuItem	*item;
 
       [selection removeAllObjects];
$OpenBSD$
--- Palettes/1Windows/GormDrawerAttributesInspector.m.orig	Mon Apr  9 19:35:32 2012
+++ Palettes/1Windows/GormDrawerAttributesInspector.m	Mon Apr  9 19:37:54 2012
@@ -52,7 +52,7 @@
 - (void) revert: (id) sender
 {
   id drawer = [self object];
-  int i = [preferredEdge indexOfItemWithTag: [drawer preferredEdge]];
+  NSInteger i = [preferredEdge indexOfItemWithTag: [drawer preferredEdge]];
   if(i != NSNotFound)
     {
       [preferredEdge selectItemAtIndex: i];
$OpenBSD$
--- Palettes/3Containers/GormTableColumnAttributesInspector.m.orig	Mon Apr  9 19:40:10 2012
+++ Palettes/3Containers/GormTableColumnAttributesInspector.m	Mon Apr  9 19:41:27 2012
@@ -232,7 +232,7 @@
 {
   NSArray *list;
   NSString *cellClassName;
-  int index;
+  NSUInteger index;
 
   if ( object == nil ) 
     return;
@@ -241,7 +241,7 @@
   cellClassName = [self _getCellClassName];
   index =  [list indexOfObject: cellClassName];
 
-  if(index != NSNotFound && index != -1)
+  if(index != NSNotFound)
     {
       [cellTable selectRow: index byExtendingSelection: NO];
       [cellTable scrollRowToVisible: index];
$OpenBSD$
--- Palettes/3Containers/GormTableViewEditor.m.orig	Mon Apr  9 19:38:04 2012
+++ Palettes/3Containers/GormTableViewEditor.m	Mon Apr  9 19:39:53 2012
@@ -363,7 +363,7 @@ static NSText *_textObject;
   NSTableColumn *tc;
   NSRect drawingRect;
 
-  int columnIndex = [th columnAtPoint: 
+  NSInteger columnIndex = [th columnAtPoint: 
 			  [th convertPoint:[theEvent locationInWindow]
 			      fromView: nil]];
   
$OpenBSD$
--- Palettes/4Data/DataPalette.m.orig	Mon Apr  9 19:44:17 2012
+++ Palettes/4Data/DataPalette.m	Mon Apr  9 19:44:55 2012
@@ -89,7 +89,7 @@ int defaultNumberFormatIndex = 0;
                 [[predefinedNumberFormats objectAtIndex:i] objectAtIndex:2] ];
 }
 
-+ (int) indexOfFormat: (NSString *) format
++ (NSInteger) indexOfFormat: (NSString *) format
 {
   int i;
   NSString *fmt;
@@ -148,7 +148,7 @@ int defaultDateFormatIndex = 3;
   return [predefinedDateFormats objectAtIndex: index];
 }
 
-+ (int) indexOfFormat: (NSString *) format
++ (NSInteger) indexOfFormat: (NSString *) format
 {
   return [predefinedDateFormats indexOfObject: format];
 }
$OpenBSD$
--- Palettes/4Data/GormDateFormatterAttributesInspector.m.orig	Mon Apr  9 19:42:03 2012
+++ Palettes/4Data/GormDateFormatterAttributesInspector.m	Mon Apr  9 19:46:43 2012
@@ -81,7 +81,7 @@ extern NSArray *predefinedDateFormats;
         }
       else if (sender == formatField)
         {
-          int idx;
+          NSInteger idx;
           
           dateFmt = [sender stringValue];
 
@@ -118,7 +118,7 @@ extern NSArray *predefinedDateFormats;
 
 - (void) revert: (id)sender
 {
-  int idx;
+  NSInteger idx;
   NSDateFormatter *fmtr = [[object cell] formatter];
   
   // If the string typed is a predefined one then highligh it in
$OpenBSD$
--- Palettes/4Data/GormNumberFormatterAttributesInspector.m.orig	Mon Apr  9 19:46:52 2012
+++ Palettes/4Data/GormNumberFormatterAttributesInspector.m	Mon Apr  9 19:48:10 2012
@@ -113,7 +113,7 @@ extern NSArray *predefinedNumberFormats;
          }
       else if (sender == formatForm)
         {
-          int idx;
+          NSInteger idx;
           
           positiveFmt = [[sender cellAtIndex:0] stringValue];
           zeroFmt = [[sender cellAtIndex:1] stringValue];
@@ -181,7 +181,7 @@ extern NSArray *predefinedNumberFormats;
 
 - (void) revert: (id)sender
 {
-  int idx;
+  NSInteger idx;
   NSNumberFormatter *fmtr = [[object cell] formatter];
 
   // Format form
$OpenBSD$
--- Plugins/Gorm/GormGormWrapperLoader.m.orig	Mon Apr  9 19:48:24 2012
+++ Plugins/Gorm/GormGormWrapperLoader.m	Mon Apr  9 19:49:58 2012
@@ -345,7 +345,7 @@
       NSDictionary              *substituteClasses = [palettesManager substituteClasses];
       NSEnumerator              *en = [substituteClasses keyEnumerator];
       NSString                  *subClassName = nil;
-      unsigned int           	version = NSNotFound;
+      NSUInteger           	version = NSNotFound;
       NSDictionary              *fileWrappers = nil;
       GSNibContainer            *container;
       NSArray                   *visible;
$OpenBSD$
--- Plugins/Nib/GormNibWrapperLoader.m.orig	Mon Apr  9 19:50:08 2012
+++ Plugins/Nib/GormNibWrapperLoader.m	Mon Apr  9 19:51:08 2012
@@ -264,7 +264,7 @@
 			{
 			  NSString *tag = [o label];
 			  NSRange colonRange = [tag rangeOfString: @":"];
-			  unsigned int location = colonRange.location;
+			  NSUInteger location = colonRange.location;
 			  
 			  if(location == NSNotFound)
 			    {