Upgraded project to XCode 5

Fixed warnings in XCode 5
This commit is contained in:
michael starke
2013-09-19 00:06:29 +02:00
parent 6a6b1e1ba5
commit 868950e873
9 changed files with 62 additions and 21 deletions

View File

@@ -1685,7 +1685,7 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
CLASSPREFIX = MP; CLASSPREFIX = MP;
LastUpgradeCheck = 0460; LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "HicknHack Software GmbH"; ORGANIZATIONNAME = "HicknHack Software GmbH";
}; };
buildConfigurationList = 4C77E35C15B84A240093A587 /* Build configuration list for PBXProject "MacPass" */; buildConfigurationList = 4C77E35C15B84A240093A587 /* Build configuration list for PBXProject "MacPass" */;
@@ -2138,9 +2138,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = NO; CLANG_ENABLE_OBJC_ARC = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -2157,7 +2158,9 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2/**"; HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2/**";
MACOSX_DEPLOYMENT_TARGET = 10.8; MACOSX_DEPLOYMENT_TARGET = 10.8;
@@ -2171,9 +2174,10 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = NO; CLANG_ENABLE_OBJC_ARC = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -2184,7 +2188,9 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2/**"; HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2/**";
MACOSX_DEPLOYMENT_TARGET = 10.8; MACOSX_DEPLOYMENT_TARGET = 10.8;

View File

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

View File

@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1080</int> <int key="IBDocument.SystemTarget">1080</int>
<string key="IBDocument.SystemVersion">12E55</string> <string key="IBDocument.SystemVersion">12F37</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">4510</string>
<string key="IBDocument.AppKitVersion">1187.39</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <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> </object>
<array key="IBDocument.IntegratedClassDependencies"> <array key="IBDocument.IntegratedClassDependencies">
<string>IBNSLayoutConstraint</string> <string>IBNSLayoutConstraint</string>
@@ -42,7 +42,7 @@
<string key="NSClassName">NSApplication</string> <string key="NSClassName">NSApplication</string>
</object> </object>
<object class="NSCustomView" id="233312071"> <object class="NSCustomView" id="233312071">
<reference key="NSNextResponder"/> <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews">
<object class="NSTextField" id="990836775"> <object class="NSTextField" id="990836775">
@@ -127,7 +127,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 2}, {42, 25}}</string> <string key="NSFrame">{{20, 2}, {42, 25}}</string>
<reference key="NSSuperview" ref="381395509"/> <reference key="NSSuperview" ref="381395509"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:22</string> <string key="NSReuseIdentifierKey">_NS:22</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="348505851"> <object class="NSButtonCell" key="NSCell" id="348505851">
@@ -155,17 +154,16 @@
</object> </object>
<object class="NSTabView" id="45251842"> <object class="NSTabView" id="45251842">
<reference key="NSNextResponder" ref="233312071"/> <reference key="NSNextResponder" ref="233312071"/>
<int key="NSvFlags">12</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 30}, {278, 369}}</string> <string key="NSFrame">{{0, 30}, {278, 369}}</string>
<reference key="NSSuperview" ref="233312071"/> <reference key="NSSuperview" ref="233312071"/>
<reference key="NSNextKeyView" ref="906788312"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<array class="NSMutableArray" key="NSTabViewItems"> <array class="NSMutableArray" key="NSTabViewItems">
<object class="NSTabViewItem" id="367063082"> <object class="NSTabViewItem" id="367063082">
<string key="NSIdentifier">2</string> <string key="NSIdentifier">2</string>
<object class="NSView" key="NSView" id="906788312"> <object class="NSView" key="NSView" id="906788312">
<reference key="NSNextResponder" ref="45251842"/> <reference key="NSNextResponder" ref="45251842"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">274</int>
<string key="NSFrameSize">{278, 369}</string> <string key="NSFrameSize">{278, 369}</string>
<reference key="NSSuperview" ref="45251842"/> <reference key="NSSuperview" ref="45251842"/>
<reference key="NSNextKeyView" ref="381395509"/> <reference key="NSNextKeyView" ref="381395509"/>
@@ -245,7 +243,6 @@
</object> </object>
</array> </array>
<string key="NSFrameSize">{278, 443}</string> <string key="NSFrameSize">{278, 443}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="621131831"/> <reference key="NSNextKeyView" ref="621131831"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string> <string key="NSClassName">NSView</string>
@@ -355,6 +352,7 @@
<int key="scoringType">9</int> <int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float> <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="938170426"> <object class="IBNSLayoutConstraint" id="938170426">
<reference key="firstItem" ref="381395509"/> <reference key="firstItem" ref="381395509"/>
@@ -371,6 +369,7 @@
<int key="scoringType">9</int> <int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float> <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="26385821"> <object class="IBNSLayoutConstraint" id="26385821">
<reference key="firstItem" ref="381395509"/> <reference key="firstItem" ref="381395509"/>
@@ -384,9 +383,10 @@
</object> </object>
<float key="priority">1000</float> <float key="priority">1000</float>
<reference key="containingView" ref="233312071"/> <reference key="containingView" ref="233312071"/>
<int key="scoringType">8</int> <int key="scoringType">0</int>
<float key="scoringTypeFloat">29</float> <float key="scoringTypeFloat">29</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="112302846"> <object class="IBNSLayoutConstraint" id="112302846">
<reference key="firstItem" ref="381395509"/> <reference key="firstItem" ref="381395509"/>
@@ -400,9 +400,10 @@
</object> </object>
<float key="priority">1000</float> <float key="priority">1000</float>
<reference key="containingView" ref="233312071"/> <reference key="containingView" ref="233312071"/>
<int key="scoringType">8</int> <int key="scoringType">0</int>
<float key="scoringTypeFloat">29</float> <float key="scoringTypeFloat">29</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="300317034"> <object class="IBNSLayoutConstraint" id="300317034">
<reference key="firstItem" ref="233312071"/> <reference key="firstItem" ref="233312071"/>
@@ -419,6 +420,7 @@
<int key="scoringType">9</int> <int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float> <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="857734432"> <object class="IBNSLayoutConstraint" id="857734432">
<reference key="firstItem" ref="990836775"/> <reference key="firstItem" ref="990836775"/>
@@ -435,6 +437,7 @@
<int key="scoringType">9</int> <int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float> <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="930543667"> <object class="IBNSLayoutConstraint" id="930543667">
<reference key="firstItem" ref="990836775"/> <reference key="firstItem" ref="990836775"/>
@@ -451,6 +454,7 @@
<int key="scoringType">6</int> <int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float> <float key="scoringTypeFloat">24</float>
<int key="contentType">2</int> <int key="contentType">2</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="263318542"> <object class="IBNSLayoutConstraint" id="263318542">
<reference key="firstItem" ref="45251842"/> <reference key="firstItem" ref="45251842"/>
@@ -467,6 +471,7 @@
<int key="scoringType">3</int> <int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float> <float key="scoringTypeFloat">9</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="578777475"> <object class="IBNSLayoutConstraint" id="578777475">
<reference key="firstItem" ref="45251842"/> <reference key="firstItem" ref="45251842"/>
@@ -480,9 +485,10 @@
</object> </object>
<float key="priority">1000</float> <float key="priority">1000</float>
<reference key="containingView" ref="233312071"/> <reference key="containingView" ref="233312071"/>
<int key="scoringType">8</int> <int key="scoringType">0</int>
<float key="scoringTypeFloat">29</float> <float key="scoringTypeFloat">29</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="22318682"> <object class="IBNSLayoutConstraint" id="22318682">
<reference key="firstItem" ref="45251842"/> <reference key="firstItem" ref="45251842"/>
@@ -496,9 +502,10 @@
</object> </object>
<float key="priority">1000</float> <float key="priority">1000</float>
<reference key="containingView" ref="233312071"/> <reference key="containingView" ref="233312071"/>
<int key="scoringType">8</int> <int key="scoringType">0</int>
<float key="scoringTypeFloat">29</float> <float key="scoringTypeFloat">29</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="627335830"> <object class="IBNSLayoutConstraint" id="627335830">
<reference key="firstItem" ref="621131831"/> <reference key="firstItem" ref="621131831"/>
@@ -515,6 +522,7 @@
<int key="scoringType">9</int> <int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float> <float key="scoringTypeFloat">40</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="544375755"> <object class="IBNSLayoutConstraint" id="544375755">
<reference key="firstItem" ref="621131831"/> <reference key="firstItem" ref="621131831"/>
@@ -531,6 +539,7 @@
<int key="scoringType">3</int> <int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float> <float key="scoringTypeFloat">9</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<reference ref="381395509"/> <reference ref="381395509"/>
<reference ref="45251842"/> <reference ref="45251842"/>
@@ -605,6 +614,7 @@
<int key="scoringType">5</int> <int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float> <float key="scoringTypeFloat">22</float>
<int key="contentType">2</int> <int key="contentType">2</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="618180937"> <object class="IBNSLayoutConstraint" id="618180937">
<reference key="firstItem" ref="830540359"/> <reference key="firstItem" ref="830540359"/>
@@ -618,9 +628,10 @@
</object> </object>
<float key="priority">1000</float> <float key="priority">1000</float>
<reference key="containingView" ref="381395509"/> <reference key="containingView" ref="381395509"/>
<int key="scoringType">8</int> <int key="scoringType">0</int>
<float key="scoringTypeFloat">29</float> <float key="scoringTypeFloat">29</float>
<int key="contentType">3</int> <int key="contentType">3</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="574545128"> <object class="IBNSLayoutConstraint" id="574545128">
<reference key="firstItem" ref="381395509"/> <reference key="firstItem" ref="381395509"/>
@@ -637,6 +648,7 @@
<int key="scoringType">9</int> <int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float> <float key="scoringTypeFloat">40</float>
<int key="contentType">1</int> <int key="contentType">1</int>
<bool key="placeholder">NO</bool>
</object> </object>
<reference ref="830540359"/> <reference ref="830540359"/>
</array> </array>
@@ -694,6 +706,7 @@
<int key="scoringType">5</int> <int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float> <float key="scoringTypeFloat">22</float>
<int key="contentType">2</int> <int key="contentType">2</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="998507707"> <object class="IBNSLayoutConstraint" id="998507707">
<reference key="firstItem" ref="390171337"/> <reference key="firstItem" ref="390171337"/>
@@ -710,6 +723,7 @@
<int key="scoringType">5</int> <int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float> <float key="scoringTypeFloat">22</float>
<int key="contentType">2</int> <int key="contentType">2</int>
<bool key="placeholder">NO</bool>
</object> </object>
<reference ref="390171337"/> <reference ref="390171337"/>
</array> </array>
@@ -748,6 +762,7 @@
<int key="scoringType">3</int> <int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float> <float key="scoringTypeFloat">9</float>
<int key="contentType">1</int> <int key="contentType">1</int>
<bool key="placeholder">NO</bool>
</object> </object>
<object class="IBNSLayoutConstraint" id="418732131"> <object class="IBNSLayoutConstraint" id="418732131">
<reference key="firstItem" ref="621131831"/> <reference key="firstItem" ref="621131831"/>
@@ -764,6 +779,7 @@
<int key="scoringType">9</int> <int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float> <float key="scoringTypeFloat">40</float>
<int key="contentType">1</int> <int key="contentType">1</int>
<bool key="placeholder">NO</bool>
</object> </object>
</array> </array>
<reference key="parent" ref="233312071"/> <reference key="parent" ref="233312071"/>
@@ -953,6 +969,15 @@
<object class="IBClassDescriber" key="IBDocument.Classes"/> <object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int> <int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <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> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int> <int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

View File

@@ -15,9 +15,6 @@
@implementation KPKNode (IconImage) @implementation KPKNode (IconImage)
- (NSImage *)iconImage { - (NSImage *)iconImage {
if([self respondsToSelector:@selector(customIconUuid)]) {
// find the custom icon
}
if(self.customIcon) { if(self.customIcon) {
return self.customIcon.image; return self.customIcon.image;
} }

View File

@@ -9,6 +9,7 @@
#import "MPAttachmentTableViewDelegate.h" #import "MPAttachmentTableViewDelegate.h"
#import "MPDocument.h" #import "MPDocument.h"
#import "MPEntryInspectorViewController.h"
#import "MPSelectedAttachmentTableCellView.h" #import "MPSelectedAttachmentTableCellView.h"
#import "KPKEntry.h" #import "KPKEntry.h"

View File

@@ -9,6 +9,7 @@
#import "MPCustomFieldTableViewDelegate.h" #import "MPCustomFieldTableViewDelegate.h"
#import "MPDocument.h" #import "MPDocument.h"
#import "MPCustomFieldTableCellView.h" #import "MPCustomFieldTableCellView.h"
#import "MPEntryInspectorViewController.h"
#import "KPKEntry.h" #import "KPKEntry.h"
#import "KPKAttribute.h" #import "KPKAttribute.h"

View File

@@ -7,6 +7,7 @@
// //
#import "MPEntryContextMenuDelegate.h" #import "MPEntryContextMenuDelegate.h"
#import "MPEntryViewController.h"
#import "MPDocument.h" #import "MPDocument.h"
#import "KPKEntry.h" #import "KPKEntry.h"

View File

@@ -36,4 +36,13 @@
- (void)setupBindings:(MPDocument *)document; - (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 @end

View File

@@ -8,6 +8,7 @@
#import "MPOutlineContextMenuDelegate.h" #import "MPOutlineContextMenuDelegate.h"
#import "MPOutlineViewController.h" #import "MPOutlineViewController.h"
#import "MPDocumentWindowController.h"
#import "MPDocument.h" #import "MPDocument.h"