mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-02-23 19:51:00 +00:00
* 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. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@35091 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
4bc5ea7ede
commit
4671ec0870
19 changed files with 57 additions and 27 deletions
23
ChangeLog
23
ChangeLog
|
@ -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>
|
||||
|
||||
* GormCore/GormMatrixEditor.m: Change modifier to Ctrl+Shift since
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
Date: March 2003
|
||||
|
||||
This file is part of GNUstep.
|
||||
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
|
@ -667,7 +667,7 @@ objectValueForTableColumn: (NSTableColumn *)tc
|
|||
}
|
||||
else
|
||||
{
|
||||
NSLog(@"Got %@ set to class edit inspector");
|
||||
NSLog(@"Got %@ set to class edit inspector",anObject);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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...
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -245,7 +245,7 @@
|
|||
*/
|
||||
- (NSRect) rectForObject: (id)anObject
|
||||
{
|
||||
unsigned pos = [objects indexOfObjectIdenticalTo: anObject];
|
||||
NSUInteger pos = [objects indexOfObjectIdenticalTo: anObject];
|
||||
NSRect rect;
|
||||
int r;
|
||||
int c;
|
||||
|
@ -266,8 +266,8 @@
|
|||
|
||||
- (void) refreshCells
|
||||
{
|
||||
unsigned count = [objects count];
|
||||
unsigned index = 0;
|
||||
NSUInteger count = [objects count];
|
||||
NSUInteger index = 0;
|
||||
int cols = 0;
|
||||
int rows = 0;
|
||||
int width = 0;
|
||||
|
@ -317,7 +317,7 @@
|
|||
|
||||
- (void) removeObject: (id)anObject
|
||||
{
|
||||
unsigned pos;
|
||||
NSUInteger pos;
|
||||
|
||||
pos = [objects indexOfObjectIdenticalTo: anObject];
|
||||
if (pos == NSNotFound)
|
||||
|
@ -341,7 +341,7 @@
|
|||
return [NSArray arrayWithObject: selected];
|
||||
}
|
||||
|
||||
- (unsigned) selectionCount
|
||||
- (NSUInteger) selectionCount
|
||||
{
|
||||
return (selected == nil) ? 0 : 1;
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -199,7 +199,7 @@ static NSColor *darkGreyBlueColor = nil;
|
|||
|
||||
- (void) _addNewOutletToObject: (id)item
|
||||
{
|
||||
int insertionPoint = 0;
|
||||
NSUInteger insertionPoint = 0;
|
||||
GormOutletActionHolder *holder = [[GormOutletActionHolder alloc] init];
|
||||
NSString *name = nil;
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -130,7 +130,7 @@ static BOOL _isInInterfaceBuilder = NO;
|
|||
}
|
||||
else
|
||||
{
|
||||
int version = [aCoder versionForClassName:
|
||||
NSUInteger version = [aCoder versionForClassName:
|
||||
NSStringFromClass([GSNibItem class])];
|
||||
int cv = [aCoder versionForClassName:
|
||||
NSStringFromClass([GSNibContainer class])];
|
||||
|
|
|
@ -895,7 +895,7 @@ void _attachAll(NSMenu *menu, id document)
|
|||
{
|
||||
if ([anArray isEqual: selection] == NO)
|
||||
{
|
||||
unsigned count;
|
||||
NSUInteger count;
|
||||
NSMenuItem *item;
|
||||
|
||||
[selection removeAllObjects];
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
- (void) revert: (id) sender
|
||||
{
|
||||
id drawer = [self object];
|
||||
int i = [preferredEdge indexOfItemWithTag: [drawer preferredEdge]];
|
||||
NSUInteger i = [preferredEdge indexOfItemWithTag: [drawer preferredEdge]];
|
||||
if(i != NSNotFound)
|
||||
{
|
||||
[preferredEdge selectItemAtIndex: i];
|
||||
|
|
|
@ -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];
|
||||
|
|
|
@ -363,7 +363,7 @@ static NSText *_textObject;
|
|||
NSTableColumn *tc;
|
||||
NSRect drawingRect;
|
||||
|
||||
int columnIndex = [th columnAtPoint:
|
||||
NSUInteger columnIndex = [th columnAtPoint:
|
||||
[th convertPoint:[theEvent locationInWindow]
|
||||
fromView: nil]];
|
||||
|
||||
|
|
|
@ -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];
|
||||
}
|
||||
|
|
|
@ -113,7 +113,7 @@ extern NSArray *predefinedNumberFormats;
|
|||
}
|
||||
else if (sender == formatForm)
|
||||
{
|
||||
int idx;
|
||||
NSUInteger idx;
|
||||
|
||||
positiveFmt = [[sender cellAtIndex:0] stringValue];
|
||||
zeroFmt = [[sender cellAtIndex:1] stringValue];
|
||||
|
@ -181,7 +181,7 @@ extern NSArray *predefinedNumberFormats;
|
|||
|
||||
- (void) revert: (id)sender
|
||||
{
|
||||
int idx;
|
||||
NSUInteger idx;
|
||||
NSNumberFormatter *fmtr = [[object cell] formatter];
|
||||
|
||||
// Format form
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include <Foundation/Foundation.h>
|
||||
#include <AppKit/AppKit.h>
|
||||
#include <GNUstepGUI/GSNibLoading.h>
|
||||
|
||||
#include <GormCore/GormWrapperBuilder.h>
|
||||
#include <GormCore/GormClassManager.h>
|
||||
#include <GormCore/GormFilePrefsManager.h>
|
||||
|
@ -34,6 +35,8 @@
|
|||
#include <GormCore/GormProtocol.h>
|
||||
#include <GormCore/GormPalettesManager.h>
|
||||
#include <GormCore/GormCustomView.h>
|
||||
#include <GormCore/GormPrivate.h>
|
||||
#include <GormCore/GormFilesOwner.h>
|
||||
|
||||
// allow access to a private category...
|
||||
@interface NSIBObjectData (BuilderAdditions)
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
|
||||
#include <Foundation/Foundation.h>
|
||||
#include <AppKit/AppKit.h>
|
||||
|
||||
#include <GormCore/GormPalettesManager.h>
|
||||
#include <GormCore/GormClassManager.h>
|
||||
#include <GormCore/GormImage.h>
|
||||
|
@ -33,6 +34,8 @@
|
|||
#include <GormCore/GormFunctions.h>
|
||||
#include <GormCore/GormCustomView.h>
|
||||
#include <GormCore/GormWindowTemplate.h>
|
||||
#include <GormCore/GormNSWindow.h>
|
||||
|
||||
#include "GormNibWrapperLoader.h"
|
||||
|
||||
@class GormNSWindow;
|
||||
|
@ -264,7 +267,7 @@
|
|||
{
|
||||
NSString *tag = [o label];
|
||||
NSRange colonRange = [tag rangeOfString: @":"];
|
||||
unsigned int location = colonRange.location;
|
||||
NSUInteger location = colonRange.location;
|
||||
|
||||
if(location == NSNotFound)
|
||||
{
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
#include <GormCore/GormFunctions.h>
|
||||
#include <GormCore/GormCustomView.h>
|
||||
#include <GormCore/GormWindowTemplate.h>
|
||||
#include <GormCore/GormNSWindow.h>
|
||||
|
||||
#include "GormXibWrapperLoader.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue