Permalink
Browse files

Merge branch 'refs/heads/Categories'

  • Loading branch information...
2 parents 6f44a56 + ba34a05 commit 2a287818a67f10c18a5e48c3a80368cc6a66fa78 Eric Chamberlain committed Feb 14, 2011
Showing with 103 additions and 0 deletions.
  1. +7 −0 src/Three20Core/Headers/TTCorePreprocessorMacros.h
  2. +3 −0 src/Three20Core/Sources/NSArrayAdditions.m
  3. +3 −0 src/Three20Core/Sources/NSDataAdditions.m
  4. +3 −0 src/Three20Core/Sources/NSDateAdditions.m
  5. +3 −0 src/Three20Core/Sources/NSMutableArrayAdditions.m
  6. +3 −0 src/Three20Core/Sources/NSMutableDictionaryAdditions.m
  7. +3 −0 src/Three20Core/Sources/NSObjectAdditions.m
  8. +2 −0 src/Three20Core/Sources/NSStringAdditions.m
  9. +3 −0 src/Three20Style/Sources/TTStyleInternal.m
  10. +3 −0 src/Three20Style/Sources/TTStyledNodeInternal.m
  11. +3 −0 src/Three20Style/Sources/UIColorAdditions.m
  12. +3 −0 src/Three20Style/Sources/UIFontAdditions.m
  13. +3 −0 src/Three20Style/Sources/UIImageAdditions.m
  14. +4 −0 src/Three20UI/Sources/TTImageViewInternal.m
  15. +3 −0 src/Three20UI/Sources/TTSearchTextFieldInternal.m
  16. +3 −0 src/Three20UI/Sources/TTTabBarInternal.m
  17. +3 −0 src/Three20UI/Sources/TTTextEditorInternal.m
  18. +4 −0 src/Three20UI/Sources/UINSObjectAdditions.m
  19. +3 −0 src/Three20UI/Sources/UINSStringAdditions.m
  20. +4 −0 src/Three20UI/Sources/UINavigationControllerAdditions.m
  21. +3 −0 src/Three20UI/Sources/UITabBarControllerAdditions.m
  22. +3 −0 src/Three20UI/Sources/UITableViewAdditions.m
  23. +3 −0 src/Three20UI/Sources/UIToolbarAdditions.m
  24. +3 −0 src/Three20UI/Sources/UIViewAdditions.m
  25. +3 −0 src/Three20UI/Sources/UIWebViewAdditions.m
  26. +3 −0 src/Three20UICommon/Sources/UIViewControllerAdditions.m
  27. +3 −0 src/Three20UICommon/Sources/UIWindowAdditions.m
  28. +3 −0 src/Three20UINavigator/Sources/TTURLPatternInternal.m
  29. +3 −0 src/Three20UINavigator/Sources/UIViewController+TTNavigator.m
  30. +3 −0 src/extThree20JSON/Vendors/JSON/NSObject+SBJSON.m
  31. +4 −0 src/extThree20JSON/Vendors/JSON/NSString+SBJSON.m
  32. +3 −0 src/extThree20JSON/Vendors/YAJL/NSObject+YAJL.m
