Merge branch 'develop'

Core/DTFoundation.h

@@ -58,4 +58,5 @@
 #endif
 
 // Utility Functions
-#import "DTUtils.h"
+#import "DTUtils.h"
+#import "DTLog.h"

Core/Source/DTASN1/DTASN1Parser.m

@@ -134,7 +134,7 @@ - (BOOL)_parseValueWithTag:(NSUInteger)tag dataRange:(NSRange)dataRange
 {
 	if (!dataRange.length && tag != DTASN1TypeNull)
 	{
-		NSLog(@"Encountered zero length data for tag %ld", (unsigned long)tag);
+		DTLogError(@"Encountered zero length data for tag %ld", (unsigned long)tag);
 
 		// only NULL can have zero length
 		return NO;

Core/Source/DTASN1/DTASN1Serialization.m

@@ -38,9 +38,6 @@ - (id)initWithData:(NSData *)data
 {
 	self = [super init];
 
-	NSString *bas = [DTBase64Coding stringByEncodingData:data];
-	NSLog(@"%@", bas);
-
 	if (self)
 	{
 		DTASN1Parser *parser = [[DTASN1Parser alloc] initWithData:data];

Core/Source/DTReachability/DTReachability.m

@@ -46,7 +46,7 @@ + (id)addReachabilityObserverWithBlock:(void(^)(SCNetworkConnectionFlags connect
 		{
 			if(!SCNetworkReachabilityScheduleWithRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes))
 			{
-				NSLog(@"Error: Could not schedule reachability");
+				DTLogError(@"Error: Could not schedule reachability");
 				SCNetworkReachabilitySetCallback(_reachability, NULL, NULL);
 				return nil;
 			}
@@ -76,11 +76,11 @@ + (void)removeReachabilityObserver:(id)observer
 
 			if (SCNetworkReachabilityUnscheduleFromRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes))
 			{
-				NSLog(@"Unscheduled reachability");
+				DTLogInfo(@"Unscheduled reachability");
 			}
 			else
 			{
-				NSLog(@"Error: Could not unschedule reachability");
+				DTLogError(@"Error: Could not unschedule reachability");
 			}
 
 			_reachability = nil;

Core/Source/DTSQLite/DTSQLiteDatabase.m

@@ -112,7 +112,7 @@ - (NSArray *)fetchRowsForQuery:(NSString *)query error:(NSError **)error
 		return [tmpArray copy];
 	}
 
-	NSLog(@"ignored result");
+	DTLogError(@"ignored result");
 
 	return nil;
 }

Core/Source/DTSQLite/DTSQLiteFunctions.m

@@ -51,7 +51,7 @@ void DTSQLiteEnumerateSQLStatementColumns(sqlite3_stmt *statement, DTSQLiteEnume
 
 			default:
 			{
-				NSLog(@"Type %d not implemented", columnType);
+				DTLogError(@"Type %d not implemented", columnType);
 				break;
 			}
 		}

Core/Source/DTScripting/DTScriptExpression.m

@@ -9,6 +9,7 @@
 #import "DTScriptExpression.h"
 #import "DTScriptVariable.h"
 #import "NSScanner+DTScripting.h"
+#import "DTLog.h"
 
 
 @implementation DTScriptExpression
@@ -110,15 +111,15 @@ - (BOOL)_parseString:(NSString *)string
 
 	if (![scanner scanString:@"[" intoString:nil])
 	{
-		NSLog(@"No [ at position %d in string '%@'", (int)[scanner scanLocation], string);
+		DTLogError(@"No [ at position %d in string '%@'", (int)[scanner scanLocation], string);
 		return NO;
 	}
 
 	DTScriptVariable *receiver = nil;
 
 	if (![scanner scanScriptVariable:&receiver])
 	{
-		NSLog(@"No receiver at position %d in string '%@'", (int)[scanner scanLocation], string);
+		DTLogError(@"No receiver at position %d in string '%@'", (int)[scanner scanLocation], string);
 		return NO;
 	}
 
@@ -128,7 +129,7 @@ - (BOOL)_parseString:(NSString *)string
 	NSString *method = nil;
 	if (![scanner scanCharactersFromSet:[NSCharacterSet alphanumericCharacterSet] intoString:&method])
 	{
-		NSLog(@"No method name at position %d in string '%@'", (int)[scanner scanLocation], string);
+		DTLogError(@"No method name at position %d in string '%@'", (int)[scanner scanLocation], string);
 		return NO;
 	}
 
@@ -141,7 +142,7 @@ - (BOOL)_parseString:(NSString *)string
 	NSString *decider = nil;
 	if (![scanner scanCharactersFromSet:[NSCharacterSet characterSetWithCharactersInString:@":]"] intoString:&decider])
 	{
-		NSLog(@"No ] or : at position %d in string '%@'", (int)[scanner scanLocation], string);
+		DTLogError(@"No ] or : at position %d in string '%@'", (int)[scanner scanLocation], string);
 		return NO;
 	}
 
@@ -178,7 +179,7 @@ - (BOOL)_parseString:(NSString *)string
 
 					if (![scanner scanString:@":" intoString:nil])
 					{
-						NSLog(@"No : at position %d in string '%@'", (int)[scanner scanLocation], self);
+						DTLogError(@"No : at position %d in string '%@'", (int)[scanner scanLocation], self);
 						return NO;
 					}
 
@@ -192,13 +193,13 @@ - (BOOL)_parseString:(NSString *)string
 					}
 					else
 					{
-						NSLog(@"Illegal character in parameter at position %d in string '%@'", (int)[scanner scanLocation], string);
+						DTLogError(@"Illegal character in parameter at position %d in string '%@'", (int)[scanner scanLocation], string);
 						return NO;
 					}
 				}
 				else
 				{
-					NSLog(@"Illegal character in parameter at position %d in string '%@'", (int)[scanner scanLocation], string);
+					DTLogError(@"Illegal character in parameter at position %d in string '%@'", (int)[scanner scanLocation], string);
 					return NO;
 				}
 			}

