Changeset 2730

Timestamp:

Aug 13, 2007, 4:30:52 AM (15 years ago)

Author:

livings124

Message:

get rid of some warnings

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)
• macosx/Controller.m (modified) (3 diffs)
• macosx/TorrentCell.m (modified) (4 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -314 +314 @@
                 4DFBC2DE09C0970D00D5C571 /* Torrent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Torrent.m; path = macosx/Torrent.m; sourceTree = "<group>"; };
                 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = Info.plist; path = macosx/Info.plist; sourceTree = "<group>"; };
-                8D1107320486CEB800E47090 /* Transmission.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Transmission.app; sourceTree = BUILT_PRODUCTS_DIR; };
+                8D1107320486CEB800E47090 /* Transmission.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Transmission.app; sourceTree = BUILT_PRODUCTS_DIR; };
                 A200B8390A2263BA007BBB1E /* InfoWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoWindowController.h; path = macosx/InfoWindowController.h; sourceTree = "<group>"; };
                 A200B83A0A2263BA007BBB1E /* InfoWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InfoWindowController.m; path = macosx/InfoWindowController.m; sourceTree = "<group>"; };

trunk/macosx/Controller.m

@@ -544 +544 @@
     
     //remove all torrent files in the temporary directory
+    #warning move?
     if (fTempTorrentFiles)
     {
@@ -2689 +2690 @@
         Torrent * torrent;
         while ((torrent = [enumerator nextObject]))
-        {
             if ([torrent isActive] || [torrent waitingToStart])
                 return YES;
-        }
         return NO;
     }
@@ -2702 +2701 @@
         Torrent * torrent;
         while ((torrent = [enumerator nextObject]))
-        {
             if ([torrent isPaused] && ![torrent waitingToStart])
                 return YES;
-        }
         return NO;
     }

trunk/macosx/TorrentCell.m

@@ -62 +62 @@
             inBounds: (NSRect) bounds;
 - (NSRect) rectForProgressWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
-- (NSRect) rectForBarInBounds: (NSRect) bounds;
 - (NSRect) rectForStatusWithString: (NSAttributedString *) string
             inBounds: (NSRect) bounds;
@@ -167 +166 @@
 }
 
-#warning remove other
 - (NSRect) barRectForBounds: (NSRect) bounds
 {
-    return [self rectForBarInBounds: bounds];
+    BOOL minimal = [fDefaults boolForKey: @"SmallView"];
+    
+    NSRect result = bounds;
+    result.size.height = BAR_HEIGHT;
+    result.origin.x = PADDING_HORIZONAL + (minimal ? IMAGE_SIZE_MIN : IMAGE_SIZE_REG)
+                        + PADDING_BETWEEN_IMAGE_AND_TITLE - PADDING_LESS_BETWEEN_TITLE_AND_BAR;
+    
+    result.origin.y += PADDING_ABOVE_TITLE + HEIGHT_TITLE;
+    if (minimal)
+        result.origin.y += PADDING_BETWEEN_TITLE_AND_BAR_MIN;
+    else
+        result.origin.y += PADDING_BETWEEN_TITLE_AND_PROGRESS + HEIGHT_STATUS + PADDING_BETWEEN_PROGRESS_AND_BAR;
+    
+    result.size.width = NSMaxX(bounds) - result.origin.x - PADDING_HORIZONAL - BUTTONS_TOTAL_WIDTH;
+    
+    return result;
 }
 
@@ -249 +262 @@
     }
     
-    #warning bar is already sized.....
     //bar
-    NSRect barRect = [self rectForBarInBounds: cellFrame];
+    NSRect barRect = [self barRectForBounds: cellFrame];
     NSImage * bar = [fDefaults boolForKey: @"UseAdvancedBar"]
                     ? [self advancedBar: barRect.size.width] : [self simpleBar: barRect.size.width];
@@ -567 +579 @@
 }
 
-- (NSRect) rectForBarInBounds: (NSRect) bounds
-{
-    BOOL minimal = [fDefaults boolForKey: @"SmallView"];
-    
-    NSRect result = bounds;
-    result.size.height = BAR_HEIGHT;
-    result.origin.x = PADDING_HORIZONAL + (minimal ? IMAGE_SIZE_MIN : IMAGE_SIZE_REG)
-                        + PADDING_BETWEEN_IMAGE_AND_TITLE - PADDING_LESS_BETWEEN_TITLE_AND_BAR;
-    #warning rename some
-    result.origin.y += PADDING_ABOVE_TITLE + HEIGHT_TITLE;
-    if (minimal)
-        result.origin.y += PADDING_BETWEEN_TITLE_AND_BAR_MIN;
-    else
-        result.origin.y += PADDING_BETWEEN_TITLE_AND_PROGRESS + HEIGHT_STATUS + PADDING_BETWEEN_PROGRESS_AND_BAR;
-    
-    result.size.width = NSMaxX(bounds) - result.origin.x - PADDING_HORIZONAL - BUTTONS_TOTAL_WIDTH;
-    
-    return result;
-}
-
 - (NSRect) rectForStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds
 {