Changeset 4745
- Timestamp:
- 05/10/07 21:55:46 (1 year ago)
- Files:
-
- WiredAdditions/trunk/NSArray-WIAdditions.h (modified) (1 diff)
- WiredAdditions/trunk/NSArray-WIAdditions.m (modified) (7 diffs)
- WiredAdditions/trunk/NSCursor-ClosedHandCursor.tiff (deleted)
- WiredAdditions/trunk/NSCursor-OpenHandCursor.tiff (deleted)
- WiredAdditions/trunk/NSCursor-WIAdditions.h (deleted)
- WiredAdditions/trunk/NSCursor-WIAdditions.m (deleted)
- WiredAdditions/trunk/WITableViewManager.m (modified) (1 diff)
- WiredAdditions/trunk/WiredAdditions.h (modified) (1 diff)
- WiredAdditions/trunk/WiredAdditions.xcodeproj/project.pbxproj (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
WiredAdditions/trunk/NSArray-WIAdditions.h
r4438 r4745 32 32 - (id)safeObjectAtIndex:(NSUInteger)index; 33 33 34 - (NS Integer)indexOfString:(NSString *)string;35 - (NS Integer)indexOfString:(NSString *)string options:(NSUInteger)options;34 - (NSUInteger)indexOfString:(NSString *)string; 35 - (NSUInteger)indexOfString:(NSString *)string options:(NSUInteger)options; 36 36 - (BOOL)containsString:(NSString *)string; 37 37 - (BOOL)containsString:(NSString *)string options:(NSUInteger)options; WiredAdditions/trunk/NSArray-WIAdditions.m
r4438 r4745 51 51 #pragma mark - 52 52 53 - (NS Integer)indexOfString:(NSString *)string {53 - (NSUInteger)indexOfString:(NSString *)string { 54 54 return [self indexOfString:string options:0]; 55 55 } … … 57 57 58 58 59 - (NS Integer)indexOfString:(NSString *)string options:(NSUInteger)options {59 - (NSUInteger)indexOfString:(NSString *)string options:(NSUInteger)options { 60 60 NSEnumerator *enumerator; 61 61 NSRange range; … … 76 76 } 77 77 78 return -1;78 return NSNotFound; 79 79 } 80 80 … … 82 82 83 83 - (BOOL)containsString:(NSString *)string { 84 return ([self indexOfString:string options:0] >= 0);84 return ([self indexOfString:string options:0] != NSNotFound); 85 85 } 86 86 … … 88 88 89 89 - (BOOL)containsString:(NSString *)string options:(NSUInteger)options { 90 return ([self indexOfString:string options:options] >= 0);90 return ([self indexOfString:string options:options] != NSNotFound); 91 91 } 92 92 … … 179 179 while((object = [enumerator nextObject])) { 180 180 if([object isKindOfClass:[NSNumber class]]) { 181 if(!number )181 if(!number || [object unsignedLongLongValue] < [number unsignedLongLongValue]) 182 182 number = object; 183 else if([object unsignedLongLongValue] < [number unsignedLongLongValue])184 number = object;185 183 } 186 184 } … … 200 198 while((object = [enumerator nextObject])) { 201 199 if([object isKindOfClass:[NSNumber class]]) { 202 if(!number) 203 number = object; 204 else if([object unsignedLongLongValue] > [number unsignedLongLongValue]) 200 if(!number || [object unsignedLongLongValue] > [number unsignedLongLongValue]) 205 201 number = object; 206 202 } WiredAdditions/trunk/WITableViewManager.m
r4642 r4745 158 158 NSArray *columns; 159 159 NSString *identifier; 160 unsigned inti, count;160 NSUInteger i, count; 161 161 162 162 if(identifiers) WiredAdditions/trunk/WiredAdditions.h
r4729 r4745 100 100 101 101 #import <WiredAdditions/NSColor-WIAdditions.h> 102 #import <WiredAdditions/NSCursor-WIAdditions.h>103 102 #import <WiredAdditions/NSFont-WIAdditions.h> 104 103 #import <WiredAdditions/NSImage-WIAdditions.h> WiredAdditions/trunk/WiredAdditions.xcodeproj/project.pbxproj
r4729 r4745 104 104 A544C0C40758DEEF008446CF /* NSPopUpButton-WIAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A544C0920758DEEE008446CF /* NSPopUpButton-WIAdditions.m */; }; 105 105 A544C0C50758DEEF008446CF /* NSWindow-WIAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A544C0930758DEEE008446CF /* NSWindow-WIAdditions.m */; }; 106 A544C0C60758DEEF008446CF /* NSCursor-WIAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A544C0940758DEEE008446CF /* NSCursor-WIAdditions.m */; };107 106 A544C13E0758DFA9008446CF /* WISplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = A544C1200758DFA9008446CF /* WISplitView.m */; }; 108 107 A544C1400758DFA9008446CF /* WIPDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = A544C1220758DFA9008446CF /* WIPDFView.m */; }; … … 131 130 A544C1E30758E190008446CF /* NSFileManager-WIAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = A544C0790758DEEE008446CF /* NSFileManager-WIAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 132 131 A544C1E40758E190008446CF /* NSObject-WIAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = A544C07A0758DEEE008446CF /* NSObject-WIAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 133 A544C1E50758E190008446CF /* NSCursor-WIAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = A544C07B0758DEEE008446CF /* NSCursor-WIAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };134 132 A544C1E60758E190008446CF /* NSData-WIAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = A544C07C0758DEEE008446CF /* NSData-WIAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 135 133 A544C1E70758E190008446CF /* NSFont-WIAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = A544C07E0758DEEE008446CF /* NSFont-WIAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; … … 183 181 A5E4B33307A9752E00BD6812 /* NSImage-Baadge.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5E4B33007A9752E00BD6812 /* NSImage-Baadge.tiff */; }; 184 182 A5E4B33407A9752E00BD6812 /* NSImage-Baaadge.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5E4B33107A9752E00BD6812 /* NSImage-Baaadge.tiff */; }; 185 A5E7C97E0847991E00F1E98C /* NSCursor-OpenHandCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5E7C97C0847991E00F1E98C /* NSCursor-OpenHandCursor.tiff */; };186 A5E7C97F0847991E00F1E98C /* NSCursor-ClosedHandCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5E7C97D0847991E00F1E98C /* NSCursor-ClosedHandCursor.tiff */; };187 183 A5EA54AC075FC0AD0025514A /* NSTableView-WIAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EA54AA075FC0AD0025514A /* NSTableView-WIAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 188 184 A5EA54AD075FC0AD0025514A /* NSTableView-WIAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A5EA54AB075FC0AD0025514A /* NSTableView-WIAdditions.m */; }; … … 774 770 A544C1ED0758E190008446CF /* NSArray-WIAdditions.h in Headers */, 775 771 A544C1EC0758E190008446CF /* NSColor-WIAdditions.h in Headers */, 776 A544C1E50758E190008446CF /* NSCursor-WIAdditions.h in Headers */,777 772 A544C1E60758E190008446CF /* NSData-WIAdditions.h in Headers */, 778 773 A544C1E00758E190008446CF /* NSDate-WIAdditions.h in Headers */, … … 895 890 77CDAED8083B3781003BE654 /* ReleaseNotes.nib in Resources */, 896 891 77438B960A3D934E00588CD7 /* ViewOptions.nib in Resources */, 897 A5E7C97F0847991E00F1E98C /* NSCursor-ClosedHandCursor.tiff in Resources */,898 A5E7C97E0847991E00F1E98C /* NSCursor-OpenHandCursor.tiff in Resources */,899 892 A5E4B33207A9752E00BD6812 /* NSImage-Badge.tiff in Resources */, 900 893 A5E4B33307A9752E00BD6812 /* NSImage-Baadge.tiff in Resources */, … … 946 939 A544C0BE0758DEEF008446CF /* NSArray-WIAdditions.m in Sources */, 947 940 A544C0BF0758DEEF008446CF /* NSColor-WIAdditions.m in Sources */, 948 A544C0C60758DEEF008446CF /* NSCursor-WIAdditions.m in Sources */,949 941 A544C0C20758DEEF008446CF /* NSData-WIAdditions.m in Sources */, 950 942 A544C0960758DEEE008446CF /* NSDate-WIAdditions.m in Sources */,
