From 89c19eff6148767688ebcc0112a60ac77f2c7b9d Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Sun, 21 Aug 2016 12:23:40 +0200 Subject: [PATCH] =?UTF-8?q?Change=20=E2=80=98runningCommand=E2=80=99=20get?= =?UTF-8?q?ter=20to=20=E2=80=98isRunningCommand=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frameworks/DocumentWindow/src/DocumentController.mm | 2 +- Frameworks/HTMLOutput/src/HTMLOutput.h | 2 +- Frameworks/HTMLOutput/src/OakHTMLOutputView.h | 2 +- Frameworks/HTMLOutput/src/OakHTMLOutputView.mm | 2 +- Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Frameworks/DocumentWindow/src/DocumentController.mm b/Frameworks/DocumentWindow/src/DocumentController.mm index b6dd43a0..4ae333ce 100644 --- a/Frameworks/DocumentWindow/src/DocumentController.mm +++ b/Frameworks/DocumentWindow/src/DocumentController.mm @@ -2072,7 +2072,7 @@ namespace - (void)setCommandRunner:(command::runner_ptr const&)aRunner { _runner = aRunner; - if(self.htmlOutputInWindow || self.htmlOutputView.runningCommand) + if(self.htmlOutputInWindow || self.htmlOutputView.isRunningCommand) { HTMLOutputWindowController* target = nil; diff --git a/Frameworks/HTMLOutput/src/HTMLOutput.h b/Frameworks/HTMLOutput/src/HTMLOutput.h index 3ed5bc8c..d3142c5b 100644 --- a/Frameworks/HTMLOutput/src/HTMLOutput.h +++ b/Frameworks/HTMLOutput/src/HTMLOutput.h @@ -7,7 +7,7 @@ extern NSString* const kCommandRunnerURLScheme; - (void)stopLoading; - (void)loadHTMLString:(NSString*)someHTML; -@property (nonatomic, readonly) BOOL runningCommand; +@property (nonatomic, getter = isRunningCommand, readonly) BOOL runningCommand; // Read-only access to the webview is given to allow reading page title, etc. @property (nonatomic, readonly) WebView* webView; diff --git a/Frameworks/HTMLOutput/src/OakHTMLOutputView.h b/Frameworks/HTMLOutput/src/OakHTMLOutputView.h index b1806b4c..33ae034a 100644 --- a/Frameworks/HTMLOutput/src/OakHTMLOutputView.h +++ b/Frameworks/HTMLOutput/src/OakHTMLOutputView.h @@ -6,7 +6,7 @@ PUBLIC @interface OakHTMLOutputView : HOBrowserView - (void)stopLoading; - (void)loadHTMLString:(NSString*)someHTML; -@property (nonatomic, readonly) BOOL runningCommand; +@property (nonatomic, getter = isRunningCommand, readonly) BOOL runningCommand; // Read-only access to the webview is given to allow reading page title, etc. @property (nonatomic, readonly) WebView* webView; diff --git a/Frameworks/HTMLOutput/src/OakHTMLOutputView.mm b/Frameworks/HTMLOutput/src/OakHTMLOutputView.mm index 72e08f24..5028750c 100644 --- a/Frameworks/HTMLOutput/src/OakHTMLOutputView.mm +++ b/Frameworks/HTMLOutput/src/OakHTMLOutputView.mm @@ -11,7 +11,7 @@ extern NSString* const kCommandRunnerURLScheme; // from HTMLOutput.h { OBJC_WATCH_LEAKS(OakHTMLOutputView); } -@property (nonatomic) BOOL runningCommand; +@property (nonatomic, getter = isRunningCommand, readwrite) BOOL runningCommand; @property (nonatomic) HOAutoScroll* autoScrollHelper; @property (nonatomic) std::map environment; @property (nonatomic) NSRect pendingVisibleRect; diff --git a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm index d21f8a17..286a5646 100644 --- a/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm +++ b/Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm @@ -88,7 +88,7 @@ OAK_DEBUG_VAR(HTMLOutputWindow); - (BOOL)running { - return self.htmlOutputView.runningCommand; + return self.htmlOutputView.isRunningCommand; } - (BOOL)needsNewWebView