Changeset 2731

Timestamp:

Aug 13, 2007, 5:03:21 AM (15 years ago)

Author:

livings124

Message:

one less warning

File:

• trunk/macosx/TorrentCell.m (modified) (5 diffs)

trunk/macosx/TorrentCell.m

@@ -57 +57 @@
 - (NSImage *) advancedBarSimple;
 
-#warning rearrange
 - (NSRect) rectForMinimalStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
-- (NSRect) rectForTitleBasedOnMinimalStatusRect: (NSRect) statusRect withString: (NSAttributedString *) string
+- (NSRect) rectForTitleWithString: (NSAttributedString *) string basedOnMinimalStatusRect: (NSRect) statusRect
             inBounds: (NSRect) bounds;
 - (NSRect) rectForProgressWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
-- (NSRect) rectForStatusWithString: (NSAttributedString *) string
-            inBounds: (NSRect) bounds;
+- (NSRect) rectForStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
 
 - (NSAttributedString *) attributedTitleWithColor: (NSColor *) color;
@@ -75 +73 @@
 #define BE OSSwapBigToHostConstInt32
 
-static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
-                kBlue = BE(0x50A0FFFF), //80, 160, 255
-                kBlue2 = BE(0x1E46B4FF), //30, 70, 180
-                kGray  = BE(0x969696FF), //150, 150, 150
+static uint32_t kRed    = BE(0xFF6450FF), //255, 100, 80
+                kBlue   = BE(0x50A0FFFF), //80, 160, 255
+                kBlue2  = BE(0x1E46B4FF), //30, 70, 180
+                kGray   = BE(0x969696FF), //150, 150, 150
                 kGreen1 = BE(0x99FFCCFF), //153, 255, 204
                 kGreen2 = BE(0x66FF99FF), //102, 255, 153
                 kGreen3 = BE(0x00FF66FF), //0, 255, 102
-                kWhite = BE(0xFFFFFFFF); //255, 255, 255
+                kWhite  = BE(0xFFFFFFFF); //255, 255, 255
 
 //only called one, so don't worry about release
@@ -148 +146 @@
 - (NSRect) titleRectForBounds: (NSRect) bounds
 {
-    return [self rectForTitleBasedOnMinimalStatusRect: [self minimalStatusRectForBounds: bounds]
-                    withString: [self attributedTitleWithColor: nil] inBounds: bounds];
+    return [self rectForTitleWithString: [self attributedTitleWithColor: nil]
+            basedOnMinimalStatusRect: [self minimalStatusRectForBounds: bounds] inBounds: bounds];
 }
 
@@ -250 +248 @@
     //title
     NSAttributedString * titleString = [self attributedTitleWithColor: titleColor];
-    NSRect titleRect = [self rectForTitleBasedOnMinimalStatusRect: minimalStatusRect withString: titleString inBounds: cellFrame];
+    NSRect titleRect = [self rectForTitleWithString: titleString basedOnMinimalStatusRect: minimalStatusRect inBounds: cellFrame];
     [titleString drawInRect: titleRect];
     
@@ -548 +546 @@
 }
 
-- (NSRect) rectForTitleBasedOnMinimalStatusRect: (NSRect) statusRect withString: (NSAttributedString *) string
+- (NSRect) rectForTitleWithString: (NSAttributedString *) string basedOnMinimalStatusRect: (NSRect) statusRect
             inBounds: (NSRect) bounds
 {