From bb038b06708d6fd3e314eada0995135cf2b02789 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Thu, 25 Aug 2016 14:10:08 +0200 Subject: [PATCH] Remove unused HTMLOutputWindow properties --- Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.h | 2 -- Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm | 11 ++--------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.h b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.h index bcdd7112..fdeb0e32 100644 --- a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.h +++ b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.h @@ -4,8 +4,6 @@ PUBLIC @interface HTMLOutputWindowController : NSObject @property (nonatomic) NSWindow* window; @property (nonatomic) OakHTMLOutputView* htmlOutputView; -@property (nonatomic) command::runner_ptr commandRunner; -@property (nonatomic, readonly) BOOL running; @property (nonatomic, readonly) BOOL needsNewWebView; + (instancetype)HTMLOutputWindowWithRunner:(command::runner_ptr const&)aRunner; diff --git a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm index e30b5957..e97fd1f2 100644 --- a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm +++ b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm @@ -85,17 +85,10 @@ OAK_DEBUG_VAR(HTMLOutputWindow); - (void)setCommandRunner:(command::runner_ptr)aRunner { - _commandRunner = aRunner; - - [self.htmlOutputView loadRequest:URLRequestForCommandRunner(_commandRunner) environment:_commandRunner->environment() autoScrolls:_commandRunner->auto_scroll_output()]; + [self.htmlOutputView loadRequest:URLRequestForCommandRunner(aRunner) environment:aRunner->environment() autoScrolls:aRunner->auto_scroll_output()]; [self showWindow:self]; } -- (BOOL)running -{ - return self.htmlOutputView.isRunningCommand; -} - - (BOOL)needsNewWebView { return _htmlOutputView.needsNewWebView; @@ -104,7 +97,7 @@ OAK_DEBUG_VAR(HTMLOutputWindow); - (BOOL)windowShouldClose:(id)sender { D(DBF_HTMLOutputWindow, bug("\n");); - if(!self.running) + if(!_htmlOutputView.isRunningCommand) return YES; [_htmlOutputView stopLoadingWithUserInteraction:YES completionHandler:^(BOOL didStop){