From 9351acec9492d1f5a780360d00bdb67dc04e92d4 Mon Sep 17 00:00:00 2001 From: Ron Conescu Date: Thu, 23 Apr 2015 15:06:28 -0700 Subject: [PATCH] [JIRA-2796] Declaring public static constants correctly. Updating these constant declarations to use the correct, safer technique. --- .../Library/Objects/APCJSONSerializer.h | 24 +++++++++--------- .../Library/Objects/APCJSONSerializer.m | 25 +++++++++++++++++++ 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/APCAppCore/APCAppCore/Library/Objects/APCJSONSerializer.h b/APCAppCore/APCAppCore/Library/Objects/APCJSONSerializer.h index a18a3d7c..587d66e6 100644 --- a/APCAppCore/APCAppCore/Library/Objects/APCJSONSerializer.h +++ b/APCAppCore/APCAppCore/Library/Objects/APCJSONSerializer.h @@ -41,18 +41,18 @@ Imported (stolen, duplicated) from APCDataArchiver. Working on normalizing that. */ -static NSString * const kAPCSerializedDataKey_QuestionType = @"questionType"; -static NSString * const kAPCSerializedDataKey_QuestionTypeName = @"questionTypeName"; -static NSString * const kAPCSerializedDataKey_UserInfo = @"userInfo"; -static NSString * const kAPCSerializedDataKey_Identifier = @"identifier"; -static NSString * const kAPCSerializedDataKey_Item = @"item"; -static NSString * const kAPCSerializedDataKey_TaskRun = @"taskRun"; -static NSString * const kAPCSerializedDataKey_Files = @"files"; -static NSString * const kAPCSerializedDataKey_AppName = @"appName"; -static NSString * const kAPCSerializedDataKey_AppVersion = @"appVersion"; -static NSString * const kAPCSerializedDataKey_FileInfoName = @"filename"; -static NSString * const kAPCSerializedDataKey_FileInfoTimeStamp = @"timestamp"; -static NSString * const kAPCSerializedDataKey_FileInfoContentType = @"contentType"; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_QuestionType; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_QuestionTypeName; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_UserInfo; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_Identifier; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_Item; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_TaskRun; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_Files; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_AppName; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_AppVersion; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_FileInfoName; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_FileInfoTimeStamp; +FOUNDATION_EXPORT NSString * const kAPCSerializedDataKey_FileInfoContentType; /** diff --git a/APCAppCore/APCAppCore/Library/Objects/APCJSONSerializer.m b/APCAppCore/APCAppCore/Library/Objects/APCJSONSerializer.m index c86f5864..e95b30a7 100644 --- a/APCAppCore/APCAppCore/Library/Objects/APCJSONSerializer.m +++ b/APCAppCore/APCAppCore/Library/Objects/APCJSONSerializer.m @@ -37,6 +37,31 @@ #import + +/** + Publicly-declared constants (in my header file). + + These constants are used by a couple of different classes + which prepare stuff for me to serialize. + + Imported (stolen, duplicated) from APCDataArchiver. + Working on normalizing that. + */ +NSString * const kAPCSerializedDataKey_QuestionType = @"questionType"; +NSString * const kAPCSerializedDataKey_QuestionTypeName = @"questionTypeName"; +NSString * const kAPCSerializedDataKey_UserInfo = @"userInfo"; +NSString * const kAPCSerializedDataKey_Identifier = @"identifier"; +NSString * const kAPCSerializedDataKey_Item = @"item"; +NSString * const kAPCSerializedDataKey_TaskRun = @"taskRun"; +NSString * const kAPCSerializedDataKey_Files = @"files"; +NSString * const kAPCSerializedDataKey_AppName = @"appName"; +NSString * const kAPCSerializedDataKey_AppVersion = @"appVersion"; +NSString * const kAPCSerializedDataKey_FileInfoName = @"filename"; +NSString * const kAPCSerializedDataKey_FileInfoTimeStamp = @"timestamp"; +NSString * const kAPCSerializedDataKey_FileInfoContentType = @"contentType"; + + + /** We use this regular-expression pattern to extract UUIDs from CoreData object IDs.