Revision: 5638
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5638&view=rev
Author:   hofman
Date:     2009-09-03 19:24:42 +0000 (Thu, 03 Sep 2009)

Log Message:
-----------
make some 3rd party sources 64-bit safe

Modified Paths:
--------------
    trunk/main.m
    trunk/vendorsrc/martinkahr/RemoteControlWrapper/AppleRemote.m
    trunk/vendorsrc/martinkahr/RemoteControlWrapper/GlobalKeyboardDevice.m
    trunk/vendorsrc/martinkahr/RemoteControlWrapper/HIDRemoteControlDevice.m
    trunk/vendorsrc/martinkahr/RemoteControlWrapper/KeyspanFrontRowControl.m
    trunk/vendorsrc/martinkahr/RemoteControlWrapper/MultiClickRemoteBehavior.m
    trunk/vendorsrc/martinkahr/RemoteControlWrapper/RemoteControl.h

Modified: trunk/main.m
===================================================================
--- trunk/main.m        2009-09-03 19:01:14 UTC (rev 5637)
+++ trunk/main.m        2009-09-03 19:24:42 UTC (rev 5638)
@@ -17,7 +17,7 @@
     // - uses Carbon dialog since we don't have NSApp yet
     // - uses Gestalt so we can check for a specific minor version (if it gets 
this far, anyway)
     // - Gestalt header says to read a plist, but mailing lists (and Ali Ozer) 
