From 868950e873f38523e25cedc645bc1b6153cb83b6 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Thu, 19 Sep 2013 00:06:29 +0200
Subject: [PATCH] Upgraded project to XCode 5 Fixed warnings in XCode 5

---
 MacPass.xcodeproj/project.pbxproj             | 12 +++--
 .../xcshareddata/xcschemes/MacPass.xcscheme   |  2 +-
 MacPass/Base.lproj/InspectorView.xib          | 53 ++++++++++++++-----
 MacPass/KPKNode+IconImage.m                   |  3 --
 MacPass/MPAttachmentTableViewDelegate.m       |  1 +
 MacPass/MPCustomFieldTableViewDelegate.m      |  1 +
 MacPass/MPEntryContextMenuDelegate.m          |  1 +
 MacPass/MPEntryInspectorViewController.h      |  9 ++++
 MacPass/MPOutlineContextMenuDelegate.m        |  1 +
 9 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 40924325..376ba048 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -1685,7 +1685,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = MP;
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0500;
 				ORGANIZATIONNAME = "HicknHack Software GmbH";
 			};
 			buildConfigurationList = 4C77E35C15B84A240093A587 /* Build configuration list for PBXProject "MacPass" */;
@@ -2138,9 +2138,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ENABLE_OBJC_ARC = NO;
+				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -2157,7 +2158,9 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2/**";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
@@ -2171,9 +2174,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_ENABLE_OBJC_ARC = NO;
+				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -2184,7 +2188,9 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2/**";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
diff --git a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
index 82d6dd66..d878443e 100644
--- a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
+++ b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0460"
+   LastUpgradeVersion = "0500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index 4f490d22..90d5d8e1 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.SystemVersion">12F37</string>
+		<string key="IBDocument.InterfaceBuilderVersion">4510</string>
 		<string key="IBDocument.AppKitVersion">1187.39</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
+			<string key="NS.object.0">4510</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBNSLayoutConstraint</string>
@@ -42,7 +42,7 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSCustomView" id="233312071">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSTextField" id="990836775">
@@ -127,7 +127,6 @@
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{20, 2}, {42, 25}}</string>
 								<reference key="NSSuperview" ref="381395509"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:22</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSButtonCell" key="NSCell" id="348505851">
@@ -155,17 +154,16 @@
 					</object>
 					<object class="NSTabView" id="45251842">
 						<reference key="NSNextResponder" ref="233312071"/>
-						<int key="NSvFlags">12</int>
+						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{0, 30}, {278, 369}}</string>
 						<reference key="NSSuperview" ref="233312071"/>
-						<reference key="NSNextKeyView" ref="906788312"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<array class="NSMutableArray" key="NSTabViewItems">
 							<object class="NSTabViewItem" id="367063082">
 								<string key="NSIdentifier">2</string>
 								<object class="NSView" key="NSView" id="906788312">
 									<reference key="NSNextResponder" ref="45251842"/>
-									<int key="NSvFlags">256</int>
+									<int key="NSvFlags">274</int>
 									<string key="NSFrameSize">{278, 369}</string>
 									<reference key="NSSuperview" ref="45251842"/>
 									<reference key="NSNextKeyView" ref="381395509"/>
@@ -245,7 +243,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{278, 443}</string>
-				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="621131831"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<string key="NSClassName">NSView</string>
@@ -355,6 +352,7 @@
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="938170426">
 								<reference key="firstItem" ref="381395509"/>
@@ -371,6 +369,7 @@
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="26385821">
 								<reference key="firstItem" ref="381395509"/>
@@ -384,9 +383,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="233312071"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="112302846">
 								<reference key="firstItem" ref="381395509"/>
@@ -400,9 +400,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="233312071"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="300317034">
 								<reference key="firstItem" ref="233312071"/>
@@ -419,6 +420,7 @@
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="857734432">
 								<reference key="firstItem" ref="990836775"/>
@@ -435,6 +437,7 @@
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="930543667">
 								<reference key="firstItem" ref="990836775"/>
@@ -451,6 +454,7 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="263318542">
 								<reference key="firstItem" ref="45251842"/>
@@ -467,6 +471,7 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="578777475">
 								<reference key="firstItem" ref="45251842"/>
@@ -480,9 +485,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="233312071"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="22318682">
 								<reference key="firstItem" ref="45251842"/>
@@ -496,9 +502,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="233312071"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="627335830">
 								<reference key="firstItem" ref="621131831"/>
@@ -515,6 +522,7 @@
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="544375755">
 								<reference key="firstItem" ref="621131831"/>
@@ -531,6 +539,7 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<reference ref="381395509"/>
 							<reference ref="45251842"/>
@@ -605,6 +614,7 @@
 								<int key="scoringType">5</int>
 								<float key="scoringTypeFloat">22</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="618180937">
 								<reference key="firstItem" ref="830540359"/>
@@ -618,9 +628,10 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="381395509"/>
-								<int key="scoringType">8</int>
+								<int key="scoringType">0</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="574545128">
 								<reference key="firstItem" ref="381395509"/>
@@ -637,6 +648,7 @@
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">1</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<reference ref="830540359"/>
 						</array>
@@ -694,6 +706,7 @@
 								<int key="scoringType">5</int>
 								<float key="scoringTypeFloat">22</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="998507707">
 								<reference key="firstItem" ref="390171337"/>
@@ -710,6 +723,7 @@
 								<int key="scoringType">5</int>
 								<float key="scoringTypeFloat">22</float>
 								<int key="contentType">2</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<reference ref="390171337"/>
 						</array>
@@ -748,6 +762,7 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="418732131">
 								<reference key="firstItem" ref="621131831"/>
@@ -764,6 +779,7 @@
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">1</int>
+								<bool key="placeholder">NO</bool>
 							</object>
 						</array>
 						<reference key="parent" ref="233312071"/>
@@ -953,6 +969,15 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1080" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="4600" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
diff --git a/MacPass/KPKNode+IconImage.m b/MacPass/KPKNode+IconImage.m
index 136946bc..b51b3dae 100644
--- a/MacPass/KPKNode+IconImage.m
+++ b/MacPass/KPKNode+IconImage.m
@@ -15,9 +15,6 @@
 @implementation KPKNode (IconImage)
 
 - (NSImage *)iconImage {
-  if([self respondsToSelector:@selector(customIconUuid)]) {
-    // find the custom icon
-  }
   if(self.customIcon) {
     return self.customIcon.image;
   }
diff --git a/MacPass/MPAttachmentTableViewDelegate.m b/MacPass/MPAttachmentTableViewDelegate.m
index ea76a13e..52c8974f 100644
--- a/MacPass/MPAttachmentTableViewDelegate.m
+++ b/MacPass/MPAttachmentTableViewDelegate.m
@@ -9,6 +9,7 @@
 #import "MPAttachmentTableViewDelegate.h"
 
 #import "MPDocument.h"
+#import "MPEntryInspectorViewController.h"
 #import "MPSelectedAttachmentTableCellView.h"
 
 #import "KPKEntry.h"
diff --git a/MacPass/MPCustomFieldTableViewDelegate.m b/MacPass/MPCustomFieldTableViewDelegate.m
index 5a747347..2ceca77d 100644
--- a/MacPass/MPCustomFieldTableViewDelegate.m
+++ b/MacPass/MPCustomFieldTableViewDelegate.m
@@ -9,6 +9,7 @@
 #import "MPCustomFieldTableViewDelegate.h"
 #import "MPDocument.h"
 #import "MPCustomFieldTableCellView.h"
+#import "MPEntryInspectorViewController.h"
 
 #import "KPKEntry.h"
 #import "KPKAttribute.h"
diff --git a/MacPass/MPEntryContextMenuDelegate.m b/MacPass/MPEntryContextMenuDelegate.m
index 309c1036..42d224b6 100644
--- a/MacPass/MPEntryContextMenuDelegate.m
+++ b/MacPass/MPEntryContextMenuDelegate.m
@@ -7,6 +7,7 @@
 //
 
 #import "MPEntryContextMenuDelegate.h"
+#import "MPEntryViewController.h"
 #import "MPDocument.h"
 
 #import "KPKEntry.h"
diff --git a/MacPass/MPEntryInspectorViewController.h b/MacPass/MPEntryInspectorViewController.h
index 03a3249b..89628422 100644
--- a/MacPass/MPEntryInspectorViewController.h
+++ b/MacPass/MPEntryInspectorViewController.h
@@ -36,4 +36,13 @@
 
 - (void)setupBindings:(MPDocument *)document;
 
+- (IBAction)saveAttachment:(id)sender;
+- (IBAction)addAttachment:(id)sender;
+- (IBAction)removeAttachment:(id)sender;
+
+- (IBAction)addCustomField:(id)sender;
+- (IBAction)removeCustomField:(id)sender;
+
+
+
 @end
diff --git a/MacPass/MPOutlineContextMenuDelegate.m b/MacPass/MPOutlineContextMenuDelegate.m
index e98636c7..8b82fae2 100644
--- a/MacPass/MPOutlineContextMenuDelegate.m
+++ b/MacPass/MPOutlineContextMenuDelegate.m
@@ -8,6 +8,7 @@
 
 #import "MPOutlineContextMenuDelegate.h"
 #import "MPOutlineViewController.h"
+#import "MPDocumentWindowController.h"
 
 #import "MPDocument.h"