Changeset 436 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

Timestamp:

03/05/08 03:01:09 (16 years ago)

Author:

Nicholas Riley

Message:

Use @try/@catch/@finally rather than macro-based exceptions

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m (modified) (3 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEWebKit.m

@@ -71 +71 @@
             return;
 
-        NS_DURING
+        @try {
             NSPoint viewClickPt = [self convertPoint: downPt fromView: nil];
             NSDictionary *elementDict = [(WebHTMLView *)self elementAtPoint: viewClickPt];
@@ -79 +79 @@
             if ([elementDict objectForKey: @"WebElementLinkURL"] != nil) {
                 ICLog(@"got a link");
-                NS_VOIDRETURN; // don't activate on links
+                return; // don't activate on links
             }
             if (selectedString == nil || [selectedString length] == 0) {
                 ICLog(@"no selected string");
-                NS_VOIDRETURN;
+                return;
             }
             ICCF_StartIC();
@@ -110 +110 @@
                 }
             }
-        NS_HANDLER
-            ICCF_HandleException(localException, downEvent);
-        NS_ENDHANDLER
+        } @catch (NSException *e) {
+            ICCF_HandleException(e, downEvent);
+        } @finally {
+            [downEvent release]; downEvent = nil;
+        }
 
-        [downEvent release]; downEvent = nil;
         ICCF_StopIC();
     }