Core/Source/DTScripting/NSScanner+DTScripting.m

@@ -8,6 +8,7 @@
 
 #import "NSScanner+DTScripting.h"
 #import "DTScriptVariable.h"
+#import "DTLog.h"
 
 @implementation NSScanner (DTScripting)
 
@@ -45,7 +46,7 @@ - (BOOL)scanScriptVariable:(DTScriptVariable **)variable
 			if (!part && !stringIsTerminated)
 			{
 				self.scanLocation = previousScanLocation;
-				NSLog(@"Unterminated string at position %d in string '%@'", (int)[self scanLocation], self.string);
+				DTLogError(@"Unterminated string at position %d in string '%@'", (int)[self scanLocation], self.string);
 				return NO;
 			}
 		}
@@ -82,7 +83,7 @@ - (BOOL)scanScriptVariable:(DTScriptVariable **)variable
 		else
 		{
 			self.scanLocation = previousScanLocation;
-			NSLog(@"Illegal character in parameter at position %d in string '%@'", (int)[self scanLocation], self.string);
+			DTLogError(@"Illegal character in parameter at position %d in string '%@'", (int)[self scanLocation], self.string);
 			return NO;
 		}
 	}

Core/Source/DTVersion.m

@@ -86,7 +86,6 @@ + (DTVersion *)versionWithString:(NSString*)versionString
 			default:
 				break;
 		}