say to avoid that
-    long version;
+    SInt32 version;
     OSStatus err = Gestalt(gestaltSystemVersion, &version);
     
     if (noErr != err || version < 0x00001040) {

Modified: trunk/vendorsrc/martinkahr/RemoteControlWrapper/AppleRemote.m
===================================================================
--- trunk/vendorsrc/martinkahr/RemoteControlWrapper/AppleRemote.m       
2009-09-03 19:01:14 UTC (rev 5637)
+++ trunk/vendorsrc/martinkahr/RemoteControlWrapper/AppleRemote.m       
2009-09-03 19:24:42 UTC (rev 5638)
@@ -35,11 +35,6 @@
 
 const char* AppleRemoteDeviceName = "AppleIRController";
 
-// the WWDC 07 Leopard Build is missing the constant
-#ifndef NSAppKitVersionNumber10_4
-       #define NSAppKitVersionNumber10_4 824
-#endif
-
 @implementation AppleRemote
 
 + (const char*) remoteControlDeviceName {
@@ -47,33 +42,17 @@
 }
 
 - (void) setCookieMappingInDictionary: (NSMutableDictionary*) 
_cookieToButtonMapping   {       
-       if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
-               // 10.4.x Tiger
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlus]            forKey:@"14_12_11_6_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMinus]           forKey:@"14_13_11_6_"];         
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMenu]            forKey:@"14_7_6_14_7_6_"];          
            
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay]            forKey:@"14_8_6_14_8_6_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight]           forKey:@"14_9_6_14_9_6_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft]            forKey:@"14_10_6_14_10_6_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight_Hold]      forKey:@"14_6_4_2_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft_Hold]       forKey:@"14_6_3_2_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMenu_Hold]       forKey:@"14_6_14_6_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay_Hold]       forKey:@"18_14_6_18_14_6_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteControl_Switched]      forKey:@"19_"];                 
-       } else {
-               // 10.5.x Leopard
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlus]            forKey:@"31_29_28_19_18_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMinus]           forKey:@"31_30_28_19_18_"];     
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMenu]            forKey:@"31_20_19_18_31_20_19_18_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay]            forKey:@"31_21_19_18_31_21_19_18_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight]           forKey:@"31_22_19_18_31_22_19_18_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft]            forKey:@"31_23_19_18_31_23_19_18_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight_Hold]      forKey:@"31_19_18_4_2_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft_Hold]       forKey:@"31_19_18_3_2_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMenu_Hold]       forKey:@"31_19_18_31_19_18_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay_Hold]       forKey:@"35_31_19_18_35_31_19_18_"];
-               [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteControl_Switched]      forKey:@"19_"];                 
-       }
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonPlus]           forKey:@"31_29_28_19_18_"];
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonMinus]          forKey:@"31_30_28_19_18_"];     
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonMenu]           
forKey:@"31_20_19_18_31_20_19_18_"];
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonPlay]           
forKey:@"31_21_19_18_31_21_19_18_"];
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonRight]          
forKey:@"31_22_19_18_31_22_19_18_"];
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonLeft]           
forKey:@"31_23_19_18_31_23_19_18_"];
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonRight_Hold]     forKey:@"31_19_18_4_2_"];
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonLeft_Hold]      forKey:@"31_19_18_3_2_"];
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonMenu_Hold]      forKey:@"31_19_18_31_19_18_"];
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonPlay_Hold]      
forKey:@"35_31_19_18_35_31_19_18_"];
+    [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteControl_Switched]     forKey:@"19_"];                 
 }
 
 - (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event 
pressedDown: (BOOL) pressedDown {

Modified: trunk/vendorsrc/martinkahr/RemoteControlWrapper/GlobalKeyboardDevice.m
===================================================================
--- trunk/vendorsrc/martinkahr/RemoteControlWrapper/GlobalKeyboardDevice.m      
2009-09-03 19:01:14 UTC (rev 5637)
+++ trunk/vendorsrc/martinkahr/RemoteControlWrapper/GlobalKeyboardDevice.m      
2009-09-03 19:24:42 UTC (rev 5638)
@@ -108,17 +108,17 @@
                        defaultsKey = @"playhold";
                        break;                  
                default: 
-                       NSLog(@"Unknown global keyboard defaults key for remote 
button identifier %d", remoteButtonIdentifier);
+                       NSLog(@"Unknown global keyboard defaults key for remote 
button identifier %lu", (unsigned long)remoteButtonIdentifier);
        }
        
        NSNumber* modifiersCfg = [[NSUserDefaults standardUserDefaults] 
objectForKey: [NSString stringWithFormat: 
@"mac.remotecontrols.globalkeyboarddevic...@_modifiers", defaultsKey]];
        NSNumber* keycodeCfg   = [[NSUserDefaults standardUserDefaults] 
objectForKey: [NSString stringWithFormat: 
@"mac.remotecontrols.globalkeyboarddevic...@_keycode", defaultsKey]];
        
        NSUInteger modifiers = defaultModifiers;
-       if (modifiersCfg) modifiers = [modifiersCfg unsignedIntValue];
+       if (modifiersCfg) modifiers = [modifiersCfg unsignedIntegerValue];
        
        NSUInteger keycode = defaultKeycode;
-       if (keycodeCfg) keycode = [keycodeCfg unsignedIntValue];
+       if (keycodeCfg) keycode = [keycodeCfg unsignedIntegerValue];
                                  
     [self registerHotKeyCode: keycode  modifiers: modifiers 
remoteEventIdentifier: remoteButtonIdentifier];
 }      
@@ -157,7 +157,7 @@
        NSEnumerator* values = [hotKeyRemoteEventMapping objectEnumerator];
        NSNumber* remoteIdentifier;
        while( (remoteIdentifier = [values nextObject]) ) {
-               if ([remoteIdentifier unsignedIntValue] == identifier) return 
YES;
+               if ([remoteIdentifier unsignedIntegerValue] == identifier) 
return YES;
        }
        return NO;
 }
@@ -172,14 +172,14 @@
        EventHotKeyRef carbonHotKey;
 
        hotKeyID.signature = 'PTHk';
-       hotKeyID.id = (long)keycode;
+       hotKeyID.id = (UInt32)keycode;
        
        err = RegisterEventHotKey(keycode, modifiers, hotKeyID, 
GetEventDispatcherTarget(), 0, &carbonHotKey );
        
        if( err )
                return NO;
        
-       [hotKeyRemoteEventMapping setObject: [NSNumber 
numberWithInt:identifier] forKey: [NSNumber numberWithUnsignedInt: 
hotKeyID.id]];
+       [hotKeyRemoteEventMapping setObject: [NSNumber 
numberWithInteger:identifier] forKey: [NSNumber 
numberWithUnsignedInteger:hotKeyID.id]];
        
        return YES;
 }
