Permalink
Browse files

Merge branch 'development' into fix-32-64-bit-compiler-warnings

  • Loading branch information...
2 parents a9b99e7 + ef2bc87 commit df7b100117c3f27a20dd6eaedc6d137f54ef3096 @jverkoey jverkoey committed Feb 26, 2011
Showing with 176 additions and 672 deletions.
  1. +0 −2 samples/Core/TTCoreDemo/Configurations/App.xcconfig
  2. +0 −2 samples/Network/TTNetworkDemo/Configurations/App.xcconfig
  3. +0 −2 samples/Style/TTCSSStyleSheets/Configurations/App.xcconfig
  4. +0 −2 samples/Style/TTStyleCatalog/Configurations/App.xcconfig
  5. +0 −2 samples/TTCatalog/Configurations/App.xcconfig
  6. +0 −2 samples/TTFacebook/Configurations/App.xcconfig
  7. +0 −547 samples/TTFacebook/TTFacebook.xcodeproj/project.pbxproj
  8. +0 −2 samples/TTNavigatorDemo/Configurations/App.xcconfig
  9. +0 −2 samples/TTTwitter/Configurations/App.xcconfig
  10. +0 −2 samples/UI/TTNibDemo/Configurations/App.xcconfig
  11. +1 −1 samples/common/Configurations/App.xcconfig
  12. +2 −2 src/Three20Core/Headers/TTCorePreprocessorMacros.h
  13. +4 −3 src/Three20Core/Sources/NSArrayAdditions.m
  14. +5 −3 src/Three20Core/Sources/NSDataAdditions.m
  15. +2 −3 src/Three20Core/Sources/NSDateAdditions.m
  16. +4 −3 src/Three20Core/Sources/NSMutableArrayAdditions.m
  17. +3 −3 src/Three20Core/Sources/NSMutableDictionaryAdditions.m
  18. +5 −3 src/Three20Core/Sources/NSObjectAdditions.m
  19. +6 −3 src/Three20Core/Sources/NSStringAdditions.m
  20. +6 −4 src/Three20Style/Sources/TTStyleInternal.m
  21. +5 −4 src/Three20Style/Sources/TTStyledNodeInternal.m
  22. +6 −3 src/Three20Style/Sources/UIColorAdditions.m
  23. +5 −3 src/Three20Style/Sources/UIFontAdditions.m
  24. +5 −3 src/Three20Style/Sources/UIImageAdditions.m
  25. +5 −4 src/Three20UI/Sources/TTImageViewInternal.m
  26. +5 −3 src/Three20UI/Sources/TTSearchTextFieldInternal.m
  27. +5 −3 src/Three20UI/Sources/TTTabBarInternal.m
  28. +3 −3 src/Three20UI/Sources/TTTableTextItemCell.m
  29. +5 −3 src/Three20UI/Sources/TTTextEditorInternal.m
  30. +5 −4 src/Three20UI/Sources/UINSObjectAdditions.m
  31. +5 −3 src/Three20UI/Sources/UINSStringAdditions.m
  32. +5 −4 src/Three20UI/Sources/UINavigationControllerAdditions.m
  33. +5 −3 src/Three20UI/Sources/UITabBarControllerAdditions.m
  34. +5 −3 src/Three20UI/Sources/UITableViewAdditions.m
  35. +5 −3 src/Three20UI/Sources/UIToolbarAdditions.m
  36. +8 −3 src/Three20UI/Sources/UIViewAdditions.m
  37. +5 −3 src/Three20UI/Sources/UIWebViewAdditions.m
  38. +5 −1 src/Three20UICommon/Sources/UISplitViewController+TTNavigator.m
  39. +8 −0 src/Three20UICommon/Sources/UIView+TTUICommon.m
  40. +5 −3 src/Three20UICommon/Sources/UIViewControllerAdditions.m
  41. +5 −3 src/Three20UICommon/Sources/UIWindowAdditions.m
  42. +5 −4 src/Three20UINavigator/Sources/TTURLPatternInternal.m
  43. +5 −3 src/Three20UINavigator/Sources/UIViewController+TTNavigator.m
  44. +6 −3 src/extThree20JSON/Vendors/JSON/NSObject+SBJSON.m
  45. +6 −4 src/extThree20JSON/Vendors/JSON/NSString+SBJSON.m
  46. +6 −3 src/extThree20JSON/Vendors/YAJL/NSObject+YAJL.m
@@ -21,5 +21,3 @@
BASE_PRODUCT_NAME = TTCoreDemo
PRODUCT_NAME = $(BASE_PRODUCT_NAME)
BUILD_LIBRARY_VERSION = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB)
@@ -21,5 +21,3 @@
BASE_PRODUCT_NAME = TTNetworkDemo
PRODUCT_NAME = $(BASE_PRODUCT_NAME)
BUILD_LIBRARY_VERSION = 1.0
-
-OTHER_LDFLAGS = $(THREE20CORE_LIB) $(THREE20NETWORK_LIB)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
Oops, something went wrong.
@@ -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)
@@ -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)
@@ -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)
@@ -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
@@ -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
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
-
@@ -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)
-
@@ -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)
@@ -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)
@@ -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)
Oops, something went wrong.

0 comments on commit df7b100

Please sign in to comment.