aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/ScintillaGTK.h74
-rw-r--r--qt/ScintillaEditBase/PlatQt.cpp50
-rw-r--r--qt/ScintillaEditBase/PlatQt.h100
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.h38
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp2
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.h60
6 files changed, 162 insertions, 162 deletions
diff --git a/gtk/ScintillaGTK.h b/gtk/ScintillaGTK.h
index d59a4ef29..37f8dca31 100644
--- a/gtk/ScintillaGTK.h
+++ b/gtk/ScintillaGTK.h
@@ -82,18 +82,18 @@ public:
static void ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class);
private:
void Init();
- virtual void Finalise();
- virtual bool AbandonPaint();
- virtual void DisplayCursor(Window::Cursor c);
- virtual bool DragThreshold(Point ptStart, Point ptNow);
- virtual void StartDrag();
+ void Finalise() override;
+ bool AbandonPaint() override;
+ void DisplayCursor(Window::Cursor c) override;
+ bool DragThreshold(Point ptStart, Point ptNow) override;
+ void StartDrag() override;
int TargetAsUTF8(char *text);
int EncodedFromUTF8(char *utf8, char *encoded) const;
- virtual bool ValidCodePage(int codePage) const;
+ bool ValidCodePage(int codePage) const override;
public: // Public for scintilla_send_message
- virtual 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;
private:
- virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+ sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override;
struct TimeThunk {
TickReason reason;
ScintillaGTK *scintilla;
@@ -101,37 +101,37 @@ private:
TimeThunk() : reason(tickCaret), scintilla(NULL), timer(0) {}
};
TimeThunk 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 bool PaintContains(PRectangle rc);
+ 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;
+ bool PaintContains(PRectangle rc) override;
void FullPaint();
- virtual PRectangle GetClientRectangle() const;
- virtual void ScrollText(Sci::Line linesToMove);
- virtual void SetVerticalScrollPos();
- virtual void SetHorizontalScrollPos();
- virtual bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage);
- void ReconfigureScrollBars();
- virtual void NotifyChange();
- virtual void NotifyFocus(bool focus);
- virtual void NotifyParent(SCNotification scn);
+ PRectangle GetClientRectangle() const override;
+ void ScrollText(Sci::Line linesToMove) override;
+ void SetVerticalScrollPos() override;
+ void SetHorizontalScrollPos() override;
+ bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) override;
+ void ReconfigureScrollBars() override;
+ void NotifyChange() override;
+ void NotifyFocus(bool focus) override;
+ void NotifyParent(SCNotification scn) override;
void NotifyKey(int key, int modifiers);
void NotifyURIDropped(const char *list);
const char *CharacterSetID() const;
- virtual CaseFolder *CaseFolderForEncoding();
- virtual std::string CaseMapString(const std::string &s, int caseMapping);
- virtual int KeyDefault(int key, int modifiers);
- virtual void CopyToClipboard(const SelectionText &selectedText);
- virtual void Copy();
- virtual void Paste();
- virtual void CreateCallTipWindow(PRectangle rc);
- virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
+ CaseFolder *CaseFolderForEncoding() override;
+ std::string CaseMapString(const std::string &s, int caseMapping) override;
+ int KeyDefault(int key, int modifiers) override;
+ void CopyToClipboard(const SelectionText &selectedText) override;
+ void Copy() override;
+ void Paste() override;
+ void CreateCallTipWindow(PRectangle rc) override;
+ void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override;
bool OwnPrimarySelection();
- virtual void ClaimSelection();
+ void ClaimSelection() override;
void GetGtkSelectionText(GtkSelectionData *selectionData, SelectionText &selText);
void ReceivedSelection(GtkSelectionData *selection_data);
void ReceivedDrop(GtkSelectionData *selection_data);
@@ -230,9 +230,9 @@ private:
static gboolean TimeOut(gpointer ptt);
static gboolean IdleCallback(gpointer pSci);
static gboolean StyleIdle(gpointer pSci);
- virtual void IdleWork();
- virtual void QueueIdleWork(WorkNeeded::workItems items, Sci::Position upTo);
- virtual void SetDocPointer(Document *document);
+ void IdleWork() override;
+ void QueueIdleWork(WorkNeeded::workItems items, Sci::Position upTo) override;
+ void SetDocPointer(Document *document) override;
static void PopUpCB(GtkMenuItem *menuItem, ScintillaGTK *sciThis);
#if GTK_CHECK_VERSION(3,0,0)
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 54355bd5c..ce44c6e2a 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -753,28 +753,28 @@ public:
ListBoxImpl();
~ListBoxImpl();
- virtual void SetFont(Font &font);
- virtual void Create(Window &parent, int ctrlID, Point location,
- int lineHeight, bool unicodeMode_, int technology);
- virtual void SetAverageCharWidth(int width);
- virtual void SetVisibleRows(int rows);
- virtual int GetVisibleRows() const;
- virtual PRectangle GetDesiredRect();
- virtual int CaretFromEdge();
- virtual void Clear();
- virtual void Append(char *s, int type = -1);
- virtual int Length();
- virtual void Select(int n);
- virtual int GetSelection();
- virtual int Find(const char *prefix);
- virtual void GetValue(int n, char *value, int len);
- virtual void RegisterImage(int type, const char *xpmData);
- virtual void RegisterRGBAImage(int type, int width, int height,
- const unsigned char *pixelsImage);
+ void SetFont(Font &font) override;
+ void Create(Window &parent, int ctrlID, Point location,
+ int lineHeight, bool unicodeMode_, int technology) override;
+ void SetAverageCharWidth(int width) override;
+ void SetVisibleRows(int rows) override;
+ int GetVisibleRows() const override;
+ PRectangle GetDesiredRect() override;
+ int CaretFromEdge() override;
+ void Clear() override;
+ void Append(char *s, int type = -1) override;
+ int Length() override;
+ void Select(int n) override;
+ int GetSelection() override;
+ int Find(const char *prefix) override;
+ void GetValue(int n, char *value, int len) override;
+ void RegisterImage(int type, const char *xpmData) override;
+ void RegisterRGBAImage(int type, int width, int height,
+ const unsigned char *pixelsImage) override;
virtual void RegisterQPixmapImage(int type, const QPixmap& pm);
- virtual void ClearRegisteredImages();
- virtual void SetDoubleClickAction(CallBackAction action, void *data);
- virtual void SetList(const char *list, char separator, char typesep);
+ void ClearRegisteredImages() override;
+ void SetDoubleClickAction(CallBackAction action, void *data) override;
+ void SetList(const char *list, char separator, char typesep) override;
private:
bool unicodeMode;
int visibleRows;
@@ -789,8 +789,8 @@ public:
void setDoubleClickAction(CallBackAction action, void *data);
protected:
- virtual void mouseDoubleClickEvent(QMouseEvent *event);
- virtual QStyleOptionViewItem viewOptions() const;
+ void mouseDoubleClickEvent(QMouseEvent *event) override;
+ QStyleOptionViewItem viewOptions() const override;
private:
CallBackAction doubleClickAction;
@@ -1128,7 +1128,7 @@ public:
lib = 0;
}
- virtual Function FindFunction(const char *name) {
+ Function FindFunction(const char *name) override {
if (lib) {
// C++ standard doesn't like casts between function pointers and void pointers so use a union
union {
@@ -1145,7 +1145,7 @@ public:
return NULL;
}
- virtual bool IsValid() {
+ bool IsValid() override {
return lib != NULL;
}
};
diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h
index 4d41425b1..907992d36 100644
--- a/qt/ScintillaEditBase/PlatQt.h
+++ b/qt/ScintillaEditBase/PlatQt.h
@@ -65,56 +65,56 @@ public:
SurfaceImpl();
virtual ~SurfaceImpl();
- virtual void Init(WindowID wid);
- virtual void Init(SurfaceID sid, WindowID wid);
- virtual void InitPixMap(int width, int height,
- Surface *surface, WindowID wid);
-
- virtual void Release();
- virtual bool Initialised();
- virtual void PenColour(ColourDesired fore);
- virtual int LogPixelsY();
- virtual int DeviceHeightFont(int points);
- virtual void MoveTo(int x_, int y_);
- virtual void LineTo(int x_, int y_);
- virtual void Polygon(Point *pts, int npts, ColourDesired fore,
- ColourDesired back);
- virtual void RectangleDraw(PRectangle rc, ColourDesired fore,
- ColourDesired back);
- virtual void FillRectangle(PRectangle rc, ColourDesired back);
- virtual void FillRectangle(PRectangle rc, Surface &surfacePattern);
- virtual void RoundedRectangle(PRectangle rc, ColourDesired fore,
- ColourDesired back);
- virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill,
- int alphaFill, ColourDesired outline, int alphaOutline, int flags);
- virtual void DrawRGBAImage(PRectangle rc, int width, int height,
- const unsigned char *pixelsImage);
- virtual void Ellipse(PRectangle rc, ColourDesired fore,
- ColourDesired back);
- virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource);
-
- virtual void DrawTextNoClip(PRectangle rc, Font &font, XYPOSITION ybase,
- const char *s, int len, ColourDesired fore, ColourDesired back);
- virtual void DrawTextClipped(PRectangle rc, Font &font, XYPOSITION ybase,
- const char *s, int len, ColourDesired fore, ColourDesired back);
- virtual void DrawTextTransparent(PRectangle rc, Font &font, XYPOSITION ybase,
- const char *s, int len, ColourDesired fore);
- virtual void MeasureWidths(Font &font, const char *s, int len,
- XYPOSITION *positions);
- virtual XYPOSITION WidthText(Font &font, const char *s, int len);
- virtual XYPOSITION WidthChar(Font &font, char ch);
- virtual XYPOSITION Ascent(Font &font);
- virtual XYPOSITION Descent(Font &font);
- virtual XYPOSITION InternalLeading(Font &font);
- virtual XYPOSITION ExternalLeading(Font &font);
- virtual XYPOSITION Height(Font &font);
- virtual XYPOSITION AverageCharWidth(Font &font);
-
- virtual void SetClip(PRectangle rc);
- virtual void FlushCachedState();
-
- virtual void SetUnicodeMode(bool unicodeMode_);
- virtual void SetDBCSMode(int codePage_);
+ void Init(WindowID wid) override;
+ void Init(SurfaceID sid, WindowID wid) override;
+ void InitPixMap(int width, int height,
+ Surface *surface, WindowID wid) override;
+
+ void Release() override;
+ bool Initialised() override;
+ void PenColour(ColourDesired fore) override;
+ int LogPixelsY() override;
+ int DeviceHeightFont(int points) override;
+ void MoveTo(int x_, int y_) override;
+ void LineTo(int x_, int y_) override;
+ void Polygon(Point *pts, int npts, ColourDesired fore,
+ ColourDesired back) override;
+ void RectangleDraw(PRectangle rc, ColourDesired fore,
+ ColourDesired back) override;
+ void FillRectangle(PRectangle rc, ColourDesired back) override;
+ void FillRectangle(PRectangle rc, Surface &surfacePattern) override;
+ void RoundedRectangle(PRectangle rc, ColourDesired fore,
+ ColourDesired back) override;
+ void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill,
+ int alphaFill, ColourDesired outline, int alphaOutline, int flags) override;
+ void DrawRGBAImage(PRectangle rc, int width, int height,
+ const unsigned char *pixelsImage) override;
+ void Ellipse(PRectangle rc, ColourDesired fore,
+ ColourDesired back) override;
+ void Copy(PRectangle rc, Point from, Surface &surfaceSource) override;
+
+ void DrawTextNoClip(PRectangle rc, Font &font, XYPOSITION ybase,
+ const char *s, int len, ColourDesired fore, ColourDesired back) override;
+ void DrawTextClipped(PRectangle rc, Font &font, XYPOSITION ybase,
+ const char *s, int len, ColourDesired fore, ColourDesired back) override;
+ void DrawTextTransparent(PRectangle rc, Font &font, XYPOSITION ybase,
+ const char *s, int len, ColourDesired fore) override;
+ void MeasureWidths(Font &font, const char *s, int len,
+ XYPOSITION *positions) override;
+ XYPOSITION WidthText(Font &font, const char *s, int len) override;
+ XYPOSITION WidthChar(Font &font, char ch) override;
+ XYPOSITION Ascent(Font &font) override;
+ XYPOSITION Descent(Font &font) override;
+ XYPOSITION InternalLeading(Font &font) override;
+ XYPOSITION ExternalLeading(Font &font) override;
+ XYPOSITION Height(Font &font) override;
+ XYPOSITION AverageCharWidth(Font &font) override;
+
+ void SetClip(PRectangle rc) override;
+ void FlushCachedState() override;
+
+ void SetUnicodeMode(bool unicodeMode_) override;
+ void SetDBCSMode(int codePage_) override;
void BrushColour(ColourDesired back);
void SetCodec(Font &font);
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h
index 7c52e5690..9490e8712 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.h
+++ b/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -114,25 +114,25 @@ signals:
void resized();
protected:
- virtual bool event(QEvent *event);
- virtual void paintEvent(QPaintEvent *event);
- virtual void wheelEvent(QWheelEvent *event);
- virtual void focusInEvent(QFocusEvent *event);
- virtual void focusOutEvent(QFocusEvent *event);
- virtual void resizeEvent(QResizeEvent *event);
- virtual void keyPressEvent(QKeyEvent *event);
- virtual void mousePressEvent(QMouseEvent *event);
- virtual void mouseReleaseEvent(QMouseEvent *event);
- virtual void mouseDoubleClickEvent(QMouseEvent *event);
- virtual void mouseMoveEvent(QMouseEvent *event);
- virtual void contextMenuEvent(QContextMenuEvent *event);
- virtual void dragEnterEvent(QDragEnterEvent *event);
- virtual void dragLeaveEvent(QDragLeaveEvent *event);
- virtual void dragMoveEvent(QDragMoveEvent *event);
- virtual void dropEvent(QDropEvent *event);
- virtual void inputMethodEvent(QInputMethodEvent *event);
- virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
- virtual void scrollContentsBy(int, int) {}
+ bool event(QEvent *event) override;
+ void paintEvent(QPaintEvent *event) override;
+ void wheelEvent(QWheelEvent *event) override;
+ void focusInEvent(QFocusEvent *event) override;
+ void focusOutEvent(QFocusEvent *event) override;
+ void resizeEvent(QResizeEvent *event) override;
+ void keyPressEvent(QKeyEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *event) override;
+ void mouseDoubleClickEvent(QMouseEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void contextMenuEvent(QContextMenuEvent *event) override;
+ void dragEnterEvent(QDragEnterEvent *event) override;
+ void dragLeaveEvent(QDragLeaveEvent *event) override;
+ void dragMoveEvent(QDragMoveEvent *event) override;
+ void dropEvent(QDropEvent *event) override;
+ void inputMethodEvent(QInputMethodEvent *event) override;
+ QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
+ void scrollContentsBy(int, int) override {}
private:
ScintillaQt *sqt;
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index afa19e5a5..cab44ea86 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -501,7 +501,7 @@ public:
explicit CaseFolderDBCS(QTextCodec *codec_) : codec(codec_) {
StandardASCII();
}
- virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) {
+ size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override {
if ((lenMixed == 1) && (sizeFolded > 0)) {
folded[0] = mapping[static_cast<unsigned char>(mixed[0])];
return 1;
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 21:15:11 +0000