Changeset 12991

Timestamp:

Oct 18, 2011, 2:30:22 AM (11 years ago)

Author:

livings124

Message:

Silence some new warnings with LLVM 3.0/Xcode 4.2

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)
• macosx/Controller.m (modified) (7 diffs)
• macosx/FileOutlineController.m (modified) (1 diff)
• macosx/InfoTrackersViewController.m (modified) (1 diff)
• macosx/TorrentCell.m (modified) (1 diff)
• macosx/TorrentTableView.m (modified) (1 diff)
• macosx/TrackerCell.m (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -2000 +2000 @@
                         attributes = {
                                 BuildIndependentTargetsInParallel = YES;
-                                LastUpgradeCheck = 0410;
+                                LastUpgradeCheck = 0420;
                                 ORGANIZATIONNAME = "The Transmission Project";
                         };

trunk/macosx/Controller.m

@@ -1256 +1256 @@
             if (selected == 1)
             {
-                NSString * torrentName = [[torrents objectAtIndex: 0] name];
+                NSString * torrentName = [(Torrent *)[torrents objectAtIndex: 0] name];
                 
                 if (deleteData)
@@ -1380 +1380 @@
         if ([torrents count] == 1)
         {
-            NSString * torrentName = [[torrents objectAtIndex: 0] name];
+            NSString * torrentName = [(Torrent *)[torrents objectAtIndex: 0] name];
             message = [NSString stringWithFormat: NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list?",
                                                                   "Remove completed confirm panel -> title"), torrentName];
@@ -1436 +1436 @@
     if (count == 1)
         [panel setMessage: [NSString stringWithFormat: NSLocalizedString(@"Select the new folder for \"%@\".",
-                            "Move torrent -> select destination folder"), [[torrents objectAtIndex: 0] name]]];
+                            "Move torrent -> select destination folder"), [(Torrent *)[torrents objectAtIndex: 0] name]]];
     else
         [panel setMessage: [NSString stringWithFormat: NSLocalizedString(@"Select the new folder for %d data files.",
@@ -1783 +1783 @@
 {
     NSString * sortType;
-    switch ([sender tag])
+    switch ([(NSMenuItem *)sender tag])
     {
         case SORT_ORDER_TAG:
@@ -1811 +1811 @@
             break;
         default:
-            NSAssert1(NO, @"Unknown sort tag received: %d", [sender tag]);
+            NSAssert1(NO, @"Unknown sort tag received: %d", [(NSMenuItem *)sender tag]);
             return;
     }
@@ -1833 +1833 @@
 - (void) setSortReverse: (id) sender
 {
-    const BOOL setReverse = [sender tag] == SORT_DESC_TAG;
+    const BOOL setReverse = [(NSMenuItem *)sender tag] == SORT_DESC_TAG;
     if (setReverse != [fDefaults boolForKey: @"SortReverse"])
     {
@@ -2236 +2236 @@
         [fTableView removeCollapsedGroup: [torrent groupValue]]; //remove old collapsed group
         
-        [torrent setGroupValue: [sender tag]];
+        [torrent setGroupValue: [(NSMenuItem *)sender tag]];
     }
     

trunk/macosx/FileOutlineController.m

@@ -334 +334 @@
         NSString * path = [fTorrent fileLocation: item];
         if (!path)
-            path = [[item path] stringByAppendingPathComponent: [item name]];
+            path = [[(FileListNode *)item path] stringByAppendingPathComponent: [(FileListNode *)item name]];
         return path;
     }

trunk/macosx/InfoTrackersViewController.m

@@ -185 +185 @@
 }
 
-- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
-{
+- (BOOL) tableView: (NSTableView *) tableView shouldEditTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row
+{
+    //don't allow tier row to be edited by double-click
     return NO;
 }

trunk/macosx/TorrentCell.m

@@ -785 +785 @@
 - (NSAttributedString *) attributedTitle
 {
-    NSString * title = [[self representedObject] name];
+    NSString * title = [(Torrent *)[self representedObject] name];
     return [[[NSAttributedString alloc] initWithString: title attributes: fTitleAttributes] autorelease];
 }

trunk/macosx/TorrentTableView.m

@@ -203 +203 @@
 - (NSString *) outlineView: (NSOutlineView *) outlineView typeSelectStringForTableColumn: (NSTableColumn *) tableColumn item: (id) item
 {
-    return [item isKindOfClass: [Torrent class]] ? [item name]
+    return [item isKindOfClass: [Torrent class]] ? [(Torrent *)item name]
             : [[self preparedCellAtColumn: [self columnWithIdentifier: @"Group"] row: [self rowForItem: item]] stringValue];
 }

trunk/macosx/TrackerCell.m

@@ -65 +65 @@
 + (void) initialize
 {
-    fTrackerIconCache = [[NSMutableDictionary alloc] init];
+    fTrackerIconCache = [[NSCache alloc] init];
     fTrackerIconLoading = [[NSMutableSet alloc] init];
 }