diff --git a/Sources/VLAppController.mm b/Sources/VLAppController.mm index a6c7e1a..0d86e38 100644 --- a/Sources/VLAppController.mm +++ b/Sources/VLAppController.mm @@ -184,7 +184,7 @@ { NSString * hasFink = [self getLineFromCommand:@"bash -l which fink"]; - NSInteger response = + int response = [[NSAlert alertWithMessageText:title defaultButton: hasFink ? @"Install through fink" diff --git a/Sources/VLGrooveController.mm b/Sources/VLGrooveController.mm index 0b622d5..8fc9eab 100644 --- a/Sources/VLGrooveController.mm +++ b/Sources/VLGrooveController.mm @@ -62,7 +62,7 @@ [[self window] orderOut:self]; } -- (NSString *)browser:(NSBrowser *)sender titleOfColumn:(NSInteger)column +- (NSString *)browser:(NSBrowser *)sender titleOfColumn:(int)column { if (!column) return @"Style"; @@ -81,7 +81,7 @@ retain]; } -- (NSInteger)browser:(NSBrowser *)sender numberOfRowsInColumn:(NSInteger)column +- (int)browser:(NSBrowser *)sender numberOfRowsInColumn:(int)column { [fBrowser setTakesTitleFromPreviousColumn:NO]; [fBrowser setDoubleAction:@selector(endSheet:)]; @@ -94,7 +94,7 @@ } } -- (void)browser:(NSBrowser *)sender willDisplayCell:(id)cell atRow:(NSInteger)row column:(NSInteger)column +- (void)browser:(NSBrowser *)sender willDisplayCell:(id)cell atRow:(int)row column:(int)column { if (!column) { [cell setStringValue: diff --git a/Sources/VLSheetViewSelection.mm b/Sources/VLSheetViewSelection.mm index 843df58..70895c3 100644 --- a/Sources/VLSheetViewSelection.mm +++ b/Sources/VLSheetViewSelection.mm @@ -214,19 +214,19 @@ static VLSong sPasteboard; // // Data source for endings // -- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView +- (int)numberOfRowsInTableView:(NSTableView *)aTableView { return 1; } - (id)tableView:(NSTableView*)tv objectValueForTableColumn:(NSTableColumn *)col - row:(NSInteger)rowIndex + row:(int)rowIndex { int mask = [[col identifier] intValue]; return (fVoltaOK & mask) ? [NSNumber numberWithBool:(fVolta & mask)] : nil; } -- (void)tableView:(NSTableView *)tv setObjectValue:(id)val forTableColumn:(NSTableColumn *)col row:(NSInteger)rowIndex +- (void)tableView:(NSTableView *)tv setObjectValue:(id)val forTableColumn:(NSTableColumn *)col row:(int)rowIndex { int mask = [[col identifier] intValue]; diff --git a/Vocalese.xcodeproj/project.pbxproj b/Vocalese.xcodeproj/project.pbxproj index 112e4e3..eba6904 100644 --- a/Vocalese.xcodeproj/project.pbxproj +++ b/Vocalese.xcodeproj/project.pbxproj @@ -571,12 +571,10 @@ 2A37F4A9FDCFA73011CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = 95D7BF740AA699C600D5E02C /* Build configuration list for PBXProject "Vocalese" */; - compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 2A37F4AAFDCFA73011CA2CEA /* Vocalese */; projectDirPath = ""; projectRoot = ""; - shouldCheckCompatibility = 1; targets = ( 8D15AC270486D014006FF6A4 /* Vocalese */, 955E595B0957C0FC0045FDA5 /* TVLChord */, @@ -748,6 +746,7 @@ 95D7BF750AA699C600D5E02C /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; USER_HEADER_SEARCH_PATHS = "Sources/**"; }; name = Development; @@ -755,12 +754,14 @@ 95D7BF760AA699C600D5E02C /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; }; 95D7BF770AA699C600D5E02C /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Default; }; @@ -812,7 +813,7 @@ GCC_PREFIX_HEADER = Sources/Vocalese_Prefix.pch; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = Resources/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; PRODUCT_NAME = VocalEasel; WRAPPER_EXTENSION = app;