SP_REFACTOR: Workaround for naming conflict with postNotificationOnMainThread: which also exists in TCMPortMapper.framework; NSUserDefaults access now permitted in SP_REFACTOR blocks for a few prefs keys

1 files changed, 6 insertions, 0 deletions

diff --git a/Source/SPConstants.m b/Source/SPConstants.m
index 87600d87..39b925c1 100644
--- a/Source/SPConstants.m
+++ b/Source/SPConstants.m
@@ -82,9 +82,15 @@ NSString *SPLoadBlobsAsNeeded                    = @"LoadBlobsAsNeeded";
 NSString *SPTableRowCountQueryLevel              = @"TableRowCountQueryLevel";
 NSString *SPTableRowCountCheapSizeBoundary       = @"TableRowCountCheapLookupSizeBoundary";
 NSString *SPNewFieldsAllowNulls                  = @"NewFieldsAllowNulls";
+#ifndef SP_REFACTOR
 NSString *SPLimitResults                         = @"LimitResults";
 NSString *SPLimitResultsValue                    = @"LimitResultsValue";
 NSString *SPNullValue                            = @"NullValue";
+#else
+NSString *SPLimitResults                         = @"SPLimitResults";
+NSString *SPLimitResultsValue                    = @"SPLimitResultsValue";
+NSString *SPNullValue                            = @"SPNullValue";
+#endif
 NSString *SPGlobalResultTableFont                = @"GlobalResultTableFont";
 NSString *SPFilterTableDefaultOperator           = @"FilterTableDefaultOperator";
 NSString *SPFilterTableDefaultOperatorLastItems  = @"FilterTableDefaultOperatorLastItems";