merge with joe master

samples/TTCatalog/Classes/ImageTest1Controller.m

@@ -10,7 +10,7 @@ - (void)loadView {
   TTImageView* imageView = [[[TTImageView alloc] initWithFrame:CGRectMake(30, 30, 0, 0)]
     autorelease];
   imageView.autoresizesToImage = YES;
-  imageView.url = @"http://farm4.static.flickr.com/3163/3110335722_7a906f9d8b_m.jpg";
+  imageView.URL = @"http://farm4.static.flickr.com/3163/3110335722_7a906f9d8b_m.jpg";
   [self.view addSubview:imageView];
 }
 

samples/TTCatalog/Classes/MessageTestController.m

@@ -22,7 +22,7 @@ - (void)dealloc {
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 - (void)compose {
-  id recipient = [[[TTTableField alloc] initWithText:@"Alan Jones" url:TT_NULL_URL] autorelease];
+  id recipient = [TTTableTextItem itemWithText:@"Alan Jones" URL:TT_NULL_URL];
   TTMessageController* controller = [[[TTMessageController alloc] 
     initWithRecipients:[NSArray arrayWithObject:recipient]] autorelease];
   controller.dataSource = _dataSource;

samples/TTCatalog/Classes/MockDataSource.m

@@ -340,8 +340,8 @@ - (NSArray*)sectionIndexTitlesForTableView:(UITableView*)tableView {
 // TTTableViewDataSource
 
 - (NSString*)tableView:(UITableView*)tableView labelForObject:(id)object {
-  TTTableField* field = object;
-  return field.text;
+  TTTableTextItem* item = object;
+  return item.text;
 }
 
 - (void)tableView:(UITableView*)tableView prepareCell:(UITableViewCell*)cell
@@ -355,7 +355,7 @@ - (void)tableView:(UITableView*)tableView search:(NSString*)text {
   [_items release];
 
 //  _items = [[NSMutableArray alloc] initWithObjects:
-//    [[[TTActivityTableField alloc] initWithText:@"Searching..."] autorelease],
+//    [[[TTActivityTableItem alloc] initWithText:@"Searching..."] autorelease],
 //    nil];
 
   if (text.length) {
@@ -364,8 +364,8 @@ - (void)tableView:(UITableView*)tableView search:(NSString*)text {
     text = [text lowercaseString];
     for (NSString* name in _names) {
       if ([[name lowercaseString] rangeOfString:text].location == 0) {
-        TTTableField* field = [[[TTTableField alloc] initWithText:name url:TT_NULL_URL] autorelease];
-        [_items addObject:field];
+        TTTableItem* item = [TTTableTextItem itemWithText:name URL:TT_NULL_URL];
+        [_items addObject:item];
       }
     }    
   } else {
@@ -387,8 +387,8 @@ - (void)rebuildItems {
       [map setObject:section forKey:letter];
     }
 
-    TTTableField* field = [[[TTTableField alloc] initWithText:name url:TT_NULL_URL] autorelease];
-    [section addObject:field];
+    TTTableItem* item = [TTTableTextItem itemWithText:name URL:TT_NULL_URL];
+    [section addObject:item];
   }
 
   [_items release];

samples/TTCatalog/Classes/MockPhotoSource.h

@@ -32,15 +32,15 @@ typedef enum {
   id<TTPhotoSource> _photoSource;
   NSString* _thumbURL;
   NSString* _smallURL;
-  NSString* _url;
+  NSString* _URL;
   CGSize _size;
   NSInteger _index;
   NSString* _caption;
 }
 
-- (id)initWithURL:(NSString*)url smallURL:(NSString*)smallURL size:(CGSize)size;
+- (id)initWithURL:(NSString*)URL smallURL:(NSString*)smallURL size:(CGSize)size;
 
-- (id)initWithURL:(NSString*)url smallURL:(NSString*)smallURL size:(CGSize)size
+- (id)initWithURL:(NSString*)URL smallURL:(NSString*)smallURL size:(CGSize)size
   caption:(NSString*)caption;
 
 @end

samples/TTCatalog/Classes/MockPhotoSource.m

@@ -92,7 +92,7 @@ - (NSString*)viewURL {
   return nil;
 }
 
-+ (id<TTPersistable>)fromURL:(NSURL*)url {
++ (id<TTPersistable>)fromURL:(NSURL*)URL {
   return nil;
 }
 
@@ -189,15 +189,15 @@ @implementation MockPhoto
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // NSObject
 
-- (id)initWithURL:(NSString*)url smallURL:(NSString*)smallURL size:(CGSize)size {
-  return [self initWithURL:url smallURL:smallURL size:size caption:nil];
+- (id)initWithURL:(NSString*)URL smallURL:(NSString*)smallURL size:(CGSize)size {
+  return [self initWithURL:URL smallURL:smallURL size:size caption:nil];
 }
 
-- (id)initWithURL:(NSString*)url smallURL:(NSString*)smallURL size:(CGSize)size
+- (id)initWithURL:(NSString*)URL smallURL:(NSString*)smallURL size:(CGSize)size
     caption:(NSString*)caption {
   if (self = [super init]) {
     _photoSource = nil;
-    _url = [url copy];
+    _URL = [URL copy];
     _smallURL = [smallURL copy];
     _thumbURL = [smallURL copy];
     _size = size;
@@ -208,7 +208,7 @@ - (id)initWithURL:(NSString*)url smallURL:(NSString*)smallURL size:(CGSize)size
 }
 
 - (void)dealloc {
-  [_url release];
+  [_URL release];
   [_smallURL release];
   [_thumbURL release];
   [_caption release];
@@ -222,18 +222,18 @@ - (NSString*)viewURL {
   return nil;
 }
 
-+ (id<TTPersistable>)fromURL:(NSURL*)url {
++ (id<TTPersistable>)fromURL:(NSURL*)URL {
   return nil;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // TTPhoto
 
-- (NSString*)urlForVersion:(TTPhotoVersion)version {
+- (NSString*)URLForVersion:(TTPhotoVersion)version {
   if (version == TTPhotoVersionLarge) {
-    return _url;
+    return _URL;
   } else if (version == TTPhotoVersionMedium) {
-    return _url;
+    return _URL;
   } else if (version == TTPhotoVersionSmall) {
     return _smallURL;
   } else if (version == TTPhotoVersionThumbnail) {