Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated project for Xcode 4

  • Loading branch information...
commit 52f7f37ca52c1711537f35e6c2580b20a59787b7 1 parent 86eb075
@p2 authored
View
15 .gitignore
@@ -0,0 +1,15 @@
+
+# ignore OS X and server files
+.DS_Store
+.htaccess
+
+# build directories
+build/*
+
+# Xcode user data
+**.pbxuser
+**.mode?v?
+**.perspectivev?
+**.xcworkspace
+**/xcuserdata
+
View
2  CSVDocument/CSVDocument.h
@@ -41,7 +41,7 @@
NSUInteger parseNumHeaderRows; // if set before parsing, the first x rows will be header rows
BOOL parseSuccessful;
- BOOL autoDetectSeparator; // if YES will check for other separators (";" and TAB) than the comma
+ BOOL autoDetectSeparator; // NO by default. If YES will check for other separators (";", TAB and "|") than the comma
BOOL mustAbortImport;
BOOL didAbortImport;
View
4 CSVDocument/CSVDocument.m
@@ -125,7 +125,7 @@ - (BOOL) parseCSVString:(NSString *)string maxRows:(NSUInteger)maxRows error:(NS
NSUInteger testStringLength = MIN([string length], 200);
NSString *testString = [string substringToIndex:testStringLength];
- NSArray *possSeparators = [NSArray arrayWithObjects:@";", @" ", nil];
+ NSArray *possSeparators = [NSArray arrayWithObjects:@";", @" ", @"|", nil];
for(NSString *s in possSeparators) {
if ([[testString componentsSeparatedByString:s] count] > [[testString componentsSeparatedByString:separator] count]) {
@@ -371,7 +371,7 @@ - (BOOL) addColumn:(CSVColumn *)newColumn
// check if the key is free
if (nil != [columnDict objectForKey:newColumn.key]) {
- NSLog(@"Column with key '%@' is already present, we would replace that one!");
+ NSLog(@"Column with key '%@' is already present, we would replace that one!", newColumn.key);
return NO;
}
View
2  CSVInspector.m
@@ -101,7 +101,7 @@ - (unsigned) retainCount
return UINT_MAX;
}
-- (void) release // ha, try to release this!
+- (oneway void) release // ha, try to release this!
{
}
View
104 CSVManipulator.xcodeproj/project.pbxproj
@@ -3,23 +3,9 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 44;
+ objectVersion = 46;
objects = {
-/* Begin PBXAggregateTarget section */
- EE1377031088767D00D31816 /* Save IB Files */ = {
- isa = PBXAggregateTarget;
- buildConfigurationList = EE13770E108876B900D31816 /* Build configuration list for PBXAggregateTarget "Save IB Files" */;
- buildPhases = (
- EE1377021088767D00D31816 /* ShellScript */,
- );
- dependencies = (
- );
- name = "Save IB Files";
- productName = "Save IB Files";
- };
-/* End PBXAggregateTarget section */
-
/* Begin PBXBuildFile section */
8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; };
8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165FFE840EACC02AAC07 /* InfoPlist.strings */; };
@@ -374,8 +360,11 @@
/* Begin PBXProject section */
2A37F4A9FDCFA73011CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0420;
+ };
buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "CSVManipulator" */;
- compatibilityVersion = "Xcode 3.0";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -389,7 +378,6 @@
projectRoot = "";
targets = (
8D15AC270486D014006FF6A4 /* CSVManipulator */,
- EE1377031088767D00D31816 /* Save IB Files */,
);
};
/* End PBXProject section */
@@ -418,23 +406,6 @@
};
/* End PBXResourcesBuildPhase section */
-/* Begin PBXShellScriptBuildPhase section */
- EE1377021088767D00D31816 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [ -f \"/Users/pp/Programming/SaveIBFiles.scpt\" ]; then\n\tosascript \"/Users/pp/Programming/SaveIBFiles.scpt\"\nfi";
- showEnvVarsInLog = 0;
- };
-/* End PBXShellScriptBuildPhase section */
-
/* Begin PBXSourcesBuildPhase section */
8D15AC300486D014006FF6A4 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -521,7 +492,6 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -551,70 +521,45 @@
C05733CC08A9546B00998B17 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "../core-plot/**";
+ ARCHS = "$(NATIVE_ARCH_ACTUAL)";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "./**";
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
OTHER_CFLAGS = (
"-DCSV_STRING_EXPORTING",
"-DDEBUG",
);
- PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ SDKROOT = macosx;
};
name = Debug;
};
C05733CD08A9546B00998B17 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
- FRAMEWORK_SEARCH_PATHS = "../core-plot//**";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "./**";
- PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
- };
- name = Release;
- };
- EE1377041088767D00D31816 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- PRODUCT_NAME = "Save IB Files";
- };
- name = Debug;
- };
- EE1377051088767D00D31816 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- PRODUCT_NAME = "Save IB Files";
- ZERO_LINK = NO;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
+ SDKROOT = macosx;
};
name = Release;
};
EE714642113568CA00418030 /* Debug Plus */ = {
isa = XCBuildConfiguration;
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "../core-plot/**";
+ ARCHS = "$(NATIVE_ARCH_ACTUAL)";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "./**";
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
OTHER_CFLAGS = (
"-DCSV_STRING_EXPORTING",
"-DDEBUG",
);
- PREBINDING = NO;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ SDKROOT = macosx;
};
name = "Debug Plus";
};
@@ -623,7 +568,6 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -636,16 +580,6 @@
};
name = "Debug Plus";
};
- EE714644113568CA00418030 /* Debug Plus */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- PRODUCT_NAME = "Save IB Files";
- };
- name = "Debug Plus";
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -669,16 +603,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- EE13770E108876B900D31816 /* Build configuration list for PBXAggregateTarget "Save IB Files" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- EE1377041088767D00D31816 /* Debug */,
- EE714644113568CA00418030 /* Debug Plus */,
- EE1377051088767D00D31816 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
/* End XCConfigurationList section */
};
rootObject = 2A37F4A9FDCFA73011CA2CEA /* Project object */;
View
2  FileExport/PPStringFormatManager.m
@@ -106,7 +106,7 @@ - (unsigned) retainCount
return UINT_MAX;
}
-- (void) release // ha, try to release this!
+- (oneway void) release // ha, try to release this!
{
}
View
3  MyDocument.m
@@ -201,6 +201,7 @@ - (void) detachStringParsing:(NSString *)string
NSAutoreleasePool *detachPool = [[NSAutoreleasePool alloc] init];
NSError *error;
+ csvDocument.autoDetectSeparator = YES;
if ([csvDocument parseCSVString:string maxRows:0 error:&error]) {
self.importFormat = [PPStringFormat csvFormat];
}
@@ -446,7 +447,7 @@ - (void) performCalculationWithArgs:(NSDictionary *)args // designed to run i
for (NSNumber *iNum in matchIndexes) {
NSUInteger i = [iNum unsignedIntValue];
- if (i >= 0 && i < num_matches) {
+ if (i < num_matches) {
NSString *match = [matches objectAtIndex:i];
fullRange = NSMakeRange(0, [evalString length]);
Please sign in to comment.
Something went wrong with that request. Please try again.