diff options
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaQt.h')
-rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.h | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index bfa67339c..fbf61bc10 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -100,45 +100,45 @@ private slots: private: void Init(); - virtual void Finalise(); - virtual bool DragThreshold(Point ptStart, Point ptNow); - virtual bool ValidCodePage(int codePage) const; + void Finalise() override; + bool DragThreshold(Point ptStart, Point ptNow) override; + bool ValidCodePage(int codePage) const override; private: - virtual void ScrollText(int linesToMove); - virtual void SetVerticalScrollPos(); - virtual void SetHorizontalScrollPos(); - virtual bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage); - virtual void ReconfigureScrollBars(); + void ScrollText(int linesToMove) override; + void SetVerticalScrollPos() override; + void SetHorizontalScrollPos() override; + bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) override; + void ReconfigureScrollBars() override; void CopyToModeClipboard(const SelectionText &selectedText, QClipboard::Mode clipboardMode_); - virtual void Copy(); - virtual void CopyToClipboard(const SelectionText &selectedText); + void Copy() override; + void CopyToClipboard(const SelectionText &selectedText) override; void PasteFromMode(QClipboard::Mode clipboardMode_); - virtual void Paste(); - virtual void ClaimSelection(); - virtual void NotifyChange(); - virtual void NotifyFocus(bool focus); - virtual void NotifyParent(SCNotification scn); + void Paste() override; + void ClaimSelection() override; + void NotifyChange() override; + void NotifyFocus(bool focus) override; + void NotifyParent(SCNotification scn) override; int timers[tickDwell+1]; - virtual bool FineTickerAvailable(); - virtual bool FineTickerRunning(TickReason reason); - virtual void FineTickerStart(TickReason reason, int millis, int tolerance); - virtual void FineTickerCancel(TickReason reason); - virtual bool SetIdle(bool on); - virtual void SetMouseCapture(bool on); - virtual bool HaveMouseCapture(); - virtual void StartDrag(); + 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 StartDrag() override; int CharacterSetOfDocument() const; const char *CharacterSetIDOfDocument() const; QString StringFromDocument(const char *s) const; QByteArray BytesForDocument(const QString &text) const; - virtual CaseFolder *CaseFolderForEncoding(); - virtual std::string CaseMapString(const std::string &s, int caseMapping); + CaseFolder *CaseFolderForEncoding() override; + std::string CaseMapString(const std::string &s, int caseMapping) override; - virtual void CreateCallTipWindow(PRectangle rc); - virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); - virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); - virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); + void CreateCallTipWindow(PRectangle rc) override; + void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override; + sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; + sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; static sptr_t DirectFunction(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam); @@ -152,7 +152,7 @@ protected: void DragLeave(); void Drop(const Point &point, const QMimeData *data, bool move); - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; private: QAbstractScrollArea *scrollArea; |