diff options
Diffstat (limited to 'cocoa/ScintillaCocoa.h')
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index e75efffef..8ea0f410f 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -121,7 +121,7 @@ protected: void Init(); std::unique_ptr<CaseFolder> CaseFolderForEncoding() override; - std::string CaseMapString(const std::string &s, int caseMapping) override; + std::string CaseMapString(const std::string &s, CaseMapping caseMapping) override; void CancelModes() override; public: @@ -187,14 +187,14 @@ public: static sptr_t DirectFunction(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam); - NSTimer *timers[tickPlatform+1]; + NSTimer *timers[static_cast<size_t>(TickReason::platform)+1]; void TimerFired(NSTimer *timer); void IdleTimerFired(); static void UpdateObserver(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *sci); void ObserverAdd(); void ObserverRemove(); void IdleWork() override; - void QueueIdleWork(WorkNeeded::workItems items, Sci::Position upTo) override; + void QueueIdleWork(WorkItems items, Sci::Position upTo) override; ptrdiff_t InsertText(NSString *input, CharacterSource charSource); NSRange PositionsFromCharacters(NSRange rangeCharacters) const; NSRange CharactersFromPositions(NSRange rangePositions) const; |