From 59d2613e919a1e411d317b7a6563349cf31b1a2c Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 14 Oct 2007 13:13:25 +0300
Subject: [PATCH] Statically type UIElements pointers in TFUSBController.

This avoids numerous warnings, including some about integer-to-pointer
conversions that could cause trouble in 64-bit builds.
---
 TFUSBController.m | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/TFUSBController.m b/TFUSBController.m
index 300ad97..7d22361 100644
--- a/TFUSBController.m
+++ b/TFUSBController.m
@@ -12,6 +12,7 @@
 //  uproar 0.1
 //  Copyright (c) 2001 Kasima Tharnpipitchai <me@kasima.org>
 #import "TFUSBController.h"
+#import "UIElements.h"
 
 @implementation TFUSBController
 
@@ -424,6 +425,10 @@ int initDevice(USBDeviceContext *device){
 	return device;
 }
 
+- (UIElements*) uiElements {
+	return [NSApp delegate];
+}
+
 - (id) getFileListForPath:(NSString*) path {	
 	if (myContext == nil)
 		return nil;
@@ -461,8 +466,8 @@ int initDevice(USBDeviceContext *device){
 		}
 	}
 	[tableView reloadData];
-	[[NSApp delegate] tableView:tableView didClickTableColumn:[[NSApp delegate]selectedColumn]];
-	[[NSApp delegate] tableView:tableView didClickTableColumn:[[NSApp delegate]selectedColumn]]; //twice so get the same sort as before
+	[[self uiElements] tableView:tableView didClickTableColumn:[[self uiElements]selectedColumn]];
+	[[self uiElements] tableView:tableView didClickTableColumn:[[self uiElements]selectedColumn]]; //twice so get the same sort as before
 	return nil;
 }
 
@@ -543,10 +548,10 @@ int initDevice(USBDeviceContext *device){
 //	[progressBar setDoubleValue:0];
 //	[progressTime setDoubleValue:0];
 	NSString* nameOnToppy = [fileInfo objectForKey:@"name"];
-	[[[NSApp delegate] currentlyField] setStringValue:
+	[[[self uiElements] currentlyField] setStringValue:
 		[NSLocalizedString(@"DOWNLOADING", @"Downloading: ") stringByAppendingString:nameOnToppy]];
-	[[[NSApp delegate] connectLight] setImage:[NSImage imageNamed:@"blink.tiff"]];
-	[[[NSApp delegate] currentlyField] displayIfNeeded];
+	[[[self uiElements] connectLight] setImage:[NSImage imageNamed:@"blink.tiff"]];
+	[[[self uiElements] currentlyField] displayIfNeeded];
 	//construct file send request
 	NSMutableString* fname = [NSMutableString stringWithString:[fileInfo objectForKey:@"name"]];
 	NSNumber* fileSize = [fileInfo objectForKey:@"fileSize"];
@@ -615,7 +620,7 @@ int initDevice(USBDeviceContext *device){
 		const UInt32 test_bigendian = EndianU32_NtoB(USB_DataHddFileData);
 		double amountReceived = 0xfe00 + offset;
 		NSData* testData = [NSData dataWithBytes:&test_bigendian length:4];
-		while ([header isEqualToData:testData] && [[[NSApp delegate] isConnected] intValue]) {
+		while ([header isEqualToData:testData] && [[[self uiElements] isConnected] intValue]) {
 			if ([priorityTransferQueue count] != 0) {
 				[self addTransfer:[NSDictionary dictionaryWithObjectsAndKeys:
 						fileInfo,@"filename", currentPath,@"path", savePath,@"savePath",
@@ -665,7 +670,7 @@ int initDevice(USBDeviceContext *device){
 			forKey:@"NSFileModificationDate"]
 		atPath:savePath];
 	[self turnTurboOn:NO];
-	if (looping) [[NSApp delegate] finishTransfer];
+	if (looping) [[self uiElements] finishTransfer];
 	return 0;
 }
 
@@ -805,20 +810,20 @@ int initDevice(USBDeviceContext *device){
 				startTime, @"startTime", nil]];
 		[pool release];
 		}
-	} while (offset < size && [[[NSApp delegate] isConnected] intValue]);
-	if ([[[NSApp delegate] isConnected] intValue])
+	} while (offset < size && [[[self uiElements] isConnected] intValue]);
+	if ([[[self uiElements] isConnected] intValue])
 		data = [self sendCommand:fileEndCmd toDevice:dev expectResponse:YES careForReturn:YES];
 	[fileHandle closeFile]; 
-	[[NSApp delegate] goToPath:[[NSApp delegate]currentPath]];
-	[[NSApp delegate] tableView:tableView didClickTableColumn:[[NSApp delegate]selectedColumn]];
-	[[NSApp delegate] tableView:tableView didClickTableColumn:[[NSApp delegate]selectedColumn]]; //twice so get the same sort as before
+	[[self uiElements] goToPath:[[self uiElements]currentPath]];
+	[[self uiElements] tableView:tableView didClickTableColumn:[[self uiElements]selectedColumn]];
+	[[self uiElements] tableView:tableView didClickTableColumn:[[self uiElements]selectedColumn]]; //twice so get the same sort as before
 	[self turnTurboOn:NO];
-	[[NSApp delegate] finishTransfer];
+	[[self uiElements] finishTransfer];
 }
 
 
 - (void) turnTurboOn:(BOOL) turnOn {
-	if (![[[NSApp delegate] isConnected] intValue]) return;
+	if (![[[self uiElements] isConnected] intValue]) return;
 	[self checkUSB:myContext];
 	int mode = 0;
 	if (turnOn) 
@@ -956,7 +961,7 @@ int initDevice(USBDeviceContext *device){
 }
 
 - (void) transfer:(id)sender {
-	while ([[[NSApp delegate] isConnected] intValue]) {
+	while ([[[self uiElements] isConnected] intValue]) {
 		NSAutoreleasePool *pool=[[NSAutoreleasePool alloc] init];
 		if ([priorityTransferQueue count] != 0 ) {
 			id currentTransfer = [priorityTransferQueue objectAtIndex:0];
-- 
2.11.4.GIT