diff --git a/macosx/Controller.m b/macosx/Controller.m index 877903644..96d9bca69 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1604,7 +1604,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi * progressDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"progress" ascending: !asc] autorelease], * ratioDescriptor = [[[NSSortDescriptor alloc] initWithKey: - @"ratioSortKey" ascending: !asc] autorelease]; + @"ratio" ascending: !asc] autorelease]; descriptors = [[NSArray alloc] initWithObjects: stateDescriptor, progressDescriptor, ratioDescriptor, nameDescriptor, orderDescriptor, nil]; @@ -1614,9 +1614,9 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi NSSortDescriptor * progressDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"progress" ascending: asc] autorelease], * ratioProgressDescriptor = [[[NSSortDescriptor alloc] initWithKey: - @"ratioProgressSortKey" ascending: asc] autorelease], + @"progressStopRatio" ascending: asc] autorelease], * ratioDescriptor = [[[NSSortDescriptor alloc] initWithKey: - @"ratioSortKey" ascending: asc] autorelease]; + @"ratio" ascending: asc] autorelease]; descriptors = [[NSArray alloc] initWithObjects: progressDescriptor, ratioProgressDescriptor, ratioDescriptor, nameDescriptor, orderDescriptor, nil]; diff --git a/macosx/Torrent.h b/macosx/Torrent.h index 0d21e935e..11119f0a8 100644 --- a/macosx/Torrent.h +++ b/macosx/Torrent.h @@ -229,8 +229,6 @@ typedef enum - (BOOL) isStalled; - (NSNumber *) stateSortKey; -- (NSNumber *) ratioSortKey; -- (NSNumber *) ratioProgressSortKey; - (int) torrentID; - (const tr_info *) torrentInfo; diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 4492770b5..f6aa64b9f 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -1363,16 +1363,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * return [NSNumber numberWithInt: 2]; } -- (NSNumber *) ratioSortKey -{ - return [NSNumber numberWithFloat: [self ratio]]; -} - -- (NSNumber *) ratioProgressSortKey -{ - return [NSNumber numberWithFloat: [self progressStopRatio]]; -} - - (int) torrentID { return fID;