[Bibdesk-commit] SF.net SVN: bibdesk:[18472] trunk/bibdesk/NSString_BDSKExtensions.m

[hofman]

Revision: 18472
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18472&view=rev
Author:   hofman
Date:     2012-02-02 18:14:21 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Simplify method to create string with trial encoding, as we always pass YES as 
the last parameter

Modified Paths:
--------------
    trunk/bibdesk/NSString_BDSKExtensions.m

Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m     2012-02-02 18:13:41 UTC (rev 
18471)
+++ trunk/bibdesk/NSString_BDSKExtensions.m     2012-02-02 18:14:21 UTC (rev 
18472)
@@ -267,13 +267,13 @@
     Class stringClass = [self isKindOfClass:[NSMutableString class]] ? 
[NSMutableString class] : [NSString class];
     
     // if we're guessing, try the reliable encodings first
-    if(try && dataHasUnicodeByteOrderMark(data) && encoding != 
NSUnicodeStringEncoding)
+    if(dataHasUnicodeByteOrderMark(data) && encoding != 
NSUnicodeStringEncoding)
         string = [[stringClass allocWithZone:[self zone]] initWithData:data 
encoding:NSUnicodeStringEncoding];
-    if(try && nil == string && encoding != NSUTF8StringEncoding)
+    if(nil == string && encoding != NSUTF8StringEncoding)
         string = [[stringClass allocWithZone:[self zone]] initWithData:data 
encoding:NSUTF8StringEncoding];
     
     // read com.apple.TextEncoding on Leopard, or when reading a Tiger file 
saved on Leopard
-    if(try && nil == string) {
+    if(nil == string) {
         // don't clobber the encoding parameter in case this fails...
         NSStringEncoding xattrEncoding = [[NSFileManager defaultManager] 
appleStringEncodingAtPath:path error:NULL];
         if (xattrEncoding > 0)
@@ -285,12 +285,12 @@
         string = [[stringClass allocWithZone:[self zone]] initWithData:data 
encoding:encoding];
     
     // now we just try a few wild guesses
-    if(nil == string && try && encoding != [NSString defaultCStringEncoding])
+    if(nil == string && encoding != [NSString defaultCStringEncoding])
         string = [[stringClass allocWithZone:[self zone]] initWithData:data 
encoding:[NSString defaultCStringEncoding]];
-    if(nil == string && try && encoding != [BDSKStringEncodingManager 
defaultEncoding])
+    if(nil == string && encoding != [BDSKStringEncodingManager 
defaultEncoding])
         string = [[stringClass allocWithZone:[self zone]] initWithData:data 
encoding:[BDSKStringEncodingManager defaultEncoding]];
     // final fallback is Mac Roman (gapless)
-    if(nil == string && try && encoding != NSMacOSRomanStringEncoding)
+    if(nil == string && encoding != NSMacOSRomanStringEncoding)
         string = [[stringClass allocWithZone:[self zone]] initWithData:data 
encoding:NSMacOSRomanStringEncoding];
     
     [data release];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit