int -> NSInteger transition.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@37359 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,40 @@
+2013-11-04 10:03-EST Gregory John Casamento <greg.casamento@gmail.com>
+
+	* GormCore/GormBoxEditor.m
+	* GormCore/GormClassEditor.m
+	* GormCore/GormClassInspector.m
+	* GormCore/GormClassManager.m
+	* GormCore/GormControlEditor.m
+	* GormCore/GormCustomView.m
+	* GormCore/GormDocument.m
+	* GormCore/GormDocumentWindow.m
+	* GormCore/GormFilePrefsManager.h
+	* GormCore/GormFilePrefsManager.m
+	* GormCore/GormFunctions.h
+	* GormCore/GormFunctions.m
+	* GormCore/GormInspectorsManager.m
+	* GormCore/GormInternalViewEditor.m
+	* GormCore/GormMatrixEditor.h
+	* GormCore/GormMatrixEditor.m
+	* GormCore/GormNSPanel.h
+	* GormCore/GormNSPanel.m
+	* GormCore/GormNSWindow.h
+	* GormCore/GormNSWindow.m
+	* GormCore/GormObjectEditor.m
+	* GormCore/GormObjectInspector.m
+	* GormCore/GormOutlineView.m
+	* GormCore/GormPrivate.h
+	* GormCore/GormPrivate.m
+	* GormCore/GormResourceEditor.m
+	* GormCore/GormResourceManager.m
+	* GormCore/GormSoundView.m
+	* GormCore/GormSplitViewEditor.m
+	* GormCore/GormStandaloneViewEditor.m
+	* GormCore/GormViewEditor.m
+	* GormCore/GormViewKnobs.m
+	* GormCore/GormViewWithContentViewEditor.m
+	* GormCore/GormViewWithSubviewsEditor.m: int -> NSInteger transition.
+
 2013-10-26 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Plugins/Nib/GormNibWrapperBuilder.m (-initWithDocument:):

GormCore/GormBoxEditor.m

