Merge branch 'echamberlain-Categories' into development

Closes #422.
facebookarchive · Feb 25, 2011 · 13e8440 · 13e8440
2 parents 338ef3d + bb13c54
commit 13e8440
Show file tree

Hide file tree

Showing 45 changed files with 173 additions and 669 deletions.
diff --git a/samples/Core/TTCoreDemo/Configurations/App.xcconfig b/samples/Core/TTCoreDemo/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTCoreDemo
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB)
diff --git a/samples/Network/TTNetworkDemo/Configurations/App.xcconfig b/samples/Network/TTNetworkDemo/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTNetworkDemo
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB)
diff --git a/samples/Style/TTCSSStyleSheets/Configurations/App.xcconfig b/samples/Style/TTCSSStyleSheets/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTCSSStyleSheets
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB) $(EXTTHREE20CSSSTYLE_LIB)
diff --git a/samples/Style/TTStyleCatalog/Configurations/App.xcconfig b/samples/Style/TTStyleCatalog/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTStyleCatalog
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB)
diff --git a/samples/TTCatalog/Configurations/App.xcconfig b/samples/TTCatalog/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTCatalog
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB)
diff --git a/samples/TTFacebook/Configurations/App.xcconfig b/samples/TTFacebook/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTFacebook
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB) $(EXTTHREE20CSSSTYLE_LIB) $(EXTTHREE20JSONYAJL_LIB)
diff --git a/samples/TTFacebook/TTFacebook.xcodeproj/project.pbxproj b/samples/TTFacebook/TTFacebook.xcodeproj/project.pbxproj
diff --git a/samples/TTNavigatorDemo/Configurations/App.xcconfig b/samples/TTNavigatorDemo/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTNavigatorDemo
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB)
diff --git a/samples/TTTwitter/Configurations/App.xcconfig b/samples/TTTwitter/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTTwitter
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB) $(EXTTHREE20JSONYAJL_LIB)
diff --git a/samples/UI/TTNibDemo/Configurations/App.xcconfig b/samples/UI/TTNibDemo/Configurations/App.xcconfig
@@ -21,5 +21,3 @@
 BASE_PRODUCT_NAME       = TTNibDemo
 PRODUCT_NAME            = $(BASE_PRODUCT_NAME)
 BUILD_LIBRARY_VERSION   = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB) $(THREE20STYLE_LIB) $(THREE20UICOMMON_LIB) $(THREE20UINAVIGATOR_LIB) $(THREE20UI_LIB) $(THREE20_LIB)
diff --git a/samples/common/Configurations/App.xcconfig b/samples/common/Configurations/App.xcconfig
@@ -25,7 +25,7 @@ INFOPLIST_FILE = $(BASE_PRODUCT_NAME)-Info.plist
 
 // Linker Flags
 
-OTHER_LDFLAGS           = $(OBJC_LIBRARY) $(OBJC_ALLLOAD)
+OTHER_LDFLAGS           = $(OBJC_LIBRARY)
 
 // Warning flags
 

diff --git a/src/Three20Core/Headers/TTCorePreprocessorMacros.h b/src/Three20Core/Headers/TTCorePreprocessorMacros.h
@@ -26,8 +26,8 @@
 #define __TTDEPRECATED_METHOD __attribute__((deprecated))
 
 /**
- * Add this macro to the end of each category addition implementation, so we don't have to use -all_load
- * or -force_load to load object files from static libraries that only contain categories and no classes.
+ * Add this macro before each category implementation, so we don't have to use -all_load or -force_load
+ * to load object files from static libraries that only contain categories and no classes.
  * See http://developer.apple.com/library/mac/#qa/qa2006/qa1490.html for more info.
  */
 #define TT_FIX_CATEGORY_BUG(name) @interface TT_FIX_CATEGORY_BUG_##name @end @implementation TT_FIX_CATEGORY_BUG_##name @end

diff --git a/src/Three20Core/Sources/NSArrayAdditions.m b/src/Three20Core/Sources/NSArrayAdditions.m
@@ -16,7 +16,9 @@
 
 #import "Three20Core/NSArrayAdditions.h"
 
+// Core
 #import "Three20Core/NSObjectAdditions.h"
+#import "Three20Core/TTCorePreprocessorMacros.h"
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -25,6 +27,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSArrayAdditions)
+
 @implementation NSArray (TTCategory)
 
 
@@ -134,6 +138,3 @@ - (BOOL)containsObject:(id)object withSelector:(SEL)selector {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSArrayAdditions)
diff --git a/src/Three20Core/Sources/NSDataAdditions.m b/src/Three20Core/Sources/NSDataAdditions.m
@@ -18,13 +18,18 @@
 
 #import <CommonCrypto/CommonDigest.h>
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSDataAdditions)
+
 @implementation NSData (TTCategory)
 
 
@@ -53,6 +58,3 @@ - (NSString*)sha1Hash {
 }
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSDataAdditions)
diff --git a/src/Three20Core/Sources/NSDateAdditions.m b/src/Three20Core/Sources/NSDateAdditions.m
@@ -27,6 +27,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSDateAdditions)
+
 @implementation NSDate (TTCategory)
 
 
