From 78f6a488d550e901a9a1eb361d7908e9595f1d32 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 15 Feb 2010 14:56:14 +0000 Subject: [PATCH] remove temporary asserts --- macosx/FileListNode.m | 1 - macosx/FileNameCell.m | 3 --- macosx/FileOutlineController.m | 11 ----------- macosx/FileOutlineView.m | 1 - macosx/Torrent.m | 2 -- macosx/TorrentTableView.m | 10 +++++----- 6 files changed, 5 insertions(+), 23 deletions(-) diff --git a/macosx/FileListNode.m b/macosx/FileListNode.m index f1890f773..cb7be5798 100644 --- a/macosx/FileListNode.m +++ b/macosx/FileListNode.m @@ -105,7 +105,6 @@ - (NSIndexSet *) indexes { - NSAssert(fIndexes != nil, @"How did this get nil? - temp"); return fIndexes; } diff --git a/macosx/FileNameCell.m b/macosx/FileNameCell.m index 2a25c9b01..df08a742f 100644 --- a/macosx/FileNameCell.m +++ b/macosx/FileNameCell.m @@ -119,9 +119,6 @@ [image drawInRect: [self imageRectForBounds: cellFrame] fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0]; } - NSIndexSet * indexSet = [(FileListNode *)[self objectValue] indexes]; - NSAssert(indexSet != nil, @"indexSet must not be nil - temp"); - NSColor * titleColor, * statusColor; if ([self backgroundStyle] == NSBackgroundStyleDark) titleColor = statusColor = [NSColor whiteColor]; diff --git a/macosx/FileOutlineController.m b/macosx/FileOutlineController.m index cddbd9c38..b4c6b815e 100644 --- a/macosx/FileOutlineController.m +++ b/macosx/FileOutlineController.m @@ -161,11 +161,7 @@ typedef enum - (id) outlineView: (NSOutlineView *) outlineView objectValueForTableColumn: (NSTableColumn *) tableColumn byItem: (id) item { if ([[tableColumn identifier] isEqualToString: @"Check"]) - { - NSIndexSet * indexSet = [(FileListNode *)item indexes]; - NSAssert(indexSet != nil, @"indexSet must not be nil - temp"); return [NSNumber numberWithInteger: [fTorrent checkForFiles: [(FileListNode *)item indexes]]]; - } else return item; } @@ -175,11 +171,7 @@ typedef enum { NSString * identifier = [tableColumn identifier]; if ([identifier isEqualToString: @"Check"]) - { - NSIndexSet * indexSet = [(FileListNode *)item indexes]; - NSAssert(indexSet != nil, @"indexSet must not be nil - temp"); [cell setEnabled: [fTorrent canChangeDownloadCheckForFiles: [(FileListNode *)item indexes]]]; - } else if ([identifier isEqualToString: @"Priority"]) { [cell setRepresentedObject: item]; @@ -375,7 +367,6 @@ typedef enum [itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]]; NSInteger state = ([menuItem tag] == FILE_CHECK_TAG) ? NSOnState : NSOffState; - NSAssert(itemIndexes != nil, @"indexSet must not be nil - temp"); return [fTorrent checkForFiles: itemIndexes] != state && [fTorrent canChangeDownloadCheckForFiles: itemIndexes]; } @@ -389,7 +380,6 @@ typedef enum for (NSInteger i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i]) [itemIndexes addIndexes: [[fOutline itemAtRow: i] indexes]]; - NSAssert(itemIndexes != nil, @"indexSet must not be nil - temp"); return [fTorrent canChangeDownloadCheckForFiles: itemIndexes]; } @@ -421,7 +411,6 @@ typedef enum for (NSInteger i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i]) { NSIndexSet * fileIndexSet = [[fOutline itemAtRow: i] indexes]; - NSAssert(fileIndexSet != nil, @"indexSet must not be nil - temp"); if (![fTorrent canChangeDownloadCheckForFiles: fileIndexSet]) continue; diff --git a/macosx/FileOutlineView.m b/macosx/FileOutlineView.m index 0a3e40535..476e6d2c4 100644 --- a/macosx/FileOutlineView.m +++ b/macosx/FileOutlineView.m @@ -184,7 +184,6 @@ { NSDictionary * item = [self itemAtRow: row]; NSIndexSet * indexes = [(FileListNode *)item indexes]; - NSAssert(indexes != nil, @"indexSet must not be nil - temp"); if ([fTorrent checkForFiles: indexes] != NSOffState) { diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 1d1d9d7a6..ca8a7530a 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -1348,8 +1348,6 @@ int trashDataFile(const char * filename) - (NSInteger) checkForFiles: (NSIndexSet *) indexSet { - NSAssert(indexSet != nil, @"indexSet must not be nil"); - BOOL onState = NO, offState = NO; for (NSUInteger index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index]) { diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m index e0f4149ee..22762d3d2 100644 --- a/macosx/TorrentTableView.m +++ b/macosx/TorrentTableView.m @@ -73,7 +73,7 @@ [self setDelegate: self]; - fPiecesBarPercent = [fDefaults boolForKey: @"PiecesBar"] ? 1.0f : 0.0f; + fPiecesBarPercent = [fDefaults boolForKey: @"PiecesBar"] ? 1.0 : 0.0; } return self; @@ -616,9 +616,9 @@ NSMenuItem * item; if ([menu numberOfItems] == 4) { - const CGFloat ratioLimitActionValue[] = { 0.25f, 0.5f, 0.75f, 1.0f, 1.5f, 2.0f, 3.0f, -1.0f }; + const CGFloat ratioLimitActionValue[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, -1.0 }; - for (NSInteger i = 0; ratioLimitActionValue[i] != -1.0f; i++) + for (NSInteger i = 0; ratioLimitActionValue[i] != -1.0; i++) { item = [[NSMenuItem alloc] initWithTitle: [NSString localizedStringWithFormat: @"%.2f", ratioLimitActionValue[i]] action: @selector(setQuickRatio:) keyEquivalent: @""]; @@ -821,7 +821,7 @@ [fPiecesBarAnimation release]; NSMutableArray * progressMarks = [NSMutableArray arrayWithCapacity: 16]; - for (NSAnimationProgress i = 0.0625f; i <= 1.0f; i += 0.0625f) + for (NSAnimationProgress i = 0.0625; i <= 1.0; i += 0.0625) [progressMarks addObject: [NSNumber numberWithFloat: i]]; fPiecesBarAnimation = [[NSAnimation alloc] initWithDuration: TOGGLE_PROGRESS_SECONDS animationCurve: NSAnimationEaseIn]; @@ -848,7 +848,7 @@ if ([fDefaults boolForKey: @"PiecesBar"]) fPiecesBarPercent = progress; else - fPiecesBarPercent = 1.0f - progress; + fPiecesBarPercent = 1.0 - progress; [self reloadData]; }