removed ErrorLog function

removed ";" from localization macro
diehardest · Sep 23, 2013 · 0f60056 · 0f60056
1 parent 92779b2
commit 0f60056
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 63 deletions.
diff --git a/CJAMacros.xcodeproj/project.pbxproj b/CJAMacros.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 		FADBC04017C394F4000EBDB9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FADBC03F17C394F4000EBDB9 /* Foundation.framework */; };
 		FADBC04217C394F4000EBDB9 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FADBC04117C394F4000EBDB9 /* CoreGraphics.framework */; };
 		FADBC04417C394F4000EBDB9 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FADBC04317C394F4000EBDB9 /* UIKit.framework */; };
-		FADBC07E17C39611000EBDB9 /* CJAMacros.m in Sources */ = {isa = PBXBuildFile; fileRef = FADBC07D17C39611000EBDB9 /* CJAMacros.m */; };
 		FADBC07F17C396BD000EBDB9 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FADBC07517C39563000EBDB9 /* main.m */; };
 		FADBC08017C396CC000EBDB9 /* CJAAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FADBC07117C39563000EBDB9 /* CJAAppDelegate.m */; };
 		FADBC08317C39B51000EBDB9 /* DemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FADBC08217C39B51000EBDB9 /* DemoViewController.m */; };
@@ -30,7 +29,6 @@
 		FADBC07417C39563000EBDB9 /* CJAMacros-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CJAMacros-Prefix.pch"; sourceTree = "<group>"; };
 		FADBC07517C39563000EBDB9 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		FADBC07C17C39611000EBDB9 /* CJAMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CJAMacros.h; path = CJAMacros/CJAMacros.h; sourceTree = "<group>"; };
-		FADBC07D17C39611000EBDB9 /* CJAMacros.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CJAMacros.m; path = CJAMacros/CJAMacros.m; sourceTree = "<group>"; };
 		FADBC08117C39B51000EBDB9 /* DemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoViewController.h; sourceTree = "<group>"; };
 		FADBC08217C39B51000EBDB9 /* DemoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DemoViewController.m; sourceTree = "<group>"; };
 		FADBC0C617C39F46000EBDB9 /* Localizable.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
@@ -122,7 +120,6 @@
 			isa = PBXGroup;
 			children = (
 				FADBC07C17C39611000EBDB9 /* CJAMacros.h */,
-				FADBC07D17C39611000EBDB9 /* CJAMacros.m */,
 			);
 			name = CJAMacros;
 			sourceTree = "<group>";
@@ -156,11 +153,6 @@
 				CLASSPREFIX = CJA;
 				LastUpgradeCheck = 0500;
 				ORGANIZATIONNAME = "Carl Jahn";
-				TargetAttributes = {
-					FADBC05617C394F4000EBDB9 = {
-						TestTargetID = FADBC03B17C394F4000EBDB9;
-					};
-				};
 			};
 			buildConfigurationList = FADBC03717C394F4000EBDB9 /* Build configuration list for PBXProject "CJAMacros" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -198,7 +190,6 @@
 			files = (
 				FADBC08017C396CC000EBDB9 /* CJAAppDelegate.m in Sources */,
 				FADBC07F17C396BD000EBDB9 /* main.m in Sources */,
-				FADBC07E17C39611000EBDB9 /* CJAMacros.m in Sources */,
 				FADBC08317C39B51000EBDB9 /* DemoViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/CJAMacros.xcodeproj/project.xcworkspace/xcshareddata/CJAMacros.xccheckout b/CJAMacros.xcodeproj/project.xcworkspace/xcshareddata/CJAMacros.xccheckout
@@ -5,36 +5,36 @@
 	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
 	<false/>
 	<key>IDESourceControlProjectIdentifier</key>
-	<string>D3513492-1D3F-4491-833F-6F6F4E4A3A71</string>
+	<string>BDB1CB72-8E5B-4C12-87A1-2CF3B291C1A6</string>
 	<key>IDESourceControlProjectName</key>
 	<string>CJAMacros</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>448643EC-D1E3-47F5-B5AE-291AAB962BF7</key>
-		<string>https://github.com/carlj/CJAMarcos.git</string>
+		<key>B983A343-8739-4FA2-919F-9A3516F625C2</key>
+		<string>https://github.com/carlj/CJAMacros.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>CJAMacros.xcodeproj/project.xcworkspace</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>448643EC-D1E3-47F5-B5AE-291AAB962BF7</key>
+		<key>B983A343-8739-4FA2-919F-9A3516F625C2</key>
 		<string>../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>https://github.com/carlj/CJAMarcos.git</string>
+	<string>https://github.com/carlj/CJAMacros.git</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>110</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>448643EC-D1E3-47F5-B5AE-291AAB962BF7</string>
+	<string>B983A343-8739-4FA2-919F-9A3516F625C2</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>448643EC-D1E3-47F5-B5AE-291AAB962BF7</string>
+			<string>B983A343-8739-4FA2-919F-9A3516F625C2</string>
 			<key>IDESourceControlWCCName</key>
-			<string>CJAMarcos</string>
+			<string>CJAMacros</string>
 		</dict>
 	</array>
 </dict>

diff --git a/CJAMacros/CJAMacros.h b/CJAMacros/CJAMacros.h
@@ -18,24 +18,6 @@
 #define kNSLogFunctionWithObject(_object) NSLog(@"%s %@", __FUNCTION__, [_object description]);
 #define kNSLogFunction kNSLogFunctionWithObject(@"")
 
-/**
- Special ErrorLog. 
- You can use this function to Log in Release Mode
- @param format - The same format as you should use in NSLog(...)
- */
-void ErrorLog(NSString *format, ...); //The Error-Log also Outputs in the relase Vesion
-
-/**
- DEBUG and RELEASE settings for the Log Macros
- Note: The ErrorLog Function is always available. Normal NSLog stripped out in RELEASE mode
- */
-#ifdef DEBUG
-  #define ELog 1
-#else
-  #define ELog 1
-  #define NSLog(format, ...)
-#endif
-
 ///---------------------------
 /// @name Localization
 ///---------------------------

diff --git a/CJAMacros/CJAMacros.m b/CJAMacros/CJAMacros.m
diff --git a/Example/Classes/DemoViewController.m b/Example/Classes/DemoViewController.m
@@ -32,11 +32,6 @@ - (void)performLogMacros {
   //Should output the current function fingerprint + and the given object description
   kNSLogFunctionWithObject(@"My test log");
   kNSLogFunctionWithObject(self);
-
-  //Use the Error Log to log statements in RELEASE mode
-  ErrorLog(@"Always print this");
-
-
 }
 
 - (void)performLocalizationMacro {

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Collection of daily used Macros in my iOS Projects
 [![Build Status](https://travis-ci.org/carlj/CJAMacros.png?branch=master)](https://travis-ci.org/carlj/CJAMacros)
 
 ##Installation
-Just drag&drop the ```CJAMarcos.h``` and ```CJAMarcos.m``` files in your XCode Project. 
+Just drag&drop the ```CJAMarcos.h``` files in your XCode Project. 
 For global usage you can import the ```CJAMarcos.h``` in your projects ```-Prefix.pch``` file.
 
 ##Usage