@@ -252,6 +254,3 @@ - (NSString*)formatYear {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSDateAdditions)
diff --git a/src/Three20Core/Sources/NSMutableArrayAdditions.m b/src/Three20Core/Sources/NSMutableArrayAdditions.m
@@ -16,6 +16,8 @@
 
 #import "Three20Core/NSMutableArrayAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
 #import "Three20Core/TTGlobalCore.h"
 
 
@@ -25,6 +27,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSMutableArrayAdditions)
+
 @implementation NSMutableArray (TTCategory)
 
 
@@ -37,6 +41,3 @@ - (void) addNonEmptyString:(NSString*)string {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSMutableArrayAdditions)
diff --git a/src/Three20Core/Sources/NSMutableDictionaryAdditions.m b/src/Three20Core/Sources/NSMutableDictionaryAdditions.m
@@ -17,6 +17,7 @@
 #import "Three20Core/NSMutableDictionaryAdditions.h"
 
 // Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
 #import "Three20Core/TTGlobalCore.h"
 
 
@@ -26,6 +27,8 @@
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSMutableDictionaryAdditions)
+
 @implementation NSMutableDictionary (TTCategory)
 
 
@@ -38,6 +41,3 @@ - (void)setNonEmptyString:(NSString*)string forKey:(id)key {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSMutableDictionaryAdditions)
diff --git a/src/Three20Core/Sources/NSObjectAdditions.m b/src/Three20Core/Sources/NSObjectAdditions.m
@@ -16,13 +16,18 @@
 
 #import "Three20Core/NSObjectAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(NSObjectAdditions)
+
 @implementation NSObject (TTAdditions)
 
 
@@ -161,6 +166,3 @@ - (id)performSelector:(SEL)selector withObject:(id)p1 withObject:(id)p2 withObje
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSObjectAdditions)
diff --git a/src/Three20Core/Sources/NSStringAdditions.m b/src/Three20Core/Sources/NSStringAdditions.m
@@ -17,13 +17,19 @@
 #import "Three20Core/NSStringAdditions.h"
 
 // Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
 #import "Three20Core/TTMarkupStripper.h"
 #import "Three20Core/NSDataAdditions.h"
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+/**
+ * Additions.
+ */
+TT_FIX_CATEGORY_BUG(NSStringAdditions)
+
 @implementation NSString (TTAdditions)
 
 
@@ -174,6 +180,3 @@ - (NSString*)sha1Hash {
 }
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(NSStringAdditions)
diff --git a/src/Three20Style/Sources/TTStyleInternal.m b/src/Three20Style/Sources/TTStyleInternal.m
@@ -16,12 +16,18 @@
 
 #import "Three20Style/private/TTStyleInternal.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
+
 const NSInteger kDefaultLightSource = 125;
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+TT_FIX_CATEGORY_BUG(TTStyleInternal)
+
 @implementation TTStyle (TTInternal)
 
 
@@ -62,7 +68,3 @@ - (CGGradientRef)newGradientWithColors:(UIColor**)colors count:(int)count {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(TTStyleInternal)
-
diff --git a/src/Three20Style/Sources/TTStyledNodeInternal.m b/src/Three20Style/Sources/TTStyledNodeInternal.m
@@ -16,10 +16,15 @@
 
 #import "Three20Style/private/TTStyledNodeInternal.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
+TT_FIX_CATEGORY_BUG(TTStyledNodeInternal)
+
 @implementation TTStyledNode (TTInternal)
 
 
@@ -36,7 +41,3 @@ - (TTStyledNode*)findLastSibling:(TTStyledNode*)sibling {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(TTStyledNodeInternal)
-
diff --git a/src/Three20Style/Sources/UIColorAdditions.m b/src/Three20Style/Sources/UIColorAdditions.m
@@ -16,6 +16,10 @@
 
 #import "Three20Style/UIColorAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Color algorithms from http://www.cs.rit.edu/~ncs/color/t_convert.html
 
@@ -106,6 +110,8 @@ void HSVtoRGB( float *r, float *g, float *b, float h, float s, float v ) {
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UIColorAdditions)
+
 @implementation UIColor (TTCategory)
 
 
@@ -210,6 +216,3 @@ - (CGFloat)value {
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIColorAdditions)
diff --git a/src/Three20Style/Sources/UIFontAdditions.m b/src/Three20Style/Sources/UIFontAdditions.m
@@ -16,13 +16,18 @@
 
 #import "Three20Style/UIFontAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UIFontAdditions)
+
 @implementation UIFont (TTCategory)
 
 
@@ -32,6 +37,3 @@ - (CGFloat)ttLineHeight {
 }
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIFontAdditions)
diff --git a/src/Three20Style/Sources/UIImageAdditions.m b/src/Three20Style/Sources/UIImageAdditions.m
@@ -16,13 +16,18 @@
 
 #import "Three20Style/UIImageAdditions.h"
 
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 /**
  * Additions.
  */
+TT_FIX_CATEGORY_BUG(UIImageAdditions)
+
 @implementation UIImage (TTCategory)
 
 
@@ -229,6 +234,3 @@ - (void)drawInRect:(CGRect)rect radius:(CGFloat)radius contentMode:(UIViewConten
 
 
 @end
-
-#import "Three20Core/TTCorePreprocessorMacros.h"
-TT_FIX_CATEGORY_BUG(UIImageAdditions)