@@ -25,6 +25,13 @@
*/
#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.
+ * 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
+
///////////////////////////////////////////////////////////////////////////////////////////////////
// Flags
@@ -134,3 +134,6 @@ - (BOOL)containsObject:(id)object withSelector:(SEL)selector {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(NSArrayAdditions)
@@ -53,3 +53,6 @@ - (NSString*)sha1Hash {
}
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(NSDataAdditions)
@@ -252,3 +252,6 @@ - (NSString*)formatYear {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(NSDateAdditions)
@@ -37,3 +37,6 @@ - (void) addNonEmptyString:(NSString*)string {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(NSMutableArrayAdditions)
@@ -38,3 +38,6 @@ - (void)setNonEmptyString:(NSString*)string forKey:(id)key {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(NSMutableDictionaryAdditions)
@@ -161,3 +161,6 @@ - (id)performSelector:(SEL)selector withObject:(id)p1 withObject:(id)p2 withObje
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(NSObjectAdditions)
@@ -174,3 +174,5 @@ - (NSString*)sha1Hash {
@end
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(NSStringAdditions)
@@ -63,3 +63,6 @@ - (CGGradientRef)newGradientWithColors:(UIColor**)colors count:(int)count {
@end
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(TTStyleInternal)
+
@@ -37,3 +37,6 @@ - (TTStyledNode*)findLastSibling:(TTStyledNode*)sibling {
@end
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(TTStyledNodeInternal)
+
@@ -210,3 +210,6 @@ - (CGFloat)value {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UIColorAdditions)
@@ -32,3 +32,6 @@ - (CGFloat)ttLineHeight {
}
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UIFontAdditions)
@@ -229,3 +229,6 @@ - (void)drawInRect:(CGRect)rect radius:(CGFloat)radius contentMode:(UIViewConten
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UIImageAdditions)
@@ -106,3 +106,7 @@ - (void)setStyle:(TTStyle*)style {
@end
+
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(TTImageViewInternal)
@@ -129,3 +129,6 @@ - (BOOL)textFieldShouldReturn:(UITextField*)textField {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(TTSearchTextFieldInternal)
@@ -88,3 +88,6 @@ - (CGSize)layoutTabs {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(TTTabBarInternal)
@@ -213,3 +213,6 @@ - (BOOL)textFieldShouldReturn:(UITextField *)textField {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(TTTextEditorInternal)
@@ -45,3 +45,7 @@ - (NSString*)URLValueWithName:(NSString*)name {
@end
+
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UINSObjectAdditions)
@@ -56,3 +56,6 @@ - (void)openURLFromButton:(UIView*)button {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UINSStringAdditions)
@@ -132,3 +132,7 @@ - (void)persistNavigationPath:(NSMutableArray*)path {
@end
+
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UINavigationControllerAdditions)
@@ -122,3 +122,6 @@ - (void)setTabURLs:(NSArray*)URLs {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UITabBarControllerAdditions)
@@ -134,3 +134,6 @@ - (void)touchRowAtIndexPath:(NSIndexPath*)indexPath animated:(BOOL)animated {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UITableViewAdditions)
@@ -53,3 +53,6 @@ - (void)replaceItemWithTag:(NSInteger)tag withItem:(UIBarButtonItem*)item {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UIToolbarAdditions)
@@ -525,3 +525,6 @@ - (void)dismissAsKeyboard:(BOOL)animated {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UIViewAdditions)
@@ -67,3 +67,6 @@ - (void)simulateTapElement:(NSString*)query {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UIWebViewAdditions)
@@ -378,3 +378,6 @@ - (void)unsetCommonProperties {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UIViewControllerAdditions)
@@ -53,3 +53,6 @@ - (UIView*)findFirstResponderInView:(UIView*)topView {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UIWindowAdditions)
@@ -33,3 +33,6 @@ - (void)setSelectorWithNames:(NSArray*)names {
@end
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(TTURLPatternInternal)
+
@@ -189,3 +189,6 @@ - (void)unsetNavigatorProperties {
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(UIViewController_TTNavigator)
@@ -42,3 +42,6 @@ - (NSString *)JSONRepresentation {
}
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(NSObject_SBJSON)
@@ -43,3 +43,7 @@ - (id)JSONValue
}
@end
+
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(NSString_SBJSON)
@@ -77,3 +77,6 @@ - (id)yajl_JSONWithOptions:(YAJLParserOptions)options error:(NSError **)error {
}
@end
+
+#import "Three20Core/TTCorePreprocessorMacros.h"
+TT_FIX_CATEGORY_BUG(NSObject_JAJL)

0 comments on commit 2a28781

Please sign in to comment.