From aff6ed5ed71037ebfe91ebcef8b97ddc397f78a7 Mon Sep 17 00:00:00 2001
From: Joakim Bodin <joakim.bodin@gmail.com>
Date: Mon, 18 May 2009 22:21:32 +0200
Subject: [PATCH] Fix botched merge

---
 src/NSDateAdditions.m           | 13 +++++++++++++
 src/NSStringAdditions.m         | 23 -----------------------
 src/Three20/NSDateAdditions.h   |  8 ++++++++
 src/Three20/NSStringAdditions.h | 10 ++++++++++
 4 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 src/NSDateAdditions.m
 create mode 100644 src/Three20/NSDateAdditions.h
 create mode 100644 src/Three20/NSStringAdditions.h

diff --git a/src/NSDateAdditions.m b/src/NSDateAdditions.m
new file mode 100644
index 0000000000..a5fb97c8e7
--- /dev/null
+++ b/src/NSDateAdditions.m
@@ -0,0 +1,13 @@
+#import "Three20/TTGlobal.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+@implementation NSDate (TTCategory)
+
++ (id)dateWithToday {
+  NSString* format = @"%Y-%m-%d 00:00:00 +0700";
+  NSString* time = [[NSDate date] descriptionWithCalendarFormat:format timeZone:nil locale:nil];
+  return [self dateWithString:time];
+}
+
+@end
diff --git a/src/NSStringAdditions.m b/src/NSStringAdditions.m
index edd51d3133..dcc8a4a36f 100644
--- a/src/NSStringAdditions.m
+++ b/src/NSStringAdditions.m
@@ -15,29 +15,6 @@ - (BOOL)isWhitespace {
   return YES;
 }
 
-- (BOOL)beginsWithString:(NSString*)substring {
-  if (self.length < substring.length) {
-    return NO;
-  } else {
-    NSRange searchRange = NSMakeRange(0, substring.length);
-    NSRange range = [self rangeOfString:substring options:0 range:searchRange];
-    return range.location == searchRange.location;
-  }
-}
-
-- (BOOL)endsWithString:(NSString*)substring {
-  if (self.length < substring.length) {
-    return NO;
-  } else {
-    NSRange searchRange = NSMakeRange(self.length - substring.length, substring.length);
-    NSRange range = [self rangeOfString:substring options:0 range:searchRange];
-    return range.location == searchRange.location;
-  }
-
-  NSRange range = [self rangeOfString:substring];
-  return range.location == self.length - substring.length;
-}
-
 // Copied and pasted from http://www.mail-archive.com/cocoa-dev@lists.apple.com/msg28175.html
 - (NSDictionary*)queryDictionaryUsingEncoding: (NSStringEncoding)encoding {
   NSCharacterSet* delimiterSet = [NSCharacterSet characterSetWithCharactersInString:@"&;"];
diff --git a/src/Three20/NSDateAdditions.h b/src/Three20/NSDateAdditions.h
new file mode 100644
index 0000000000..4c3c751562
--- /dev/null
+++ b/src/Three20/NSDateAdditions.h
@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface NSDate (TTCategory)
+
++ (id)dateWithToday;
+
+@end
diff --git a/src/Three20/NSStringAdditions.h b/src/Three20/NSStringAdditions.h
new file mode 100644
index 0000000000..ffaddc9f61
--- /dev/null
+++ b/src/Three20/NSStringAdditions.h
@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface NSString (TTCategory)
+
+- (BOOL)isWhitespace;
+
+- (NSDictionary*)queryDictionaryUsingEncoding: (NSStringEncoding)encoding;
+
+@end