@@ -209,8 +209,8 @@
 */
 
 - (RemoteControlEventIdentifier) remoteControlEventIdentifierForID: 
(NSUInteger) anId {
-       NSNumber* remoteEventIdentifier = [hotKeyRemoteEventMapping 
objectForKey:[NSNumber numberWithUnsignedInt: anId]];
-       return [remoteEventIdentifier unsignedIntValue];
+       NSNumber* remoteEventIdentifier = [hotKeyRemoteEventMapping 
objectForKey:[NSNumber numberWithUnsignedInteger:anId]];
+       return [remoteEventIdentifier unsignedIntegerValue];
 }
 
 - (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event 
pressedDown: (BOOL) pressedDown {

Modified: 
trunk/vendorsrc/martinkahr/RemoteControlWrapper/HIDRemoteControlDevice.m
===================================================================
--- trunk/vendorsrc/martinkahr/RemoteControlWrapper/HIDRemoteControlDevice.m    
2009-09-03 19:01:14 UTC (rev 5637)
+++ trunk/vendorsrc/martinkahr/RemoteControlWrapper/HIDRemoteControlDevice.m    
2009-09-03 19:24:42 UTC (rev 5638)
@@ -85,7 +85,7 @@
                NSNumber* identifier;
                supportedButtonEvents = 0;
                while(identifier = [enumerator nextObject]) {
-                       supportedButtonEvents |= [identifier intValue];
+                       supportedButtonEvents |= [identifier integerValue];
                }
                
                fixSecureEventInputBug = [[NSUserDefaults standardUserDefaults] 
boolForKey: @"remoteControlWrapperFixSecureEventInputBug"];
@@ -285,7 +285,7 @@
                
        NSNumber* buttonId = [[self cookieToButtonMapping] objectForKey: 
cookieString];
        if (buttonId != nil) {
-               [self sendRemoteButtonEvent: [buttonId intValue] pressedDown: 
(sumOfValues>0)];
+               [self sendRemoteButtonEvent: [buttonId integerValue] 
pressedDown: (sumOfValues>0)];
        } else {
                // let's see if a number of events are stored in the cookie 
string. this does
                // happen when the main thread is too busy to handle all 
incoming events in time.
@@ -436,7 +436,7 @@
                        if (object == nil || ![object isKindOfClass:[NSNumber 
class]]) continue;                        
                        usagePage = [object longValue];
 
-                       [allCookies addObject: [NSNumber 
numberWithInt:(NSInteger)cookie]];
+                       [allCookies addObject: [NSNumber 
numberWithInteger:(int)cookie]];
                }
        } else {
                return NO;
@@ -460,7 +460,7 @@
                        IOHIDElementCookie cookie;
                        NSEnumerator *allCookiesEnumerator = [allCookies 
objectEnumerator];
                        
-                       while (cookie = 
(IOHIDElementCookie)[[allCookiesEnumerator nextObject] intValue]) {
+                       while (cookie = 
(IOHIDElementCookie)[[allCookiesEnumerator nextObject] integerValue]) {
                                (*queue)->addElement(queue, cookie, 0);
                        }
                                                                          

Modified: 
trunk/vendorsrc/martinkahr/RemoteControlWrapper/KeyspanFrontRowControl.m
===================================================================
--- trunk/vendorsrc/martinkahr/RemoteControlWrapper/KeyspanFrontRowControl.m    
2009-09-03 19:01:14 UTC (rev 5637)
+++ trunk/vendorsrc/martinkahr/RemoteControlWrapper/KeyspanFrontRowControl.m    
2009-09-03 19:24:42 UTC (rev 5638)
@@ -35,12 +35,12 @@
 @implementation KeyspanFrontRowControl
 
 - (void) setCookieMappingInDictionary: (NSMutableDictionary*) 
_cookieToButtonMapping   {       
-       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlus]             forKey:@"11_18_99_10_"];
-       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMinus]            forKey:@"11_18_98_10_"];           
    
-       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMenu]             forKey:@"11_18_58_10_"];           
    
