Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

#100 resolving conflicted NSData+Base64

Simply rename to NSData+DTBase64
  • Loading branch information...
commit c6577aaae66c9f0a2280b0ac3d14ee04b60dd7fb 1 parent cec8d07
@krzyzanowskim krzyzanowskim authored
View
2  Core/Source/DTCoreText.h
@@ -20,7 +20,7 @@
#import "NSAttributedString+HTML.h"
#import "NSAttributedStringRunDelegates.h"
#import "NSCharacterSet+HTML.h"
-#import "NSData+Base64.h"
+#import "NSData+DTBase64.h"
#import "NSMutableAttributedString+HTML.h"
#import "NSScanner+HTML.h"
#import "NSString+HTML.h"
View
2  Core/Source/DTTextAttachment.m
@@ -10,7 +10,7 @@
#import "DTHTMLElement.h"
#import "CGUtils.h"
#import "NSAttributedString+HTML.h"
-#import "NSData+Base64.h"
+#import "NSData+DTBase64.h"
@implementation DTTextAttachment
{
View
7 Core/Source/NSData+Base64.h → Core/Source/NSData+DTBase64.h
@@ -22,19 +22,18 @@
//
-
-void *NewBase64Decode(
+void *NewDTBase64Decode(
const char *inputBuffer,
size_t length,
size_t *outputLength);
-char *NewBase64Encode(
+char *NewDTBase64Encode(
const void *inputBuffer,
size_t length,
bool separateLines,
size_t *outputLength);
-@interface NSData (Base64)
+@interface NSData (DTBase64)
+ (NSData *)dataFromBase64String:(NSString *)aString;
- (NSString *)base64EncodedString;
View
12 Core/Source/NSData+Base64.m → Core/Source/NSData+DTBase64.m
@@ -21,7 +21,7 @@
// distribution.
//
-#import "NSData+Base64.h"
+#import "NSData+DTBase64.h"
//
// Mapping from 6 bit pattern to ASCII character.
@@ -76,7 +76,7 @@
// returns the decoded buffer. Must be free'd by caller. Length is given by
// outputLength.
//
-void *NewBase64Decode(
+void *NewDTBase64Decode(
const char *inputBuffer,
size_t length,
size_t *outputLength)
@@ -151,7 +151,7 @@
// returns the encoded buffer. Must be free'd by caller. Length is given by
// outputLength.
//
-char *NewBase64Encode(
+char *NewDTBase64Encode(
const void *buffer,
size_t length,
bool separateLines,
@@ -262,7 +262,7 @@
return outputBuffer;
}
-@implementation NSData (Base64)
+@implementation NSData (DTBase64)
//
// dataFromBase64String:
@@ -279,7 +279,7 @@ + (NSData *)dataFromBase64String:(NSString *)aString
{
NSData *data = [aString dataUsingEncoding:NSASCIIStringEncoding];
size_t outputLength;
- void *outputBuffer = NewBase64Decode([data bytes], [data length], &outputLength);
+ void *outputBuffer = NewDTBase64Decode([data bytes], [data length], &outputLength);
NSData *result = [NSData dataWithBytes:outputBuffer length:outputLength];
free(outputBuffer);
return result;
@@ -298,7 +298,7 @@ - (NSString *)base64EncodedString
{
size_t outputLength;
char *outputBuffer =
- NewBase64Encode([self bytes], [self length], true, &outputLength);
+ NewDTBase64Encode([self bytes], [self length], true, &outputLength);
NSString *result =
[[NSString alloc]
View
28 DTCoreText.xcodeproj/project.pbxproj
@@ -101,10 +101,10 @@
A788C9D614863E8700E1AFD9 /* NSCharacterSet+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = A788C94014863E8700E1AFD9 /* NSCharacterSet+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; };
A788C9D814863E8700E1AFD9 /* NSCharacterSet+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94114863E8700E1AFD9 /* NSCharacterSet+HTML.m */; };
A788C9D914863E8700E1AFD9 /* NSCharacterSet+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94114863E8700E1AFD9 /* NSCharacterSet+HTML.m */; };
- A788C9DA14863E8700E1AFD9 /* NSData+Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = A788C94214863E8700E1AFD9 /* NSData+Base64.h */; settings = {ATTRIBUTES = (Public, ); }; };
- A788C9DB14863E8700E1AFD9 /* NSData+Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = A788C94214863E8700E1AFD9 /* NSData+Base64.h */; };
- A788C9DD14863E8700E1AFD9 /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94314863E8700E1AFD9 /* NSData+Base64.m */; };
- A788C9DE14863E8700E1AFD9 /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94314863E8700E1AFD9 /* NSData+Base64.m */; };
+ A788C9DA14863E8700E1AFD9 /* NSData+DTBase64.h in Headers */ = {isa = PBXBuildFile; fileRef = A788C94214863E8700E1AFD9 /* NSData+DTBase64.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ A788C9DB14863E8700E1AFD9 /* NSData+DTBase64.h in Headers */ = {isa = PBXBuildFile; fileRef = A788C94214863E8700E1AFD9 /* NSData+DTBase64.h */; };
+ A788C9DD14863E8700E1AFD9 /* NSData+DTBase64.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94314863E8700E1AFD9 /* NSData+DTBase64.m */; };
+ A788C9DE14863E8700E1AFD9 /* NSData+DTBase64.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94314863E8700E1AFD9 /* NSData+DTBase64.m */; };
A788C9DF14863E8700E1AFD9 /* NSMutableAttributedString+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = A788C94414863E8700E1AFD9 /* NSMutableAttributedString+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; };
A788C9E014863E8700E1AFD9 /* NSMutableAttributedString+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = A788C94414863E8700E1AFD9 /* NSMutableAttributedString+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; };
A788C9E214863E8700E1AFD9 /* NSMutableAttributedString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94514863E8700E1AFD9 /* NSMutableAttributedString+HTML.m */; };
@@ -196,7 +196,7 @@
A788CA99148648C700E1AFD9 /* DTLinkButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C92F14863E8700E1AFD9 /* DTLinkButton.m */; };
A788CA9C148648C700E1AFD9 /* DTWebVideoView.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C93714863E8700E1AFD9 /* DTWebVideoView.m */; };
A788CA9D148648C700E1AFD9 /* NSCharacterSet+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94114863E8700E1AFD9 /* NSCharacterSet+HTML.m */; };
- A788CA9E148648C700E1AFD9 /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94314863E8700E1AFD9 /* NSData+Base64.m */; };
+ A788CA9E148648C700E1AFD9 /* NSData+DTBase64.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94314863E8700E1AFD9 /* NSData+DTBase64.m */; };
A788CA9F148648C700E1AFD9 /* NSMutableAttributedString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94514863E8700E1AFD9 /* NSMutableAttributedString+HTML.m */; };
A788CAA0148648C700E1AFD9 /* NSScanner+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94714863E8700E1AFD9 /* NSScanner+HTML.m */; };
A788CAA1148648C700E1AFD9 /* NSString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = A788C94914863E8700E1AFD9 /* NSString+HTML.m */; };
@@ -275,8 +275,8 @@
A788C93F14863E8700E1AFD9 /* NSAttributedStringRunDelegates.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSAttributedStringRunDelegates.m; sourceTree = "<group>"; };
A788C94014863E8700E1AFD9 /* NSCharacterSet+HTML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSCharacterSet+HTML.h"; sourceTree = "<group>"; };
A788C94114863E8700E1AFD9 /* NSCharacterSet+HTML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSCharacterSet+HTML.m"; sourceTree = "<group>"; };
- A788C94214863E8700E1AFD9 /* NSData+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Base64.h"; sourceTree = "<group>"; };
- A788C94314863E8700E1AFD9 /* NSData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Base64.m"; sourceTree = "<group>"; };
+ A788C94214863E8700E1AFD9 /* NSData+DTBase64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+DTBase64.h"; sourceTree = "<group>"; };
+ A788C94314863E8700E1AFD9 /* NSData+DTBase64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+DTBase64.m"; sourceTree = "<group>"; };
A788C94414863E8700E1AFD9 /* NSMutableAttributedString+HTML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableAttributedString+HTML.h"; sourceTree = "<group>"; };
A788C94514863E8700E1AFD9 /* NSMutableAttributedString+HTML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableAttributedString+HTML.m"; sourceTree = "<group>"; };
A788C94614863E8700E1AFD9 /* NSScanner+HTML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSScanner+HTML.h"; sourceTree = "<group>"; };
@@ -602,8 +602,8 @@
children = (
A788C90E14863E8700E1AFD9 /* CGUtils.h */,
A788C90F14863E8700E1AFD9 /* CGUtils.m */,
- A788C94214863E8700E1AFD9 /* NSData+Base64.h */,
- A788C94314863E8700E1AFD9 /* NSData+Base64.m */,
+ A788C94214863E8700E1AFD9 /* NSData+DTBase64.h */,
+ A788C94314863E8700E1AFD9 /* NSData+DTBase64.m */,
A788C94A14863E8700E1AFD9 /* NSString+Paragraphs.h */,
A788C94B14863E8700E1AFD9 /* NSString+Paragraphs.m */,
A788C94C14863E8700E1AFD9 /* NSString+UTF8Cleaner.h */,
@@ -642,7 +642,7 @@
A788C9C614863E8700E1AFD9 /* NSAttributedString+HTML.h in Headers */,
A788C9D014863E8700E1AFD9 /* NSAttributedStringRunDelegates.h in Headers */,
A788C9D514863E8700E1AFD9 /* NSCharacterSet+HTML.h in Headers */,
- A788C9DA14863E8700E1AFD9 /* NSData+Base64.h in Headers */,
+ A788C9DA14863E8700E1AFD9 /* NSData+DTBase64.h in Headers */,
A788C9DF14863E8700E1AFD9 /* NSMutableAttributedString+HTML.h in Headers */,
A788C9E414863E8700E1AFD9 /* NSScanner+HTML.h in Headers */,
A788C9E914863E8700E1AFD9 /* NSString+HTML.h in Headers */,
@@ -680,7 +680,7 @@
A788C9C714863E8700E1AFD9 /* NSAttributedString+HTML.h in Headers */,
A788C9D114863E8700E1AFD9 /* NSAttributedStringRunDelegates.h in Headers */,
A788C9D614863E8700E1AFD9 /* NSCharacterSet+HTML.h in Headers */,
- A788C9DB14863E8700E1AFD9 /* NSData+Base64.h in Headers */,
+ A788C9DB14863E8700E1AFD9 /* NSData+DTBase64.h in Headers */,
A788C9E014863E8700E1AFD9 /* NSMutableAttributedString+HTML.h in Headers */,
A788C9E514863E8700E1AFD9 /* NSScanner+HTML.h in Headers */,
A788C9EA14863E8700E1AFD9 /* NSString+HTML.h in Headers */,
@@ -926,7 +926,7 @@
A788C9C914863E8700E1AFD9 /* NSAttributedString+HTML.m in Sources */,
A788C9D314863E8700E1AFD9 /* NSAttributedStringRunDelegates.m in Sources */,
A788C9D814863E8700E1AFD9 /* NSCharacterSet+HTML.m in Sources */,
- A788C9DD14863E8700E1AFD9 /* NSData+Base64.m in Sources */,
+ A788C9DD14863E8700E1AFD9 /* NSData+DTBase64.m in Sources */,
A788C9E214863E8700E1AFD9 /* NSMutableAttributedString+HTML.m in Sources */,
A788C9E714863E8700E1AFD9 /* NSScanner+HTML.m in Sources */,
A788C9EC14863E8700E1AFD9 /* NSString+HTML.m in Sources */,
@@ -963,7 +963,7 @@
A788C9CA14863E8700E1AFD9 /* NSAttributedString+HTML.m in Sources */,
A788C9D414863E8700E1AFD9 /* NSAttributedStringRunDelegates.m in Sources */,
A788C9D914863E8700E1AFD9 /* NSCharacterSet+HTML.m in Sources */,
- A788C9DE14863E8700E1AFD9 /* NSData+Base64.m in Sources */,
+ A788C9DE14863E8700E1AFD9 /* NSData+DTBase64.m in Sources */,
A788C9E314863E8700E1AFD9 /* NSMutableAttributedString+HTML.m in Sources */,
A788C9E814863E8700E1AFD9 /* NSScanner+HTML.m in Sources */,
A788C9ED14863E8700E1AFD9 /* NSString+HTML.m in Sources */,
@@ -1005,7 +1005,7 @@
A788CA99148648C700E1AFD9 /* DTLinkButton.m in Sources */,
A788CA9C148648C700E1AFD9 /* DTWebVideoView.m in Sources */,
A788CA9D148648C700E1AFD9 /* NSCharacterSet+HTML.m in Sources */,
- A788CA9E148648C700E1AFD9 /* NSData+Base64.m in Sources */,
+ A788CA9E148648C700E1AFD9 /* NSData+DTBase64.m in Sources */,
A788CA9F148648C700E1AFD9 /* NSMutableAttributedString+HTML.m in Sources */,
A788CAA0148648C700E1AFD9 /* NSScanner+HTML.m in Sources */,
A788CAA1148648C700E1AFD9 /* NSString+HTML.m in Sources */,
Please sign in to comment.
Something went wrong with that request. Please try again.