Permalink
Browse files

Fixes compiler warnings after Xcode update.

  • Loading branch information...
Chris Wilson
Chris Wilson committed Mar 5, 2013
1 parent 12d56c7 commit 89a0d597233e6076b3f062692dbb3a16ec8dd3ba
View
@@ -0,0 +1,17 @@
+# Xcode
+.DS_Store
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+*.xcworkspace
+!default.xcworkspace
+xcuserdata
+profile
+*.moved-aside
+DerivedData
@@ -469,7 +469,7 @@
C1CEFE481463779C00466EB3 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0440;
+ LastUpgradeCheck = 0460;
ORGANIZATIONNAME = "mFluent LLC";
};
buildConfigurationList = C1CEFE4B1463779C00466EB3 /* Build configuration list for PBXProject "CoreDataUtil" */;
@@ -666,6 +666,11 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
@@ -680,9 +685,11 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
+ PROVISIONING_PROFILE = "";
SDKROOT = macosx;
};
name = Debug;
@@ -693,6 +700,11 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -701,8 +713,10 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
+ PROVISIONING_PROFILE = "";
SDKROOT = macosx;
};
name = Release;
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "0450"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C1CEFE501463779C00466EB3"
- BuildableName = "CoreDataPro.app"
- BlueprintName = "CoreDataUtil"
- ReferencedContainer = "container:CoreDataUtil.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- <TestableReference
- skipped = "NO">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C1CEFE741463779D00466EB3"
- BuildableName = "CoreDataUtilTests.octest"
- BlueprintName = "CoreDataUtilTests"
- ReferencedContainer = "container:CoreDataUtil.xcodeproj">
- </BuildableReference>
- </TestableReference>
- </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C1CEFE501463779C00466EB3"
- BuildableName = "CoreDataPro.app"
- BlueprintName = "CoreDataUtil"
- ReferencedContainer = "container:CoreDataUtil.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C1CEFE501463779C00466EB3"
- BuildableName = "CoreDataPro.app"
- BlueprintName = "CoreDataUtil"
- ReferencedContainer = "container:CoreDataUtil.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C1CEFE501463779C00466EB3"
- BuildableName = "CoreDataPro.app"
- BlueprintName = "CoreDataUtil"
- ReferencedContainer = "container:CoreDataUtil.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "0450"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "C1CEFE871463779D00466EB3"
- BuildableName = "CoreDataUtilImporter.mdimporter"
- BlueprintName = "CoreDataUtilImporter"
- ReferencedContainer = "container:CoreDataUtil.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- </Testables>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
View
Binary file not shown.
@@ -54,9 +54,9 @@
- (NSUndoManager*) undoManager;
-- (void) applyPredicate: (NSString*) entityName: (NSPredicate*) predicate;
+- (void) applyPredicate: (NSString*) entityName predicate:(NSPredicate*) predicate;
- (void)sortEntityData:(NSString *)fieldName;
-+ (id)getDisplayValueForObject:(id)obj: (NSDateFormatterStyle) dateStyle;
++ (id)getDisplayValueForObject:(id)obj dateStyle:(NSDateFormatterStyle) dateStyle;
- (NSInteger)getCurrentHistoryIndex;
- (void)setCurrentHistoryIndex:(NSInteger)currentIndex;
- (void)updateCoreDataHistory:(NSString *)name :(NSPredicate *)predicate;
@@ -196,7 +196,7 @@ - (NSArray*) fetchObjectsByEntityName: (NSString*) entityName :(NSPredicate*) pr
return fetchedObjects;
}
-- (void) applyPredicate: (NSString*) entityName: (NSPredicate*) predicate {
+- (void) applyPredicate: (NSString*) entityName predicate:(NSPredicate*) predicate {
self.entityData = [self fetchObjectsByEntityName:entityName: predicate];
}
@@ -214,7 +214,7 @@ - (void)sortEntityData:(NSString *)fieldName
NSInteger rowNum = 0;
for (NSArray *row in self.entityData)
{
- id valueObj = [MFLCoreDataIntrospection getDisplayValueForObject:[row valueForKey:fieldName]: self.dateStyle];
+ id valueObj = [MFLCoreDataIntrospection getDisplayValueForObject:[row valueForKey:fieldName] dateStyle:self.dateStyle];
if ([valueObj isKindOfClass:[NSString class]] && [formatter dateFromString:valueObj])
{
valueObj = [formatter dateFromString:valueObj];
@@ -244,7 +244,7 @@ - (void)sortEntityData:(NSString *)fieldName
self.entityData = temp;
}
-+ (id)getDisplayValueForObject:(id)obj: (NSDateFormatterStyle) dateStyle
++ (id)getDisplayValueForObject:(id)obj dateStyle:(NSDateFormatterStyle) dateStyle
{
if (obj == nil)
{
@@ -47,7 +47,7 @@ - (BOOL) openFileHelper: (NSString*) filename {
if (dbFilePath != nil) {
dbUrl = [NSURL URLWithString:dbFilePath];
}
- BOOL result = [self.mainWindowController openFiles: momUrl: dbUrl: [persistenceFormat intValue]];
+ BOOL result = [self.mainWindowController openFiles: momUrl persistenceFile:dbUrl persistenceType:[persistenceFormat intValue]];
if (result)
{
@@ -78,7 +78,7 @@ - (BOOL) openFileHelper: (NSString*) filename {
persistenceFormat = @MFL_SQLiteStoreType;
}
- BOOL result = [self.mainWindowController openFiles:newValues[MFL_MOM_FILE_KEY] :newValues[MFL_DB_FILE_KEY]: [persistenceFormat intValue]];
+ BOOL result = [self.mainWindowController openFiles:newValues[MFL_MOM_FILE_KEY] persistenceFile:newValues[MFL_DB_FILE_KEY] persistenceType:[persistenceFormat intValue]];
if (result)
{
@@ -116,7 +116,7 @@ - (BOOL) openFileHelper: (NSString*) filename {
persistenceFormat = @MFL_SQLiteStoreType;
}
- BOOL result = [self.mainWindowController openFiles:newValues[MFL_MOM_FILE_KEY] :newValues[MFL_DB_FILE_KEY]: [persistenceFormat intValue]];
+ BOOL result = [self.mainWindowController openFiles:newValues[MFL_MOM_FILE_KEY] persistenceFile:newValues[MFL_DB_FILE_KEY] persistenceType:[persistenceFormat intValue]];
if (result)
{
@@ -229,7 +229,7 @@ - (IBAction)newAction:(id)sender
persistenceFormat = @MFL_SQLiteStoreType;
}
- BOOL result = [self.mainWindowController openFiles:newValues[MFL_MOM_FILE_KEY] :newValues[MFL_DB_FILE_KEY]: [persistenceFormat intValue]];
+ BOOL result = [self.mainWindowController openFiles:newValues[MFL_MOM_FILE_KEY] persistenceFile:newValues[MFL_DB_FILE_KEY] persistenceType:[persistenceFormat intValue]];
if (result) {
self.projectHasChanged = true;
@@ -15,10 +15,10 @@
@interface MFLCellBuilder : NSObject
-+ (MFLTextTableCellView* ) textCellWithString:(NSTableView *)tableView: (NSString*) textToSet: (id) owner;
-+ (MFLTextTableCellView* ) numberCellWithString:(NSTableView *)tableView: (NSString*) textToSet: (id) owner;
-+ (MFLTextTableCellView* ) nullCell:(NSTableView *)tableView: (id) owner;
-+ (MFLButtonTableViewCell* ) objectCellWithString:(NSTableView *)tableView: (NSString*) textToSet: (id) owner;
++ (MFLTextTableCellView* ) textCellWithString:(NSTableView *)tableView textToSet:(NSString*) textToSet owner:(id) owner;
++ (MFLTextTableCellView* ) numberCellWithString:(NSTableView *)tableView textToSet: (NSString*) textToSet owner:(id) owner;
++ (MFLTextTableCellView* ) nullCell:(NSTableView *)tableView owner:(id) owner;
++ (MFLButtonTableViewCell* ) objectCellWithString:(NSTableView *)tableView textToSet:(NSString*) textToSet owner:(id) owner;
+ (InAppPurchaseTableCellView *)inAppPurchaseCellWithString:(NSTableView *)tableView :(NSString *)textToSet :(NSString *)priceText :(NSInteger)row :(id)owner;
@end
@@ -17,7 +17,7 @@ @implementation MFLCellBuilder
#pragma mark -
#pragma mark Data Cell Helper
-+ (MFLTextTableCellView* ) textCellWithString:(NSTableView *)tableView: (NSString*) textToSet: (id) owner {
++ (MFLTextTableCellView* ) textCellWithString:(NSTableView *)tableView textToSet:(NSString*) textToSet owner:(id) owner {
MFLTextTableCellView* textCell = [tableView makeViewWithIdentifier:MFL_TEXT_CELL owner:owner];
[[textCell infoField] setAlignment:NSLeftTextAlignment];
@@ -28,7 +28,7 @@ + (MFLTextTableCellView* ) textCellWithString:(NSTableView *)tableView: (NSStrin
return textCell;
}
-+ (MFLTextTableCellView* ) numberCellWithString:(NSTableView *)tableView: (NSString*) textToSet: (id) owner {
++ (MFLTextTableCellView* ) numberCellWithString:(NSTableView *)tableView textToSet:(NSString*) textToSet owner: (id) owner {
MFLTextTableCellView* textCell = [tableView makeViewWithIdentifier:MFL_TEXT_CELL owner:owner];
[[textCell infoField] setAlignment:NSRightTextAlignment];
@@ -39,7 +39,7 @@ + (MFLTextTableCellView* ) numberCellWithString:(NSTableView *)tableView: (NSStr
return textCell;
}
-+ (MFLTextTableCellView* ) nullCell:(NSTableView *)tableView: (id) owner {
++ (MFLTextTableCellView* ) nullCell:(NSTableView *)tableView owner: (id) owner {
MFLTextTableCellView* textCell = [tableView makeViewWithIdentifier:MFL_TEXT_CELL owner:owner];
[[textCell infoField] setAlignment:NSRightTextAlignment];
@@ -50,7 +50,7 @@ + (MFLTextTableCellView* ) nullCell:(NSTableView *)tableView: (id) owner {
return textCell;
}
-+ (MFLButtonTableViewCell* ) objectCellWithString:(NSTableView *)tableView: (NSString*) textToSet: (id) owner {
++ (MFLButtonTableViewCell* ) objectCellWithString:(NSTableView *)tableView textToSet:(NSString*) textToSet owner:(id) owner {
MFLButtonTableViewCell* buttonCell = [tableView makeViewWithIdentifier:MFL_BUTTON_CELL owner:owner];
[[buttonCell infoField] setAlignment:NSRightTextAlignment];
@@ -24,7 +24,7 @@
@property (weak) IBOutlet NSSegmentedControl *historySegmentedControl;
//- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename;
-- (BOOL) openFiles:(NSURL*) momFile :(NSURL*) perstenceFile: (NSInteger) persistenceType;
+- (BOOL) openFiles:(NSURL*) momFile persistenceFile:(NSURL*) persistenceFile persistenceType: (NSInteger) persistenceType;
- (NSURL*) momFileUrl;
- (NSURL*) persistenceFileUrl;
Oops, something went wrong.

0 comments on commit 89a0d59

Please sign in to comment.