Project configuration improvements and warning fixes.

[UPDATED]   Fixed some warnings by explicitly type-casting NSNotFound checks.
[UPDATED]   Fixed some Xcode 5 warnings by doing project configuration improvements.

External/Pearl

@@ -1 +1 @@
-Subproject commit ea1826e779a9bc3d728aafb901f31fb33a6bd2ed
+Subproject commit d442168a64de12f883610e3047a8bb185a279a34

MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>BC894D39-401A-4FED-B9FA-C68C587BC4B4</string>
+	<key>IDESourceControlProjectName</key>
+	<string>MasterPassword</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>5263993D-5FE8-464F-B66E-B0F7C2DFF410</key>
+		<string>ssh://github.com/lhunath/UbiquityStoreManager.git</string>
+		<key>56D4C2AF-681C-406B-A5EA-C7FC4FA88907</key>
+		<string>git://github.com/futuretap/InAppSettingsKit.git</string>
+		<key>6A449EC2-A2A3-4635-9C5F-A811E011EAC3</key>
+		<string>ssh://github.com/Lyndir/MasterPassword.git</string>
+		<key>ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC</key>
+		<string>ssh://github.com/Lyndir/Pearl.git</string>
+		<key>AE3786C7-912B-4651-A73F-2E1DACBFB604</key>
+		<string>git://github.com/lhunath/uicolor-utilities.git</string>
+		<key>DD839E40-2AC0-4574-AE73-CECD1150EBAF</key>
+		<string>ssh://github.com/lhunath/RHStatusItemView.git</string>
+		<key>E4C8E206-229C-4DA8-A130-0C544DEC7E07</key>
+		<string>git://github.com/jonmarimba/jrswizzle.git</string>
+		<key>FF42A9E0-F41C-42FC-88CD-F2CCDE15DBB6</key>
+		<string>git://github.com/0xced/FontReplacer.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>MasterPassword.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>5263993D-5FE8-464F-B66E-B0F7C2DFF410</key>
+		<string>../External/UbiquityStoreManager</string>
+		<key>56D4C2AF-681C-406B-A5EA-C7FC4FA88907</key>
+		<string>../External/InAppSettingsKit</string>
+		<key>6A449EC2-A2A3-4635-9C5F-A811E011EAC3</key>
+		<string>..</string>
+		<key>ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC</key>
+		<string>../External/Pearl</string>
+		<key>AE3786C7-912B-4651-A73F-2E1DACBFB604</key>
+		<string>../External/Pearl/External/uicolor-utilities</string>
+		<key>DD839E40-2AC0-4574-AE73-CECD1150EBAF</key>
+		<string>../External/RHStatusItemView</string>
+		<key>E4C8E206-229C-4DA8-A130-0C544DEC7E07</key>
+		<string>../External/Pearl/External/jrswizzle</string>
+		<key>FF42A9E0-F41C-42FC-88CD-F2CCDE15DBB6</key>
+		<string>../External/FontReplacer</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>ssh://github.com/Lyndir/MasterPassword.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>6A449EC2-A2A3-4635-9C5F-A811E011EAC3</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>6A449EC2-A2A3-4635-9C5F-A811E011EAC3</string>
+			<key>IDESourceControlWCCName</key>
+			<string>MasterPassword</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>56D4C2AF-681C-406B-A5EA-C7FC4FA88907</string>
+			<key>IDESourceControlWCCName</key>
+			<string>InAppSettingsKit</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>5263993D-5FE8-464F-B66E-B0F7C2DFF410</string>
+			<key>IDESourceControlWCCName</key>
+			<string>UbiquityStoreManager</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC</string>
+			<key>IDESourceControlWCCName</key>
+			<string>Pearl</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>E4C8E206-229C-4DA8-A130-0C544DEC7E07</string>
+			<key>IDESourceControlWCCName</key>
+			<string>jrswizzle</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>FF42A9E0-F41C-42FC-88CD-F2CCDE15DBB6</string>
+			<key>IDESourceControlWCCName</key>
+			<string>FontReplacer</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>AE3786C7-912B-4651-A73F-2E1DACBFB604</string>
+			<key>IDESourceControlWCCName</key>
+			<string>uicolor-utilities</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>DD839E40-2AC0-4574-AE73-CECD1150EBAF</string>
+			<key>IDESourceControlWCCName</key>
+			<string>RHStatusItemView</string>
+		</dict>
+	</array>
+</dict>
+</plist>

MasterPassword/ObjC/MPEntities.m

@@ -31,9 +31,9 @@
 
     // Some people got elements with type == 0.
     MPElementType type = (MPElementType)[self.type_ unsignedIntegerValue];