-		//NSLog(@"value for %d: %d", i, value);
 	}
 
 	if (major >= 0 &&

Core/Source/OSX/NSWindowController+DTPanelControllerPresenting.m

@@ -33,7 +33,7 @@ - (void)presentModalPanelController:(NSWindowController *)panelController
 
 	if (windowController)
 	{
-		NSLog(@"Already presenting %@, cannot modally present another panel", NSStringFromClass([windowController class]));
+		DTLogError(@"Already presenting %@, cannot modally present another panel", NSStringFromClass([windowController class]));
 		return;
 	}
 
@@ -50,7 +50,7 @@ - (void)dismissModalPanelController
 
 	if (!windowController)
 	{
-		NSLog(@"%s called, but nothing to dismiss", (const char *)__PRETTY_FUNCTION__);
+		DTLogError(@"%s called, but nothing to dismiss", (const char *)__PRETTY_FUNCTION__);
 		return;
 	}
 

Core/Source/iOS/DTSidePanel/DTSidePanelController.m

@@ -11,6 +11,7 @@
 #import "DTSidePanelController.h"
 #import "UIView+DTFoundation.h"
 #import "UIViewController+DTSidePanelController.h"
+#import "DTLog.h"
 
 @interface UIViewController () // private setter
 - (void)setSidePanelController:(DTSidePanelController *)sidePanelController;
@@ -967,7 +968,7 @@ - (void)setWidth:(CGFloat)width forPanel:(DTSidePanelControllerPanel)panel anima
 
 		case DTSidePanelControllerPanelCenter:
 		{
-			NSLog(@"Setting width for center panel not supported");
+			DTLogError(@"Setting width for center panel not supported");
 			break;
 		}
 	}

Core/Source/iOS/Debug/UIView+DTDebug.m

@@ -8,12 +8,13 @@
 
 #import "UIView+DTDebug.h"
 #import "NSObject+DTRuntime.h"
+#import "DTLog.h"
 
 @implementation UIView (DTDebug)
 
 - (void)methodCalledNotFromMainThread:(NSString *)methodName
 {
-	NSLog(@"-[%@ %@] being called on background queue. Break on -[UIView methodCalledNotFromMainThread:] to find out where", NSStringFromClass([self class]), methodName);
+	DTLogError(@"-[%@ %@] being called on background queue. Break on -[UIView methodCalledNotFromMainThread:] to find out where", NSStringFromClass([self class]), methodName);
 }
 
 - (void)_setNeedsLayout_MainThreadCheck

Core/Source/iOS/Experimental/DTStripedLayer.m

@@ -58,7 +58,7 @@ - (void)setBounds:(CGRect)bounds
 
         [super setBounds:bounds];
 
-        NSLog(@"setbounds: %@ %@", NSStringFromCGRect(bounds), _tileDelegate);
+        DTLogDebug(@"setbounds: %@ %@", NSStringFromCGRect(bounds), _tileDelegate);
 
         // store for frequent use
         _contentSize = bounds.size;
@@ -77,7 +77,7 @@ - (void)setFrame:(CGRect)frame
 
         [super setFrame:frame];
 
-        NSLog(@"setFrame: %@ %@", NSStringFromCGRect(frame), _tileDelegate);
+        DTLogDebug(@"setFrame: %@ %@", NSStringFromCGRect(frame), _tileDelegate);
 
         // store for frequent use
         _contentSize = frame.size;
@@ -197,7 +197,7 @@ - (void)layoutSublayers
             }
             else
             {
-                NSLog(@"layer frame differs! %@ <-> %@", NSStringFromCGRect(oneSubLayer.frame), NSStringFromCGRect(tileFrame));
+                DTLogError(@"layer frame differs! %@ <-> %@", NSStringFromCGRect(oneSubLayer.frame), NSStringFromCGRect(tileFrame));
 
                 oneSubLayer.anchorPoint = CGPointZero;
                 oneSubLayer.bounds = tileFrame;
@@ -241,7 +241,7 @@ - (void)layoutSublayers
                 [self _enqueueDrawingForTile:cachedTile];
             }
 