-       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay]             forKey:@"11_18_61_10_"];
-       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight]            forKey:@"11_18_96_10_"];
-       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft]             forKey:@"11_18_97_10_"];
+       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonPlus]                 forKey:@"11_18_99_10_"];
+       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonMinus]                forKey:@"11_18_98_10_"];   
            
+       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonMenu]                 forKey:@"11_18_58_10_"];   
            
+       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonPlay]                 forKey:@"11_18_61_10_"];
+       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonRight]                forKey:@"11_18_96_10_"];
+       [_cookieToButtonMapping setObject:[NSNumber 
numberWithInteger:kRemoteButtonLeft]                 forKey:@"11_18_97_10_"];
        /* hold events are not being send by this device
        [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight_Hold]      forKey:@"14_6_4_2_"];
        [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft_Hold]       forKey:@"14_6_3_2_"];

Modified: 
trunk/vendorsrc/martinkahr/RemoteControlWrapper/MultiClickRemoteBehavior.m
===================================================================
--- trunk/vendorsrc/martinkahr/RemoteControlWrapper/MultiClickRemoteBehavior.m  
2009-09-03 19:01:14 UTC (rev 5637)
+++ trunk/vendorsrc/martinkahr/RemoteControlWrapper/MultiClickRemoteBehavior.m  
2009-09-03 19:24:42 UTC (rev 5638)
@@ -106,7 +106,7 @@
 }
 
 - (void) executeClickCountEvent: (NSArray*) values {
-       RemoteControlEventIdentifier event = [[values objectAtIndex: 0] 
unsignedIntValue]; 
+       RemoteControlEventIdentifier event = [[values objectAtIndex: 0] 
unsignedIntegerValue]; 
        NSTimeInterval eventTimePoint = [[values objectAtIndex: 1] doubleValue];
        
        BOOL finishedClicking = NO;
@@ -167,7 +167,7 @@
                                        NSNumber* timeNumber;           
                                        eventClickCount = 1;
                                        timeNumber = [NSNumber 
numberWithDouble:lastClickCountEventTime];
-                                       eventNumber= [NSNumber 
numberWithUnsignedInt:previousEvent];
+                                       eventNumber= [NSNumber 
numberWithUnsignedInteger:previousEvent];
                                        NSTimeInterval diffTime = 
maxClickTimeDifference-([NSDate 
timeIntervalSinceReferenceDate]-lastHoldEventTime);
                                        [self performSelector: 
@selector(executeClickCountEvent:) 
                                                           withObject: [NSArray 
arrayWithObjects:eventNumber, timeNumber, nil]
@@ -196,7 +196,7 @@
                        }
                        lastClickCountEvent = event;
                        timeNumber = [NSNumber 
numberWithDouble:lastClickCountEventTime];
-                       eventNumber= [NSNumber numberWithUnsignedInt:event];
+                       eventNumber= [NSNumber numberWithUnsignedInteger:event];
                }
                [self performSelector: @selector(executeClickCountEvent:) 
                                   withObject: [NSArray 
arrayWithObjects:eventNumber, timeNumber, nil]

Modified: trunk/vendorsrc/martinkahr/RemoteControlWrapper/RemoteControl.h
===================================================================
--- trunk/vendorsrc/martinkahr/RemoteControlWrapper/RemoteControl.h     
2009-09-03 19:01:14 UTC (rev 5637)
+++ trunk/vendorsrc/martinkahr/RemoteControlWrapper/RemoteControl.h     
2009-09-03 19:24:42 UTC (rev 5638)
@@ -43,7 +43,7 @@
 
 @class RemoteControl;
 
-typedef enum _RemoteControlEventIdentifier {
+enum _RemoteControlEventIdentifier {
        // normal events
        kRemoteButtonPlus                               =1<<1,
        kRemoteButtonMinus                              =1<<2,
@@ -62,7 +62,8 @@
        
        // special events (not supported by all devices)        
        kRemoteControl_Switched                 =1<<13,
-} RemoteControlEventIdentifier;
+};
+typedef NSUInteger RemoteControlEventIdentifier;
 
 @interface NSObject(RemoteControlDelegate)
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to