Use "override" for Cocoa platform code and add to Editor where possible.

1 files changed, 49 insertions, 49 deletions

diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 1defaf220..60400cc77 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -118,27 +118,27 @@ private:
   FindHighlightLayer *layerFindIndicator;
 
 protected:
-  Point GetVisibleOriginInMain() const;
-  PRectangle GetClientRectangle() const;
-  virtual PRectangle GetClientDrawingRectangle();
+  Point GetVisibleOriginInMain() const override;
+  PRectangle GetClientRectangle() const override;
+  PRectangle GetClientDrawingRectangle() override;
   Point ConvertPoint(NSPoint point);
-  virtual void RedrawRect(PRectangle rc);
-  virtual void DiscardOverdraw();
-  virtual void Redraw();
+  void RedrawRect(PRectangle rc) override;
+  void DiscardOverdraw() override;
+  void Redraw() override;
 
-  virtual void Initialise();
-  virtual void Finalise();
-  virtual CaseFolder *CaseFolderForEncoding();
-  virtual std::string CaseMapString(const std::string &s, int caseMapping);
-  virtual void CancelModes();
+  void Initialise() override;
+  void Finalise() override;
+  CaseFolder *CaseFolderForEncoding() override;
+  std::string CaseMapString(const std::string &s, int caseMapping) override;
+  void CancelModes() override;
 
 public:
   ScintillaCocoa(ScintillaView* sciView_, SCIContentView* viewContent, SCIMarginView* viewMargin);
-  virtual ~ScintillaCocoa();
+  ~ScintillaCocoa() override;
 
   void SetDelegate(id<ScintillaNotificationProtocol> delegate_);
   void RegisterNotifyCallback(intptr_t windowid, SciNotifyFunc callback);
-  sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+  sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override;
 
   NSScrollView* ScrollContainer() const;
   SCIContentView* ContentView();
@@ -147,43 +147,43 @@ public:
   bool Draw(NSRect rect, CGContextRef gc);
   void PaintMargin(NSRect aRect);
 
-  virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-  void TickFor(TickReason reason);
-  bool FineTickerAvailable();
-  bool FineTickerRunning(TickReason reason);
-  void FineTickerStart(TickReason reason, int millis, int tolerance);
-  void FineTickerCancel(TickReason reason);
-  bool SetIdle(bool on);
-  void SetMouseCapture(bool on);
-  bool HaveMouseCapture();
+  sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override;
+  void TickFor(TickReason reason) override;
+  bool FineTickerAvailable() override;
+  bool FineTickerRunning(TickReason reason) override;
+  void FineTickerStart(TickReason reason, int millis, int tolerance) override;
+  void FineTickerCancel(TickReason reason) override;
+  bool SetIdle(bool on) override;
+  void SetMouseCapture(bool on) override;
+  bool HaveMouseCapture() override;
   void WillDraw(NSRect rect);
-  void ScrollText(int linesToMove);
-  void SetVerticalScrollPos();
-  void SetHorizontalScrollPos();
-  bool ModifyScrollBars(int nMax, int nPage);
+  void ScrollText(int linesToMove) override;
+  void SetVerticalScrollPos() override;
+  void SetHorizontalScrollPos() override;
+  bool ModifyScrollBars(int nMax, int nPage) override;
   bool SetScrollingSize(void);
   void Resize();
   void UpdateForScroll();
 
   // Notifications for the owner.
-  void NotifyChange();
-  void NotifyFocus(bool focus);
-  void NotifyParent(SCNotification scn);
+  void NotifyChange() override;
+  void NotifyFocus(bool focus) override;
+  void NotifyParent(SCNotification scn) override;
   void NotifyURIDropped(const char *uri);
 
   bool HasSelection();
   bool CanUndo();
   bool CanRedo();
-  virtual void CopyToClipboard(const SelectionText &selectedText);
-  virtual void Copy();
-  virtual bool CanPaste();
-  virtual void Paste();
-  virtual void Paste(bool rectangular);
+  void CopyToClipboard(const SelectionText &selectedText) override;
+  void Copy() override;
+  bool CanPaste() override;
+  void Paste() override;
+  void Paste(bool rectangular);
   void CTPaint(void* gc, NSRect rc);
   void CallTipMouseDown(NSPoint pt);
-  virtual void CreateCallTipWindow(PRectangle rc);
-  virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
-  virtual void ClaimSelection();
+  void CreateCallTipWindow(PRectangle rc) override;
+  void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override;
+  void ClaimSelection() override;
 
   NSPoint GetCaretPosition();
 
@@ -195,8 +195,8 @@ public:
   static void UpdateObserver(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *sci);
   void ObserverAdd();
   void ObserverRemove();
-  virtual void IdleWork();
-  virtual void QueueIdleWork(WorkNeeded::workItems items, int upTo);
+  void IdleWork() override;
+  void QueueIdleWork(WorkNeeded::workItems items, int upTo) override;
   int InsertText(NSString* input);
   NSRange PositionsFromCharacters(NSRange rangeCharacters) const;
   NSRange CharactersFromPositions(NSRange rangePositions) const;
@@ -210,7 +210,7 @@ public:
   void CompositionStart();
   void CompositionCommit();
   void CompositionUndo();
-  virtual void SetDocPointer(Document *document);
+  void SetDocPointer(Document *document) override;
 
   bool KeyboardInput(NSEvent* event);
   void MouseDown(NSEvent* event);
@@ -222,7 +222,7 @@ public:
   void MouseWheel(NSEvent* event);
 
   // Drag and drop
-  void StartDrag();
+  void StartDrag() override;
   bool GetDragData(id <NSDraggingInfo> info, NSPasteboard &pasteBoard, SelectionText* selectedText);
   NSDragOperation DraggingEntered(id <NSDraggingInfo> info);
   NSDragOperation DraggingUpdated(id <NSDraggingInfo> info);
@@ -231,18 +231,18 @@ public:
   void DragScroll();
 
   // Promote some methods needed for NSResponder actions.
-  virtual void SelectAll();
+  void SelectAll() override;
   void DeleteBackward();
-  virtual void Cut();
-  virtual void Undo();
-  virtual void Redo();
+  void Cut() override;
+  void Undo() override;
+  void Redo() override;
 
-  virtual bool ShouldDisplayPopupOnMargin();
-  virtual bool ShouldDisplayPopupOnText();
-  virtual NSMenu* CreateContextMenu(NSEvent* event);
+  bool ShouldDisplayPopupOnMargin();
+  bool ShouldDisplayPopupOnText();
+  NSMenu* CreateContextMenu(NSEvent* event);
   void HandleCommand(NSInteger command);
 
-  virtual void ActiveStateChanged(bool isActive);
+  void ActiveStateChanged(bool isActive);
   void WindowWillMove();
 
   // Find indicator