-            NSLog(@"cached %@", cachedTile);
+            DTLogDebug(@"cached %@", cachedTile);
         }
         else
         {
@@ -266,7 +266,7 @@ - (void)layoutSublayers
             newTile.borderColor = [UIColor redColor].CGColor;
             newTile.borderWidth = 3;
 
-            NSLog(@"new %@", newTile);
+            DTLogDebug(@"new %@", newTile);
 
             // cost in cache is number of pixels
             [self.tileCache setObject:newTile forKey:tileKey cost:tileFrame.size.width * tileFrame.size.height];
@@ -367,8 +367,6 @@ - (void)setNeedsDisplayInRect:(CGRect)rect
 
 - (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx
 {
-    //  NSLog(@"draw %@", layer);
-
     [_tileDelegate drawLayer:layer inContext:ctx];
 
     CGRect clipRect = CGContextGetClipBoundingBox(ctx);

Core/Source/iOS/UIImage+DTFoundation.m

@@ -7,6 +7,7 @@
 //
 
 #import "UIImage+DTFoundation.h"
+#import "DTLog.h"
 
 @implementation UIImage (DTFoundation)
 
@@ -43,12 +44,12 @@ + (UIImage *)imageWithContentsOfURL:(NSURL *)URL cachePolicy:(NSURLRequestCacheP
 	if (cacheResponse)
 	{
 		data = [cacheResponse data];
-		NSLog(@"cache hit");
+		DTLogDebug(@"cache hit for %@", [URL absoluteString]);
 	}
-	else {
-		NSLog(@"cache fail");
+	else
+	{
+		DTLogDebug(@"cache fail for %@", [URL absoluteString]);
 	}
-
 
 	NSURLResponse *response;
 	data = [NSURLConnection sendSynchronousRequest:request
@@ -57,7 +58,7 @@ + (UIImage *)imageWithContentsOfURL:(NSURL *)URL cachePolicy:(NSURLRequestCacheP
 
 	if (!data)
 	{
-		NSLog(@"Error loading image at %@", URL);
+		DTLogError(@"Error loading image at %@", URL);
 		return nil;
 	}
 

Demo/DTReachability/DTReachability-Prefix.pch

@@ -11,4 +11,5 @@
 #ifdef __OBJC__
 	#import <UIKit/UIKit.h>
 	#import <Foundation/Foundation.h>
+	#import "DTLog.h"
 #endif

Demo/DTSidePanels/DTSidePanels-Prefix.pch

@@ -11,4 +11,5 @@
 #ifdef __OBJC__
 	#import <UIKit/UIKit.h>
 	#import <Foundation/Foundation.h>
+	#import "DTLog.h"
 #endif

Demo/DTSidePanels/Source/DemoViewController.m

@@ -16,38 +16,38 @@ - (void)viewWillAppear:(BOOL)animated
 {
 	[super viewWillAppear:animated];
 
-	NSLog(@"%@ %s animated:%d", self, __PRETTY_FUNCTION__, animated);
+	DTLogInfo(@"%@ %s animated:%d", self, __PRETTY_FUNCTION__, animated);
 }
 
 - (void)viewDidAppear:(BOOL)animated
 {
 	[super viewDidAppear:animated];
-	NSLog(@"%@ %s animated:%d", self, __PRETTY_FUNCTION__, animated);
+	DTLogInfo(@"%@ %s animated:%d", self, __PRETTY_FUNCTION__, animated);
 }
 
 - (void)viewWillDisappear:(BOOL)animated
 {
 	[super viewWillDisappear:animated];
 
-	NSLog(@"%@ %s animated:%d", self, __PRETTY_FUNCTION__, animated);
+	DTLogInfo(@"%@ %s animated:%d", self, __PRETTY_FUNCTION__, animated);
 }
 
 - (void)viewDidDisappear:(BOOL)animated
 {
 	[super viewDidDisappear:animated];
-	NSLog(@"%@ %s animated:%d", self, __PRETTY_FUNCTION__, animated);
+	DTLogInfo(@"%@ %s animated:%d", self, __PRETTY_FUNCTION__, animated);
 }
 
 - (void)willMoveToParentViewController:(UIViewController *)parent
 {
 	[super willMoveToParentViewController:parent];
-	NSLog(@"%@ %s", self, __PRETTY_FUNCTION__);
+	DTLogInfo(@"%@ %s", self, __PRETTY_FUNCTION__);
 }
 
 - (void)didMoveToParentViewController:(UIViewController *)parent
 {
 	[super didMoveToParentViewController:parent];
-	NSLog(@"%@ %s", self, __PRETTY_FUNCTION__);
+	DTLogInfo(@"%@ %s", self, __PRETTY_FUNCTION__);
 }
 
 @end