Changeset 3476

Timestamp:

Oct 20, 2007, 7:25:14 PM (15 years ago)

Author:

livings124

Message:

another if-to-switch

Location:

trunk/macosx

Files:

• FileNameCell.m (modified) (1 diff)
• FilePriorityCell.m (modified) (2 diffs)

trunk/macosx/FileNameCell.m

@@ -23 +23 @@
  *****************************************************************************/
 
+#import "FileNameCell.h"
 #import "FileOutlineView.h"
-#import "FileNameCell.h"
 #import "Torrent.h"
 #import "NSStringAdditions.h"

trunk/macosx/FilePriorityCell.m

@@ -74 +74 @@
     
     FileOutlineView * view = (FileOutlineView *)[self controlView];
-    int row = [view hoverRow];
-    if (count > 0 && row != -1 && [view itemAtRow: row] == dict)
+    int hoverRow = [view hoverRow];
+    if (count > 0 && hoverRow != -1 && [view itemAtRow: hoverRow] == dict)
     {
         [super setSelected: [priorities containsObject: [NSNumber numberWithInt: TR_PRI_LOW]] forSegment: 0];
@@ -98 +98 @@
             image = fMixedImage;
         }
-        else if ([priorities containsObject: [NSNumber numberWithInt: TR_PRI_NORMAL]])
-        {
-            if (!fNormalImage)
-                fNormalImage = [NSImage imageNamed: @"PriorityNormal.png"];
-            image = fNormalImage;
-        }
-        else if ([priorities containsObject: [NSNumber numberWithInt: TR_PRI_LOW]])
-        {
-            if (!fLowImage)
-                fLowImage = [NSImage imageNamed: @"PriorityLow.png"];
-            image = fLowImage;
-        }
         else
         {
-            if (!fHighImage)
-                fHighImage = [NSImage imageNamed: @"PriorityHigh.png"];
-            image = fHighImage;
+            switch ([[priorities anyObject] intValue])
+            {
+                case TR_PRI_NORMAL:
+                    if (!fNormalImage)
+                        fNormalImage = [NSImage imageNamed: @"PriorityNormal.png"];
+                    image = fNormalImage;
+                    break;
+                case TR_PRI_LOW:
+                    if (!fLowImage)
+                        fLowImage = [NSImage imageNamed: @"PriorityLow.png"];
+                    image = fLowImage;
+                    break;
+                case TR_PRI_HIGH:
+                    if (!fHighImage)
+                        fHighImage = [NSImage imageNamed: @"PriorityHigh.png"];
+                    image = fHighImage;
+                    break;
+            }
         }