Revision: 4493
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4493&view=rev
Author:   hofman
Date:     2008-09-01 10:26:11 +0000 (Mon, 01 Sep 2008)

Log Message:
-----------
Assign remote control directoly to ivar rather than using an temporary local 
variable. Type ivar appropriately.

Modified Paths:
--------------
    trunk/SKApplicationController.h
    trunk/SKApplicationController.m

Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h     2008-09-01 10:18:13 UTC (rev 4492)
+++ trunk/SKApplicationController.h     2008-09-01 10:26:11 UTC (rev 4493)
@@ -40,10 +40,10 @@
 
 @class SUUpdater, SKLine, SKDownloadController;
 
[EMAIL PROTECTED] RemoteControl;
[EMAIL PROTECTED] RemoteControlContainer;
 
 @interface SKApplicationController : NSObject {
-    RemoteControl *remoteControl;
+    RemoteControlContainer *remoteControl;
     BOOL remoteScrolling;
 }
 

Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m     2008-09-01 10:18:13 UTC (rev 4492)
+++ trunk/SKApplicationController.m     2008-09-01 10:26:11 UTC (rev 4493)
@@ -190,20 +190,18 @@
        
     [self doSpotlightImportIfNeeded];
     
-    RemoteControlContainer *container = nil;
     if ([sud boolForKey:SKEnableAppleRemoteKey]) {
-        if (container == nil) container = [[RemoteControlContainer alloc] 
initWithDelegate:self];
-        [container instantiateAndAddRemoteControlDeviceWithClass:[AppleRemote 
class]]; 
+        if (remoteControl == nil) remoteControl = [[RemoteControlContainer 
alloc] initWithDelegate:self];
+        [remoteControl 
instantiateAndAddRemoteControlDeviceWithClass:[AppleRemote class]];     
     }
     if ([sud boolForKey:SKEnableKeyspanFrontRowControlKey]) {
-        if (container == nil) container = [[RemoteControlContainer alloc] 
initWithDelegate:self];
-        [container 
instantiateAndAddRemoteControlDeviceWithClass:[KeyspanFrontRowControl class]];
+        if (remoteControl == nil) remoteControl = [[RemoteControlContainer 
alloc] initWithDelegate:self];
+        [remoteControl 
instantiateAndAddRemoteControlDeviceWithClass:[KeyspanFrontRowControl class]];
     }
     if ([sud boolForKey:SKEnableKeyboardRemoteSimulationKey]) {
-        if (container == nil) container = [[RemoteControlContainer alloc] 
initWithDelegate:self];
-        [container 
instantiateAndAddRemoteControlDeviceWithClass:[GlobalKeyboardDevice class]];    
    
+        if (remoteControl == nil) remoteControl = [[RemoteControlContainer 
alloc] initWithDelegate:self];
+        [remoteControl 
instantiateAndAddRemoteControlDeviceWithClass:[GlobalKeyboardDevice class]];    
     }
-    remoteControl = container;
     
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
     [nc addObserver:self selector:@selector(registerCurrentDocuments:) 


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

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to