From 303ba070a4003e8695bed24a183dfeb5a23e211d Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Wed, 2 Jan 2013 01:39:04 +0100 Subject: [PATCH] Collapse two class extensions into one --- Frameworks/DocumentWindow/src/DocumentController.mm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Frameworks/DocumentWindow/src/DocumentController.mm b/Frameworks/DocumentWindow/src/DocumentController.mm index 49469484..67f076dd 100644 --- a/Frameworks/DocumentWindow/src/DocumentController.mm +++ b/Frameworks/DocumentWindow/src/DocumentController.mm @@ -58,6 +58,8 @@ OAK_DEBUG_VAR(DocumentController); @property (nonatomic, retain) NSString* representedFile; @property (nonatomic, assign) BOOL isDocumentEdited; @property (nonatomic, retain) DocumentController* retainedSelf; +@property (nonatomic, retain) OakFilterWindowController* filterWindowController; +@property (nonatomic, retain) NSString* pathAttributes; - (id)initWithDocuments:(std::vector const&)someDocuments; - (void)updateProxyIcon; - (void)takeTabsToTearOffFrom:(id)sender; @@ -118,11 +120,6 @@ OAK_DEBUG_VAR(DocumentController); // ============================ -@interface DocumentController () -@property (nonatomic, retain) OakFilterWindowController* filterWindowController; -@property (nonatomic, retain) NSString* pathAttributes; -@end - static document::document_ptr create_document (NSString* fileBrowserPath) { document::document_ptr doc = document::from_content("", settings_for_path(NULL_STR, file::path_attributes(NULL_STR), to_s(fileBrowserPath)).get(kSettingsFileTypeKey, "text.plain"));