@@ -99,8 +99,8 @@
 
 - (void) deleteSelection
 {
-  int i = 0;
+  NSInteger i = 0;
-  int count = [selection count];
+  NSInteger count = [selection count];
   id temp = nil;
   
   for (i = count - 1; i >= 0; i--)

GormCore/GormClassEditor.m

@@ -273,7 +273,7 @@ NSImage *browserImage = nil;
     {
       if([classesView contentView] == scrollView)
 	{
-	  int row =  [outlineView selectedRow];	  
+	  NSInteger row =  [outlineView selectedRow];	  
 	  if ( row == -1 ) 
 	    {
 	      row = 0;
@@ -314,7 +314,7 @@ NSImage *browserImage = nil;
       NSMutableArray *subClassesArray = [NSMutableArray array];
       NSEnumerator	 *en;
       int		 row = 0;
-      int            col = 0;
+      NSInteger            col = 0;
       
       if ( ( className != nil )  
 	   && ( [className isEqual: @"CustomView"] == NO )
@@ -426,7 +426,7 @@ NSImage *browserImage = nil;
 
   if([classesView contentView] == scrollView)
     {
-      int i = [outlineView selectedRow];
+      NSInteger i = [outlineView selectedRow];
       
       if (i >= 0 && i <= ([outlineView numberOfRows] - 1))
 	{
@@ -507,7 +507,7 @@ NSImage *browserImage = nil;
 - (void) deleteSelection
 {
   id anitem;
-  int i = [outlineView selectedRow];
+  NSInteger i = [outlineView selectedRow];
   NSNotificationCenter	*nc = [NSNotificationCenter defaultCenter];
   
   // if no selection, then return.
@@ -820,7 +820,7 @@ NSImage *browserImage = nil;
 					 itemSelected];
 	  if(newClassName != nil)
 	    {
-	      int i = 0;
+	      NSInteger i = 0;
 	      if([classesView contentView] == scrollView)
 		{
 		  [outlineView reloadData];
@@ -1171,7 +1171,7 @@ objectValueForTableColumn: (NSTableColumn *)aTableColumn
 	  rename = [document renameConnectionsForClassNamed: item toName: anObject];
 	  if (rename)
 	    {
-	      int row = 0;
+	      NSInteger row = 0;
 
 	      [classManager renameClassNamed: item newName: anObject];
 	      [gov reloadData];
@@ -1309,7 +1309,7 @@ shouldEditTableColumn: (NSTableColumn *)tableColumn
 - (void) outlineViewSelectionDidChange: (NSNotification *)notification
 {
   id object = [notification object];
-  int row = [object selectedRow];
+  NSInteger row = [object selectedRow];
 
   if(row != -1)
     {
@@ -1339,7 +1339,7 @@ shouldEditTableColumn: (NSTableColumn *)tableColumn
   NSArray      *classes = nil;
   NSEnumerator *en = nil;
   NSString     *className = nil;
-  int          i = 0;
+  NSInteger          i = 0;
 
   if (sender != browserView || !matrix || ![matrix isKindOfClass:[NSMatrix class]])
     {

GormCore/GormClassInspector.m

@@ -538,7 +538,7 @@ objectValueForTableColumn: (NSTableColumn *)tc
 	    {
 	      if([classManager isCustomClass: name])
 		{
-		  NSString *title = [NSString stringWithFormat: _(@"Modifying/Reparenting Class")];
+		  NSString *title = _(@"Modifying/Reparenting Class");
 		  NSString *msg = [NSString stringWithFormat: _(@"This action may break existing connections "
 								@"to instances of class '%@'"
 								@"and it's subclasses.  Continue?"), name];
@@ -644,8 +644,8 @@ objectValueForTableColumn: (NSTableColumn *)tc
 
 - (void) setObject: (id)anObject
 {
-  int outletsCount = 0;
+  NSInteger outletsCount = 0;
-  int actionsCount = 0;
+  NSInteger actionsCount = 0;
   NSTabViewItem *item = nil;
 
   if([anObject isKindOfClass: [GormClassProxy class]])
@@ -658,9 +658,9 @@ objectValueForTableColumn: (NSTableColumn *)tc
       actionsCount = [[classManager allActionsForClassNamed: currentClass] count];
       
       item = [tabView tabViewItemAtIndex: 1]; // actions;
-      [item setLabel: [NSString stringWithFormat: @"Actions (%d)",actionsCount]];
+      [item setLabel: [NSString stringWithFormat: @"Actions (%ld)",actionsCount]];
       item = [tabView tabViewItemAtIndex: 0]; // outlets;
-      [item setLabel: [NSString stringWithFormat: @"Outlets (%d)",outletsCount]];
+      [item setLabel: [NSString stringWithFormat: @"Outlets (%ld)",outletsCount]];
       [tabView setNeedsDisplay: YES];
       
       [self _refreshView];

GormCore/GormClassManager.m

@@ -171,11 +171,11 @@
 - (NSString *) uniqueClassNameFrom: (NSString *)name
 {
   NSString *search = [NSString stringWithString: name];
-  int i = 1;
+  NSInteger i = 1;
 
   while([classInformation objectForKey: search])
     {
-      search = [name stringByAppendingString: [NSString stringWithFormat: @"%d",i++]];
+      search = [name stringByAppendingString: [NSString stringWithFormat: @"%ld",i++]];
     }
 
   return search;
@@ -220,11 +220,11 @@
   NSString *newAction = @"newAction";
   NSString *search = [newAction stringByAppendingString: @":"];
   NSString *new = nil; 
-  int i = 1;
+  NSInteger i = 1;
 
   while ([combined containsObject: search])
     {
-      new = [newAction stringByAppendingFormat: @"%d", i++];
+      new = [newAction stringByAppendingFormat: @"%ld", i++];
       search = [new stringByAppendingString: @":"];
     }
 
@@ -237,11 +237,11 @@
   NSArray *combined = [self allOutletsForClassNamed: name];
   NSString *newOutlet = @"newOutlet";
   NSString *new = newOutlet;
-  int i = 1;
+  NSInteger i = 1;
 
   while ([combined containsObject: new])
     {
-      new = [newOutlet stringByAppendingFormat: @"%d", i++];
+      new = [newOutlet stringByAppendingFormat: @"%ld", i++];
     }
 
   [self addOutlet: new forClassNamed: name];
@@ -447,19 +447,19 @@
   // replace the action in the appropriate places.
   if ([extraActions containsObject: oldAction])
     {
-      int extra_index = [extraActions indexOfObject: oldAction];
+      NSInteger extra_index = [extraActions indexOfObject: oldAction];
       [extraActions replaceObjectAtIndex: extra_index withObject: newAction];
     }
 
   if ([actions containsObject: oldAction])
     {
-      int actions_index = [actions indexOfObject: oldAction];
+      NSInteger actions_index = [actions indexOfObject: oldAction];
       [actions replaceObjectAtIndex: actions_index withObject: newAction];
     }
 
   if ([allActions containsObject: oldAction])
     {
-      int all_index = [allActions indexOfObject: oldAction];
+      NSInteger all_index = [allActions indexOfObject: oldAction];
       [allActions replaceObjectAtIndex: all_index withObject: newAction];
     }
 
@@ -498,19 +498,19 @@
   // replace outlets in appropriate places...
   if ([extraOutlets containsObject: oldOutlet])
     {
-      int extraIndex = [extraOutlets indexOfObject: oldOutlet];
+      NSInteger extraIndex = [extraOutlets indexOfObject: oldOutlet];
       [extraOutlets replaceObjectAtIndex: extraIndex withObject: newOutlet];
     }
 
   if ([outlets containsObject: oldOutlet])
     {
-      int outletsIndex = [outlets indexOfObject: oldOutlet];
+      NSInteger outletsIndex = [outlets indexOfObject: oldOutlet];
       [outlets replaceObjectAtIndex: outletsIndex withObject: newOutlet];
     }
 
   if ([allOutlets containsObject: oldOutlet])
     {
-      int allIndex = [allOutlets indexOfObject: oldOutlet];
+      NSInteger allIndex = [allOutlets indexOfObject: oldOutlet];
       [allOutlets replaceObjectAtIndex: allIndex withObject: newOutlet];
     }
 
@@ -1921,7 +1921,7 @@
 						    @"actions/outlets to instances of class '%@' "
 						    @"and it's subclasses.  Continue?"), 
 						className];
-		      int retval = NSRunAlertPanel(title, msg,_(@"OK"),_(@"Cancel"), nil, nil);
+		      NSInteger retval = NSRunAlertPanel(title, msg,_(@"OK"),_(@"Cancel"), nil, nil);
 
 		      if (retval == NSAlertDefaultReturn)
 			{
@@ -2227,11 +2227,11 @@
   NSArray *classNames = [self allClassNames];
   NSEnumerator *en = [classNames objectEnumerator];
   NSString *className = nil;
-  int namelen = [name length];
+  NSInteger namelen = [name length];
 
   while((className = [en nextObject]) != nil)
     {
-      int classlen = [className length];
+      NSInteger classlen = [className length];
       if(namelen < classlen)
 	{
 	  NSComparisonResult result = 

GormCore/GormControlEditor.m

@@ -64,8 +64,8 @@
 {
   NSSize size = [self frame].size;
   NSSize constrainedSize;
-  int col;
+  NSInteger col;
-  int row;
+  NSInteger row;
   
   if (gpi->firstPass == NO)
     [gpi->resizingIn displayRect: gpi->oldRect];
@@ -208,10 +208,10 @@
   float rightOfFrame;
   float topOfFrame;
   float bottomOfFrame;
-  int i;
+  NSInteger i;
-  int count;
+  NSInteger count;
-  int lastDistance;
+  NSInteger lastDistance;
-  int minimum = 10;
+  NSInteger minimum = 10;
   BOOL leftEmpty = YES;
   BOOL rightEmpty = YES;
   BOOL topEmpty = YES;
@@ -555,8 +555,8 @@
     {
       NSSize cellSize = [self frame].size;
       id editor;
-      int col;
+      NSInteger col;
-      int row;
+      NSInteger row;
       NSMatrix *matrix;
 
       col = gpi->lastFrame.size.width / cellSize.width;

GormCore/GormCustomView.m

@@ -202,7 +202,7 @@
     }
   else
     {
-      int version = [aCoder versionForClassName: 
+      NSInteger version = [aCoder versionForClassName: 
 			      NSStringFromClass([GSCustomView class])];
       
       if (version == 1)
@@ -279,12 +279,12 @@
 {
   id		obj;
   Class		cls;
-  unsigned int      mask;
+  NSUInteger    mask;
   GormClassManager *classManager = [(id<Gorm>)NSApp classManager];
   
   [aCoder decodeValueOfObjCType: @encode(id) at: &theClass];
   theFrame = [aCoder decodeRect];
-  [aCoder decodeValueOfObjCType: @encode(unsigned int) 
+  [aCoder decodeValueOfObjCType: @encode(NSUInteger) 
 	  at: &mask];
   
   cls = NSClassFromString(theClass);

GormCore/GormDocument.m

@@ -455,12 +455,12 @@ static NSImage  *fileImage = nil;
     {
       if([filePrefsManager loadFromData: infoData])
 	{
-	  int version = [filePrefsManager version];
+	  NSInteger version = [filePrefsManager version];
-	  int currentVersion = [GormFilePrefsManager currentVersion];
+	  NSInteger currentVersion = [GormFilePrefsManager currentVersion];
 	  
 	  if(version > currentVersion)
 	    {
-	      int retval = NSRunAlertPanel(_(@"Gorm Build Mismatch"),
+	      NSInteger retval = NSRunAlertPanel(_(@"Gorm Build Mismatch"),
 					   _(@"The file being loaded was created with a newer build, continue?"), 
 					   _(@"OK"), 
 					   _(@"Cancel"), 
@@ -755,8 +755,8 @@ static NSImage  *fileImage = nil;
       if ([[anObject documentView] isKindOfClass: 
 				    [NSTableView class]])
 	{
-	  int i;
+	  NSInteger i;
-	  int count;
+	  NSInteger count;
 	  NSArray *tc;
 	  id tv = [anObject documentView];
 	  tc = [tv tableColumns];
@@ -2607,7 +2607,7 @@ static void _real_close(GormDocument *self,
 	{
 	  NSString *title;
 	  NSString *msg;
-	  int retval;
+	  NSInteger retval;
 
 	  if(prompted == NO)
 	    {
@@ -2660,7 +2660,7 @@ static void _real_close(GormDocument *self,
   NSEnumerator *en = nil; 
   id<IBConnectors> c = nil;
   BOOL removed = YES;
-  int retval = -1;
+  NSInteger retval = -1;
   NSString *title = [NSString stringWithFormat: _(@"Modifying Class")];
   NSString *msg;
 
@@ -2773,7 +2773,7 @@ static void _real_close(GormDocument *self,
   NSEnumerator *en = [connections objectEnumerator];
   id<IBConnectors> c = nil;
   BOOL renamed = YES;
-  int retval = -1;
+  NSInteger retval = -1;
   NSString *title = [NSString stringWithFormat: _(@"Modifying Class")];
   NSString *msg = [NSString stringWithFormat: 
 			      _(@"Change class name '%@' to '%@'.  Continue?"),
@@ -3215,7 +3215,7 @@ static void _real_close(GormDocument *self,
 - (void) arrangeSelectedObjects: (id)sender
 {
   NSArray *selection =  [[(id<IB>)NSApp selectionOwner] selection];
-  int tag = [sender tag];
+  NSInteger tag = [sender tag];
   NSEnumerator *en = [selection objectEnumerator];
   id v = nil;
 
@@ -3247,7 +3247,7 @@ static void _real_close(GormDocument *self,
 - (void) alignSelectedObjects: (id)sender
 {
   NSArray *selection =  [[(id<IB>)NSApp selectionOwner] selection];
-  int tag = [sender tag];
+  NSInteger tag = [sender tag];
   NSEnumerator *en = [selection objectEnumerator];
   id v = nil;
   id prev = nil;
@@ -3324,7 +3324,7 @@ static void _real_close(GormDocument *self,
    */
   if(isOlderArchive && [filePrefsManager isLatest])
     {
-      int retval = NSRunAlertPanel(_(@"Compatibility Warning"), 
+      NSInteger retval = NSRunAlertPanel(_(@"Compatibility Warning"), 
 				   _(@"Saving will update this gorm to the latest version \n" 
 				     @"which may not be compatible with some previous versions \n"
 				     @"of GNUstep."),

GormCore/GormDocumentWindow.m

@@ -44,8 +44,8 @@
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
 {
   NSPasteboard *pb = [sender draggingPasteboard];
-  unsigned int mask = [sender draggingSourceOperationMask];
+  NSUInteger mask = [sender draggingSourceOperationMask];
-  unsigned int oper = NSDragOperationNone;
+  NSUInteger oper = NSDragOperationNone;
   dragMgr = [_document resourceManagerForPasteboard:pb];
   
   if (dragMgr)

GormCore/GormFilePrefsManager.h

@@ -13,7 +13,7 @@
   id fileType;
 
   // encoded ivars...
-  int version;
+  NSInteger version;
   NSString *targetVersionName;
   NSString *archiveTypeName;
 

GormCore/GormFilePrefsManager.m

@@ -40,14 +40,14 @@
 #include <GNUstepBase/GSObjCRuntime.h>
 #include <InterfaceBuilder/IBApplicationAdditions.h>
 
-NSString *formatVersion(int version)
+NSString *formatVersion(NSInteger version)
 {
-  int bit16 = 65536;
+  NSInteger bit16 = 65536;
-  int bit8  = 256;
+  NSInteger bit8  = 256;
-  int maj   = 0; 
+  NSInteger maj   = 0; 
-  int min   = 0;
+  NSInteger min   = 0;
-  int pch   = 0;
+  NSInteger pch   = 0;
-  int v     = version;
+  NSInteger v     = version;
 
   // pull the version fromt the number
   maj = (int)((float)v / (float)bit16);
@@ -56,7 +56,7 @@ NSString *formatVersion(int version)
   v -= (bit8 * min);
   pch = v;
   
-  return [NSString stringWithFormat: @"%d.%d.%d / %d",maj,min,pch,version];
+  return [NSString stringWithFormat: @"%ld.%ld.%ld / %ld",maj,min,pch,version];
 }
 
 
@@ -108,8 +108,8 @@ NSString *formatVersion(int version)
     {
       Class cls = NSClassFromString(className);
       NSDictionary *info = [currentProfile objectForKey: className];
-      int v = [[info objectForKey: @"version"] intValue];
+      NSInteger v = [[info objectForKey: @"version"] intValue];
-      NSDebugLog(@"Setting version %d for class %@",v,className);
+      NSDebugLog(@"Setting version %ld for class %@",v,className);
       [cls setVersion: v];
     }
 }
@@ -126,8 +126,8 @@ NSString *formatVersion(int version)
     {
       Class cls = NSClassFromString(className);
       NSDictionary *info = [latestVersion objectForKey: className];
-      int v = [[info objectForKey: @"version"] intValue];
+      NSInteger v = [[info objectForKey: @"version"] intValue];
-      NSDebugLog(@"Setting version %d for class %@",v,className);
+      NSDebugLog(@"Setting version %ld for class %@",v,className);
       [cls setVersion: v];
     }
 }
@@ -208,7 +208,7 @@ NSString *formatVersion(int version)
 
 - (int) versionOfClass: (NSString *)className 
 {
-  int result = -1; 
+  NSInteger result = -1; 
 
   NSDictionary *clsProfile = [currentProfile objectForKey: className];
   if(clsProfile != nil)

GormCore/GormFunctions.h

@@ -44,7 +44,7 @@ void subviewsForView(NSView *view, NSMutableArray *array);
 NSArray *allSubviews(NSView *view);
 
 // cut the file label to the appropriate length...
-NSString *cutFileLabelText(NSString *filename, id label, int length);
+NSString *cutFileLabelText(NSString *filename, id label, NSInteger length);
 
 // get the cell size for all editors
 NSSize defaultCellSize();

GormCore/GormFunctions.m

@@ -106,7 +106,7 @@ NSArray *allSubviews(NSView *view)
 }
 
 // cut the text...  code taken from GWorkspace, by Enrico Sersale
-static inline NSString *cutText(NSString *filename, id label, int lenght)
+static inline NSString *cutText(NSString *filename, id label, NSInteger lenght)
 {
   NSString *cutname = nil;
   NSString *reststr = nil;
@@ -114,7 +114,7 @@ static inline NSString *cutText(NSString *filename, id label, int lenght)
   NSFont *labfont;
   NSDictionary *attr;
   float w, cw, dotslenght;
-  int i;
+  NSInteger i;
   
   cw = 0;
   labfont = [label font];
@@ -164,7 +164,7 @@ static inline NSString *cutText(NSString *filename, id label, int lenght)
   return cutname;
 }
 
-NSString *cutFileLabelText(NSString *filename, id label, int length)
+NSString *cutFileLabelText(NSString *filename, id label, NSInteger length)
 {
   if (length > 0) 
     {
@@ -176,7 +176,7 @@ NSString *cutFileLabelText(NSString *filename, id label, int length)
 NSSize defaultCellSize()
 {
   NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; 
-  int width = [defaults integerForKey: @"CellSizeWidth"];
+  NSInteger width = [defaults integerForKey: @"CellSizeWidth"];
   NSSize size = NSMakeSize(width, 72);
   return size;
 }

GormCore/GormInspectorsManager.m

@@ -249,20 +249,20 @@
 - (void) _refreshPopUp
 {
   NSEnumerator *en = [modes objectEnumerator];
-  int index = 0;
+  NSInteger index = 0;
   id obj = nil;
 
   [popup removeAllItems];
   while((obj = [en nextObject]) != nil)
     {
-      int tag = index + 1;
+      NSInteger tag = index + 1;
       NSMenuItem *item;
       [popup addItemWithTitle: [obj localizedLabel]];
 
       item = (NSMenuItem *)[popup itemAtIndex: index];
       [item setTarget: self];
       [item setAction: @selector(setCurrentInspector:)];
-      [item setKeyEquivalent: [NSString stringWithFormat: @"%d",tag]];
+      [item setKeyEquivalent: [NSString stringWithFormat: @"%ld",tag]];
       [item setTag: tag];
       index++;
     }
@@ -278,7 +278,7 @@
   NSView	*newView = nil;
   NSView	*oldView = nil;
   NSString	*newInspector = nil;
-  int           tag = 0; 
+  NSInteger           tag = 0; 
 
   if (anObj != self)
     {

GormCore/GormInternalViewEditor.m

@@ -274,8 +274,8 @@ static NSImage *horizontalImage;
 
 - (NSArray*) selection
 {
-  int i;
+  NSInteger i;
-  int count = [selection count];
+  NSInteger count = [selection count];
   NSMutableArray *result = [NSMutableArray arrayWithCapacity: count];
   
   if (count != 0)
@@ -295,9 +295,9 @@ static NSImage *horizontalImage;
 
 - (void) deleteSelection
 {
-  int i;
+  NSInteger i;
   NSArray *sel = [selection copy];
-  int count = [sel count];
+  NSInteger count = [sel count];
   
   for (i = count - 1; i >= 0; i--)
     {
@@ -342,8 +342,8 @@ static NSImage *horizontalImage;
 
   // are we on the knob of a selected view ?
   {
-    int count = [selection count];
+    NSInteger count = [selection count];
-    int i;
+    NSInteger i;
     GormViewEditor *knobView = nil;
     IBKnobPosition	knob = IBNoneKnobPosition;
     NSPoint mouseDownPoint;

GormCore/GormMatrixEditor.h

@@ -29,8 +29,8 @@
 @interface GormMatrixEditor : GormViewWithSubviewsEditor
 {
   NSCell* selected;
-  int selectedRow;
+  NSInteger selectedRow;
-  int selectedCol;
+  NSInteger selectedCol;
 }
 @end
 

GormCore/GormMatrixEditor.m

@@ -58,7 +58,7 @@
 
 - (CGFloat)titleWidth
 {
-  int i, count = [self numberOfRows];
+  NSInteger i, count = [self numberOfRows];
   float new_title_width = 0;
   float candidate_title_width = 0;
 
@@ -428,22 +428,22 @@ static BOOL done_editing;
 		   withEvent: (NSEvent *)theEvent
 		     andKnob: (IBKnobPosition) knob
 {
-  int width;
+  NSInteger width;
-  int height;
+  NSInteger height;
       
   if ([theEvent modifierFlags] & NSAlternateKeyMask)
     {
-      int rows = [_EO numberOfRows];
+      NSInteger rows = [_EO numberOfRows];
-      int cols = [_EO numberOfColumns];
+      NSInteger cols = [_EO numberOfColumns];
       NSSize interSize = [_EO intercellSpacing];
       
-      int colWidth = ([_EO frame].size.width - 
+      NSInteger colWidth = ([_EO frame].size.width - 
 		      (cols - 1) * interSize.width) / cols;
-      int rowHeight = ([_EO frame].size.height - 
+      NSInteger rowHeight = ([_EO frame].size.height - 
 		       (rows - 1) * interSize.height) / rows;
 	
-      int widthIncrement = colWidth + interSize.width;
+      NSInteger widthIncrement = colWidth + interSize.width;
-      int heightIncrement = rowHeight + interSize.height;
+      NSInteger heightIncrement = rowHeight + interSize.height;
       
       if (frame.size.width < colWidth)
 	{
@@ -471,8 +471,8 @@ static BOOL done_editing;
     }
   else if ([theEvent modifierFlags] & NSControlKeyMask)
     {
-      int rows = [_EO numberOfRows];
+      NSInteger rows = [_EO numberOfRows];
-      int cols = [_EO numberOfColumns];
+      NSInteger cols = [_EO numberOfColumns];
       NSSize cellSize = [_EO cellSize];
       
       height = width = 0;
@@ -488,8 +488,8 @@ static BOOL done_editing;
     }
   else
     {
-      int rows = [_EO numberOfRows];
+      NSInteger rows = [_EO numberOfRows];
-      int cols = [_EO numberOfColumns];
+      NSInteger cols = [_EO numberOfColumns];
       NSSize interSize = [_EO intercellSpacing];
       
       width = ( frame.size.width - interSize.width * (cols - 1) ) /  cols;
@@ -566,24 +566,24 @@ static BOOL done_editing;
 
   if ([theEvent modifierFlags] & (NSControlKeyMask | NSShiftKeyMask))
     {
-      int rows = [_EO numberOfRows];
+      NSInteger rows = [_EO numberOfRows];
-      int cols = [_EO numberOfColumns];
+      NSInteger cols = [_EO numberOfColumns];
       NSSize interSize = [_EO intercellSpacing];
       
-      int colWidth = ([_EO frame].size.width - 
+      NSInteger colWidth = ([_EO frame].size.width - 
 		      (cols - 1) * interSize.width) / cols;
-      int rowHeight = ([_EO frame].size.height - 
+      NSInteger rowHeight = ([_EO frame].size.height - 
 		       (rows - 1) * interSize.height) / rows;
 	
-      int widthIncrement = colWidth + interSize.width;
+      NSInteger widthIncrement = colWidth + interSize.width;
-      int heightIncrement = rowHeight + interSize.height;
+      NSInteger heightIncrement = rowHeight + interSize.height;
 
-      int newCols = (frame.size.width - [_EO frame].size.width) /
+      NSInteger newCols = (frame.size.width - [_EO frame].size.width) /
 	widthIncrement;
-      int newRows = (frame.size.height - [_EO frame].size.height) /
+      NSInteger newRows = (frame.size.height - [_EO frame].size.height) /
 	heightIncrement;
       
-      int i, j;
+      NSInteger i, j;
 
       if (newCols > 0)
 	{
@@ -636,10 +636,10 @@ static BOOL done_editing;
     }
   else if ([theEvent modifierFlags] & NSControlKeyMask)
     {
-      int width;
+      NSInteger width;
-      int height;
+      NSInteger height;
-      int rows = [_EO numberOfRows];
+      NSInteger rows = [_EO numberOfRows];
-      int cols = [_EO numberOfColumns];
+      NSInteger cols = [_EO numberOfColumns];
       NSSize cellSize = [_EO cellSize];
       
       
@@ -656,10 +656,10 @@ static BOOL done_editing;
     }
   else
     {
-      int width;
+      NSInteger width;
-      int height;
+      NSInteger height;
-      int rows = [_EO numberOfRows];
+      NSInteger rows = [_EO numberOfRows];
-      int cols = [_EO numberOfColumns];
+      NSInteger cols = [_EO numberOfColumns];
       NSSize interSize = [_EO intercellSpacing];
       
       

GormCore/GormNSPanel.h

@@ -31,7 +31,7 @@
 {
   unsigned _gormStyleMask;
   BOOL     _gormReleasedWhenClosed;
-  unsigned int autoPositionMask;
+  NSUInteger autoPositionMask;
 }
 - (void) _setStyleMask: (unsigned int)newStyleMask;
 - (unsigned int) _styleMask;

GormCore/GormNSPanel.m

@@ -29,7 +29,7 @@
 
 
 // the default style mask we start with.
-static unsigned int defaultStyleMask = NSTitledWindowMask | NSClosableWindowMask
+static NSUInteger defaultStyleMask = NSTitledWindowMask | NSClosableWindowMask
 		  | NSResizableWindowMask | NSMiniaturizableWindowMask;
 
 @implementation GormNSPanel

GormCore/GormNSWindow.h

@@ -30,7 +30,7 @@
 {
   unsigned _gormStyleMask;
   BOOL     _gormReleasedWhenClosed;
-  unsigned int autoPositionMask;
+  NSUInteger autoPositionMask;
 }
 - (void) _setStyleMask: (unsigned int)newStyleMask;
 - (unsigned int) _styleMask;

GormCore/GormNSWindow.m

@@ -28,7 +28,7 @@
 #include "GormNSWindow.h"
 
 // the default style mask we start with.
-static unsigned int defaultStyleMask = NSTitledWindowMask | NSClosableWindowMask
+static NSUInteger defaultStyleMask = NSTitledWindowMask | NSClosableWindowMask
 		  | NSResizableWindowMask | NSMiniaturizableWindowMask;
 
 @implementation GormNSWindow

GormCore/GormObjectEditor.m

@@ -186,7 +186,7 @@ static NSMapTable	*docMap = 0;
 	{
 	  NSString *title = _(@"Removing Main Menu");
 	  NSString *msg = _(@"Are you sure you want to do this?");
-	  int retval = NSRunAlertPanel(title, msg,_(@"OK"),_(@"Cancel"), nil, nil);
+	  NSInteger retval = NSRunAlertPanel(title, msg,_(@"OK"),_(@"Cancel"), nil, nil);
 	  
 	  // if the user *really* wants to delete the menu, do it.
 	  if(retval != NSAlertDefaultReturn)

GormCore/GormObjectInspector.m

@@ -378,7 +378,7 @@ selectCellWithString: (NSString*)title
 	  unsigned	v;
 	  unsigned	(*imp)();
 
-	  imp = (unsigned int (*)()) [object methodForSelector: get];
+	  imp = (unsigned (*)()) [object methodForSelector: get];
 	  v = (*imp)(object, get);
 	  [value setStringValue: [NSString stringWithFormat: @"%u", v]];
 	}

GormCore/GormOutlineView.m

@@ -39,7 +39,7 @@
 #include <AppKit/NSImage.h>
 
 static NSNotificationCenter *nc = nil;
-static const int current_version = 1;
+static const NSInteger current_version = 1;
 
 // Cache the arrow images...
 static NSImage *collapsed = nil;
@@ -225,8 +225,8 @@ static NSColor *darkGreyBlueColor = nil;
 
 - (void)_openActions: (id)item
 {
-  int numchildren = 0;
+  NSInteger numchildren = 0;
-  int i = 0;
+  NSInteger i = 0;
   NSUInteger insertionPoint = 0;
   id object = nil;
   id sitem = (item == nil)?((id)[NSNull null]):((id)item);
@@ -267,8 +267,8 @@ static NSColor *darkGreyBlueColor = nil;
 
 - (void) _openOutlets: (id)item
 {
-  int numchildren = 0;
+  NSInteger numchildren = 0;
-  int i = 0;
+  NSInteger i = 0;
   NSInteger insertionPoint = 0;
   id object = nil;
   id sitem = (item == nil)?((id)[NSNull null]):((id)item);
@@ -309,14 +309,14 @@ static NSColor *darkGreyBlueColor = nil;
 
 - (void) drawRow: (NSInteger)rowIndex clipRect: (NSRect)aRect
 {
-  int startingColumn; 
+  NSInteger startingColumn; 
-  int endingColumn;
+  NSInteger endingColumn;
   NSTableColumn *tb;
   NSRect drawingRect;
   NSCell *cell;
   NSCell *imageCell = nil;
   NSRect imageRect;
-  int i;
+  NSInteger i;
   float x_pos;
 
   if (_dataSource == nil)
@@ -404,7 +404,7 @@ static NSColor *darkGreyBlueColor = nil;
 	  if (tb == _outlineTableColumn && !isOutletAction)
 	    {
 	      NSImage *image = nil;
-	      int level = 0;
+	      NSInteger level = 0;
 	      float indentationFactor = 0.0;
 
 	      // display the correct arrow...
@@ -519,7 +519,7 @@ static NSColor *darkGreyBlueColor = nil;
 
   if ((tb == _actionColumn || tb == _outletColumn) && !_isEditing)
     {
-      int position = 0;      
+      NSInteger position = 0;      
       position += _columnOrigins[_clickedColumn] + 5;
 
       if (location.x >= position
@@ -648,7 +648,7 @@ static NSColor *darkGreyBlueColor = nil;
   NSRect drawingRect, imageRect;
   unsigned length = 0;
   id item = nil;
-  int level = 0;
+  NSInteger level = 0;
   float indentationFactor = 0.0;
   NSImage *image = nil;
   NSCell *imageCell = nil;

GormCore/GormPrivate.h

@@ -80,7 +80,7 @@ extern NSString *GormResizeCellNotification;
 @interface GormClassProxy : NSObject
 {
   NSString *name;
-  int t;
+  NSInteger t;
 }
 
 - initWithClassName: (NSString*)n;

GormCore/GormPrivate.m

@@ -132,7 +132,7 @@ static BOOL _isInInterfaceBuilder = NO;
     {
       NSUInteger version = [aCoder versionForClassName: 
 			      NSStringFromClass([GSNibItem class])];
-      int cv = [aCoder versionForClassName:
+      NSInteger cv = [aCoder versionForClassName:
 			 NSStringFromClass([GSNibContainer class])];
 
       if (version == NSNotFound)

GormCore/GormResourceEditor.m

@@ -264,7 +264,7 @@
 	  >= 25))
 	{
   	  NSPasteboard	*pb;
-	  int pos;
+	  NSInteger pos;
 	  pos = row * [self numberOfColumns] + column;
 
 	  // don't allow the user to drag empty resources.

GormCore/GormResourceManager.m

@@ -51,8 +51,8 @@
   NSArray *types = [pb types];
   NSArray *acceptedTypes = [self resourcePasteboardTypes];
   BOOL flag = YES;
-  int i;
+  NSInteger i;
-  int c = [types count];
+  NSInteger c = [types count];
 
   if (c == 0) return NO; 
   
@@ -66,7 +66,7 @@
         {
 	  NSArray *files = [pb propertyListForType:type];
 	  NSArray *acceptedFiles = [self resourceFileTypes]; 
-	  int j, d;
+	  NSInteger j, d;
   
 	  if (!files)
 	    {
@@ -93,8 +93,8 @@
   NSArray *types = [pb types];
   NSArray *soundTypes = [NSSound soundUnfilteredFileTypes];
   NSArray *imageTypes = [NSImage imageFileTypes];
-  int i;
+  NSInteger i;
-  int c = [types count];
+  NSInteger c = [types count];
   BOOL found = NO;
   
   for (i = 0; i < c; i++)
@@ -103,7 +103,7 @@
       
       if ([type isEqual:NSFilenamesPboardType])
         {
-	  int j, d;
+	  NSInteger j, d;
 	  NSArray *files = [pb propertyListForType:type];
 	  found = YES;
 	  if (!files)

GormCore/GormSoundView.m

@@ -46,9 +46,9 @@
 static float findMax(NSData *data)
 {
   float max = 0.0;
-  int index = 0;
+  NSInteger index = 0;
   float *array = (float *)[data bytes];
-  int len = [data length];
+  NSInteger len = [data length];
 
   // find the maximum...
   for(index = 0; index < len; index++)
@@ -88,9 +88,9 @@ static float findMax(NSData *data)
   float x1 = 0, x2 = 0, y1 = offset, y2 = offset;
   float max = findMax(soundData);
   float multiplier = h/max;
-  int length = [soundData length];
+  NSInteger length = [soundData length];
-  int index = 0;
+  NSInteger index = 0;
-  int step = (length/(int)w);
+  NSInteger step = (length/(int)w);
 
   [super drawRect: aRect];
   
@@ -104,7 +104,7 @@ static float findMax(NSData *data)
       y1 = offset; 
       for(index = step; index < w; index+=step)
 	{
-	  int i = (int)index;
+	  NSInteger i = (int)index;
 	  float d = data[i];
 	  
 	  // calc new position...

GormCore/GormSplitViewEditor.m

@@ -262,9 +262,9 @@
     }
   
   {
-    int i;
+    NSInteger i;
     NSArray *subs = [_EO subviews];
-    int count = [subs count];
+    NSInteger count = [subs count];
     NSPoint mouseDownPoint = 
       [self convertPoint: [theEvent locationInWindow]
 	    fromView: nil];
@@ -339,7 +339,7 @@
 
       NSMutableArray *newSelection = [NSMutableArray array];
       NSArray *views;
-      int i;
+      NSInteger i;
       views = [contentView destroyAndListSubviews];
       for (i = 0; i < [views count]; i++)
 	{

GormCore/GormStandaloneViewEditor.m

@@ -68,8 +68,8 @@ static NSImage *horizontalImage;
 
   // are we on the knob of a selected view ?
   {
-    int count = [selection count];
+    NSInteger count = [selection count];
-    int i;
+    NSInteger i;
     GormViewEditor *knobView = nil;
     IBKnobPosition	knob = IBNoneKnobPosition;
     NSPoint mouseDownPoint;

GormCore/GormViewEditor.m

@@ -100,8 +100,8 @@
 - (int) distanceToFrame: (NSRect) frame
 {
   NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-  int guideSpacing = [userDefaults integerForKey: @"GuideSpacing"];
+  NSInteger guideSpacing = [userDefaults integerForKey: @"GuideSpacing"];
-  int halfSpacing = guideSpacing / 2;
+  NSInteger halfSpacing = guideSpacing / 2;
   NSRect rect = [self rectWithHalfDistance: (halfSpacing + 1)];
 
   if (NSIntersectsRect(frame, rect) == NO)
@@ -392,13 +392,13 @@ static BOOL currently_displaying = NO;
 
 - (void) _initializeHintWithInfo: (GormPlacementInfo*) gpi
 {
-  int i;
+  NSInteger i;
   NSArray *subviews = [[self superview] subviews];
-  int count = [subviews count];
+  NSInteger count = [subviews count];
   NSView *v;
   NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-  int guideSpacing = [userDefaults integerForKey: @"GuideSpacing"];
+  NSInteger guideSpacing = [userDefaults integerForKey: @"GuideSpacing"];
-  int halfSpacing = guideSpacing / 2;
+  NSInteger halfSpacing = guideSpacing / 2;
 
   gpi->lastLeftRect = NSZeroRect;
   gpi->lastRightRect = NSZeroRect;
@@ -578,16 +578,16 @@ static BOOL currently_displaying = NO;
 	     withPlacementInfo: (GormPlacementInfo*)gpi
 {
   NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-  int guideSpacing = [userDefaults integerForKey: @"GuideSpacing"];
+  NSInteger guideSpacing = [userDefaults integerForKey: @"GuideSpacing"];
-  int halfSpacing = guideSpacing / 2;
+  NSInteger halfSpacing = guideSpacing / 2;
   float leftOfFrame = NSMinX(frame);
   float rightOfFrame = NSMaxX(frame);
   float topOfFrame = NSMaxY(frame);
   float bottomOfFrame = NSMinY(frame);
-  int i;
+  NSInteger i;
-  int count;
+  NSInteger count;
-  int lastDistance;
+  NSInteger lastDistance;
-  int minimum = guideSpacing;
+  NSInteger minimum = guideSpacing;
   BOOL leftEmpty = YES;
   BOOL rightEmpty = YES;
   BOOL topEmpty = YES;
@@ -884,18 +884,18 @@ static BOOL currently_displaying = NO;
 		      andPlacementInfo: (GormPlacementInfo*)gpi
 {
   NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-  int guideSpacing = [userDefaults integerForKey: @"GuideSpacing"];
+  NSInteger guideSpacing = [userDefaults integerForKey: @"GuideSpacing"];
-  int halfSpacing = guideSpacing / 2;
+  NSInteger halfSpacing = guideSpacing / 2;
   float leftOfFrame = NSMinX(frame);
   float rightOfFrame = NSMaxX(frame);
   float topOfFrame = NSMaxY(frame);
   float bottomOfFrame = NSMinY(frame);
   float widthOfFrame = frame.size.width;
   float heightOfFrame = frame.size.height;
-  int i;
+  NSInteger i;
-  int count;
+  NSInteger count;
-  int lastDistance;
+  NSInteger lastDistance;
-  int minimum = guideSpacing;
+  NSInteger minimum = guideSpacing;
   BOOL leftEmpty = YES;
   BOOL rightEmpty = YES;
   BOOL topEmpty = YES;

GormCore/GormViewKnobs.m

@@ -28,8 +28,8 @@
 #include "GormViewKnobs.h"
 #include <math.h>
 
-static int KNOB_WIDTH = 0.0;
+static NSInteger KNOB_WIDTH = 0.0;
-static int KNOB_HEIGHT = 0.0;
+static NSInteger KNOB_HEIGHT = 0.0;
 
 #define MINSIZE 5.0
 

GormCore/GormViewWithContentViewEditor.m

@@ -65,8 +65,8 @@
 - (void) moveSelectionByX: (float)x 
 		     andY: (float)y
 {
-  int i;
+  NSInteger i;
-  int count = [selection count];
+  NSInteger count = [selection count];
 
   for (i = 0; i < count; i++)
     {
@@ -83,8 +83,8 @@
 - (void) resizeSelectionByX: (float)x 
 		       andY: (float)y
 {
-  int i;
+  NSInteger i;
-  int count = [selection count];
+  NSInteger count = [selection count];
 
   for (i = 0; i < count; i++)
     {
@@ -219,8 +219,8 @@
     }
   else if (_displaySelection)
     {
-      int i;
+      NSInteger i;
-      int count = [selection count];
+      NSInteger count = [selection count];
 
       for ( i = 0; i < count ; i++ )
 	{
@@ -246,7 +246,7 @@
 int _sortViews(id view1, id view2, void *context)
 {
   BOOL isVertical = *((BOOL *)context);
-  int order = NSOrderedSame;
+  NSInteger order = NSOrderedSame;
   NSRect rect1 = [[view1 editedObject] frame];
   NSRect rect2 = [[view2 editedObject] frame];
 
@@ -290,7 +290,7 @@ int _sortViews(id view1, id view2, void *context)
   GormViewEditor *editor = nil;
   NSRect prevRect = NSZeroRect;
   NSRect currRect = NSZeroRect;
-  int count = 0;
+  NSInteger count = 0;
 
   // iterate over the list of views...
   while((editor = [enumerator nextObject]) != nil)
@@ -324,7 +324,7 @@ int _sortViews(id view1, id view2, void *context)
       prevRect = currRect;
     }
 
-  NSDebugLog(@"The vote is %d",count);
+  NSDebugLog(@"The vote is %ld",count);
 
   if(count >= 0)
     vertical = YES;
@@ -634,7 +634,7 @@ int _sortViews(id view1, id view2, void *context)
 
       NSMutableArray *newSelection = [NSMutableArray array];
       NSArray *views;
-      int i;
+      NSInteger i;
       views = [contentView destroyAndListSubviews];
       for (i = 0; i < [views count]; i++)
 	{

GormCore/GormViewWithSubviewsEditor.m

@@ -79,8 +79,8 @@
   NSArray *subeditorConnections = 
     [NSArray arrayWithArray: [document connectorsForDestination: self
 				       ofClass: [GormEditorToParent class]]];  
-  int count = [subeditorConnections count];
+  NSInteger count = [subeditorConnections count];
-  int i = 0;
+  NSInteger i = 0;
 
   for ( i = 0; i < count; i ++ )
     {
@@ -93,8 +93,8 @@
   NSArray *subeditorConnections = 
     [NSArray arrayWithArray: [document connectorsForDestination: self
 				       ofClass: [GormEditorToParent class]]];
-  int count = [subeditorConnections count];
+  NSInteger count = [subeditorConnections count];
-  int i = 0;
+  NSInteger i = 0;
 
   for ( i = 0; i < count; i ++ )
     {
@@ -210,8 +210,8 @@
 
 - (NSArray*) selection
 {
-  int i;
+  NSInteger i;
-  int count = [selection count];
+  NSInteger count = [selection count];
   NSMutableArray *result = [NSMutableArray arrayWithCapacity: count];
   
   if (count != 0)
@@ -238,8 +238,8 @@
 
 - (void) selectObjects: (NSArray *) objects
 {
-  int i;
+  NSInteger i;
-  int count = [objects count];
+  NSInteger count = [objects count];
   TEST_RELEASE(selection);
   
   selection = [[NSMutableArray alloc] initWithCapacity: [objects count]];