aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil Hodgson <nyamatongwe@gmail.com>2017-04-19 13:58:52 +1000
committerNeil Hodgson <nyamatongwe@gmail.com>2017-04-19 13:58:52 +1000
commite5fc6b41b3a020cf7e7d24deeb314766207ed469 (patch)
tree28e89bc60872b7a008f6170108765e17b0768967
parenta98c9ba801eae525a9f198d91340da90509af41c (diff)
downloadscintilla-mirror-e5fc6b41b3a020cf7e7d24deeb314766207ed469.tar.gz
Use "override" for implementations of CaseFolder and PerLine.
-rw-r--r--cocoa/ScintillaCocoa.mm2
-rw-r--r--src/CaseFolder.h4
-rw-r--r--src/PerLine.h30
3 files changed, 18 insertions, 18 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 9af203a18..354f22a98 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -577,7 +577,7 @@ public:
explicit CaseFolderDBCS(CFStringEncoding encoding_) : encoding(encoding_) {
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/src/CaseFolder.h b/src/CaseFolder.h
index 2d754d4f3..bdc7d3dbf 100644
--- a/src/CaseFolder.h
+++ b/src/CaseFolder.h
@@ -24,7 +24,7 @@ protected:
public:
CaseFolderTable();
virtual ~CaseFolderTable();
- 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;
void SetTranslation(char ch, char chTranslation);
void StandardASCII();
};
@@ -35,7 +35,7 @@ class CaseFolderUnicode : public CaseFolderTable {
ICaseConverter *converter;
public:
CaseFolderUnicode();
- 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;
};
#ifdef SCI_NAMESPACE
diff --git a/src/PerLine.h b/src/PerLine.h
index 9f945114a..faf4c1cd8 100644
--- a/src/PerLine.h
+++ b/src/PerLine.h
@@ -48,9 +48,9 @@ public:
LineMarkers() : handleCurrent(0) {
}
virtual ~LineMarkers();
- virtual void Init();
- virtual void InsertLine(Sci::Line line);
- virtual void RemoveLine(Sci::Line line);
+ void Init() override;
+ void InsertLine(Sci::Line line) override;
+ void RemoveLine(Sci::Line line) override;
int MarkValue(Sci::Line line);
Sci::Line MarkerNext(Sci::Line lineStart, int mask) const;
@@ -65,9 +65,9 @@ class LineLevels : public PerLine {
SplitVector<int> levels;
public:
virtual ~LineLevels();
- virtual void Init();
- virtual void InsertLine(Sci::Line line);
- virtual void RemoveLine(Sci::Line line);
+ void Init() override;
+ void InsertLine(Sci::Line line) override;
+ void RemoveLine(Sci::Line line) override;
void ExpandLevels(Sci::Line sizeNew=-1);
void ClearLevels();
@@ -81,9 +81,9 @@ public:
LineState() {
}
virtual ~LineState();
- virtual void Init();
- virtual void InsertLine(Sci::Line line);
- virtual void RemoveLine(Sci::Line line);
+ void Init() override;
+ void InsertLine(Sci::Line line) override;
+ void RemoveLine(Sci::Line line) override;
int SetLineState(Sci::Line line, int state);
int GetLineState(Sci::Line line);
@@ -96,9 +96,9 @@ public:
LineAnnotation() {
}
virtual ~LineAnnotation();
- virtual void Init();
- virtual void InsertLine(Sci::Line line);
- virtual void RemoveLine(Sci::Line line);
+ void Init() override;
+ void InsertLine(Sci::Line line) override;
+ void RemoveLine(Sci::Line line) override;
bool MultipleStyles(Sci::Line line) const;
int Style(Sci::Line line) const;
@@ -120,9 +120,9 @@ public:
LineTabstops() {
}
virtual ~LineTabstops();
- virtual void Init();
- virtual void InsertLine(Sci::Line line);
- virtual void RemoveLine(Sci::Line line);
+ void Init() override;
+ void InsertLine(Sci::Line line) override;
+ void RemoveLine(Sci::Line line) override;
bool ClearTabstops(Sci::Line line);
bool AddTabstop(Sci::Line line, int x);