From 797c6bc3fd9a9c252ab6463a1434b4e4c5952d9a Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 23 May 2011 00:57:29 +0000 Subject: [PATCH] more explicit casting --- macosx/NSMutableArrayAdditions.m | 52 ++++++++++++++++++++++++++++++++ macosx/TorrentTableView.m | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 macosx/NSMutableArrayAdditions.m diff --git a/macosx/NSMutableArrayAdditions.m b/macosx/NSMutableArrayAdditions.m new file mode 100644 index 000000000..0a18b6005 --- /dev/null +++ b/macosx/NSMutableArrayAdditions.m @@ -0,0 +1,52 @@ +/****************************************************************************** + * $Id$ + * + * Copyright (c) 2011 Transmission authors and contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + *****************************************************************************/ + +#import "NSMutableArrayAdditions.h" + +@implementation NSMutableArray (NSMutableArrayAdditions) + +- (void) moveObjectAtIndex: (NSUInteger) fromIndex toIndex: (NSUInteger) toIndex +{ + if (fromIndex == toIndex) + return; + + id object = [[self objectAtIndex: fromIndex] retain]; + + //shift objects - more efficient than simply removing the object and re-inserting the object + if (fromIndex < toIndex) + { + for (NSUInteger i = fromIndex; i < toIndex; ++i) + [self replaceObjectAtIndex: i withObject: [self objectAtIndex: i+1]]; + } + else + { + for (NSUInteger i = fromIndex; i >= toIndex; --i) + [self replaceObjectAtIndex: i withObject: [self objectAtIndex: i-1]]; + } + [self replaceObjectAtIndex: toIndex withObject: object]; + + [object release]; +} + +@end diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m index a21fed6ae..cf212b2fa 100644 --- a/macosx/TorrentTableView.m +++ b/macosx/TorrentTableView.m @@ -750,7 +750,7 @@ NSAssert([[NSColor controlAlternatingRowBackgroundColors] count] >= 2, @"There should be 2 alternating row colors"); - [[[NSColor controlAlternatingRowBackgroundColors] objectAtIndex: 1] set]; + [(NSColor *)[[NSColor controlAlternatingRowBackgroundColors] objectAtIndex: 1] set]; NSRectFillList(gridRects, rectNum); }