-    if (!type || type == NSNotFound)
+    if (!type || type == (MPElementType)NSNotFound)
         type = [self.user defaultType];
-    if (!type || type == NSNotFound)
+    if (!type || type == (MPElementType)NSNotFound)
         type = MPElementTypeGeneratedLong;
 
     return type;
@@ -42,9 +42,9 @@
 - (void)setType:(MPElementType)aType {
 
     // Make sure we don't poison our model data with invalid values.
-    if (!aType || aType == NSNotFound)
+    if (!aType || aType == (MPElementType)NSNotFound)
         aType = [self.user defaultType];
-    if (!aType || aType == NSNotFound)
+    if (!aType || aType == (MPElementType)NSNotFound)
         aType = MPElementTypeGeneratedLong;
 
     self.type_ = @(aType);

MasterPassword/ObjC/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj

@@ -109,7 +109,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = MP;
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0500;
 				ORGANIZATIONNAME = "Maarten Billemont";
 			};
 			buildConfigurationList = DAD9B5BC176299B9001835F9 /* Build configuration list for PBXProject "MasterPassword-Mac-LoginHelper" */;
@@ -168,7 +168,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
@@ -225,7 +224,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
@@ -276,6 +274,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.entitlements";
 				CODE_SIGN_IDENTITY = "Developer ID Application: Maarten Billemont";
+				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper-Info.plist";
 				PROVISIONING_PROFILE = "";
 			};
@@ -285,6 +284,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.entitlements";
+				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper-Info.plist";
 			};
 			name = Release;

MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj

@@ -60,7 +60,6 @@
 		DA5E5D041724A667003798D8 /* MPMacConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CB61724A667003798D8 /* MPMacConfig.m */; };
 		DA5E5D051724A667003798D8 /* MPPasswordWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CB81724A667003798D8 /* MPPasswordWindowController.m */; };
 		DA5E5D061724A667003798D8 /* MPPasswordWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CB91724A667003798D8 /* MPPasswordWindowController.xib */; };
-		DA5E5D071724A667003798D8 /* MasterPassword-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CBA1724A667003798D8 /* MasterPassword-Info.plist */; };
 		DA5E5D081724A667003798D8 /* MasterPassword.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CBF1724A667003798D8 /* MasterPassword.entitlements */; };
 		DA5E5D091724A667003798D8 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CC01724A667003798D8 /* Credits.rtf */; };
 		DA5E5D0A1724A667003798D8 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CC21724A667003798D8 /* InfoPlist.strings */; };
@@ -1052,6 +1051,11 @@
 				CLASSPREFIX = MP;
 				LastUpgradeCheck = 0460;
 				ORGANIZATIONNAME = Lyndir;
+				TargetAttributes = {
+					DA5BFA43147E415C00F98B1E = {
+						DevelopmentTeam = HL3Q45LX9N;
+					};
+				};
 			};
 			buildConfigurationList = DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-Mac" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -1158,7 +1162,6 @@
 				DACA29731705E1A8002C6C22 /* ciphers.plist in Resources */,
 				DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */,
 				DA5E5D061724A667003798D8 /* MPPasswordWindowController.xib in Resources */,
-				DA5E5D071724A667003798D8 /* MasterPassword-Info.plist in Resources */,
 				DA5E5D081724A667003798D8 /* MasterPassword.entitlements in Resources */,
 				DA5E5D091724A667003798D8 /* Credits.rtf in Resources */,
 				DA5E5D0A1724A667003798D8 /* InfoPlist.strings in Resources */,
@@ -1557,7 +1560,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
 				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
-				COPY_PHASE_STRIP = YES;
+				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherit)",
@@ -1620,6 +1623,7 @@
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
 				SKIP_INSTALL = NO;
@@ -1632,6 +1636,7 @@
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
 				SKIP_INSTALL = NO;
@@ -1657,7 +1662,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
 				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
-				COPY_PHASE_STRIP = YES;
+				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherit)",
@@ -1720,6 +1725,7 @@
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
+				CODE_SIGN_IDENTITY = "Mac Developer";
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
 				SKIP_INSTALL = NO;

MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (App Store).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -61,7 +61,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-            BuildableName = "MasterPassword.app"
+            BuildableName = "Master Password.app"
             BlueprintName = "MasterPassword"
             ReferencedContainer = "container:MasterPassword-Mac.xcodeproj">
          </BuildableReference>

MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword Mac (Development).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -68,7 +68,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DA5BFA43147E415C00F98B1E"
-            BuildableName = "MasterPassword.app"
+            BuildableName = "Master Password.app"
             BlueprintName = "MasterPassword"
             ReferencedContainer = "container:MasterPassword-Mac.xcodeproj">
          </BuildableReference>

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"