diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-03-04 10:28:39 +1100 | 
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-03-04 10:28:39 +1100 | 
| commit | c8b90797ddb85059627e95db29b59a540ea5c069 (patch) | |
| tree | 0d39a1f8c319d02a146c7a7f28d084e3cf22501f /src | |
| parent | 10066486e4403da74bc0ac4991e3942cbda9997d (diff) | |
| download | scintilla-mirror-c8b90797ddb85059627e95db29b59a540ea5c069.tar.gz | |
Use C++11 keyword "override" for methods that override a base class.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CaseConvert.cxx | 2 | ||||
| -rw-r--r-- | src/Document.cxx | 12 | ||||
| -rw-r--r-- | src/Editor.cxx | 2 | ||||
| -rw-r--r-- | src/ScintillaBase.cxx | 2 | 
4 files changed, 9 insertions, 9 deletions
| diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx index 4fb755903..d4b351783 100644 --- a/src/CaseConvert.cxx +++ b/src/CaseConvert.cxx @@ -410,7 +410,7 @@ public:  		else  			return 0;  	} -	size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed) { +	size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed) override {  		size_t lenConverted = 0;  		size_t mixedPos = 0;  		unsigned char bytes[UTF8MaxBytes + 1]; diff --git a/src/Document.cxx b/src/Document.cxx index fea4bb17a..74c152e85 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -2481,14 +2481,14 @@ class BuiltinRegex : public RegexSearchBase {  public:  	explicit BuiltinRegex(CharClassify *charClassTable) : search(charClassTable) {} -	virtual ~BuiltinRegex() { +	~BuiltinRegex() override {  	} -	virtual long FindText(Document *doc, int minPos, int maxPos, const char *s, +	long FindText(Document *doc, int minPos, int maxPos, const char *s,                          bool caseSensitive, bool word, bool wordStart, int flags, -                        int *length); +                        int *length) override; -	virtual const char *SubstituteByPosition(Document *doc, const char *text, int *length); +	const char *SubstituteByPosition(Document *doc, const char *text, int *length) override;  private:  	RESearch search; @@ -2559,10 +2559,10 @@ public:  		pdoc(pdoc_), end(end_) {  	} -	virtual ~DocumentIndexer() { +	~DocumentIndexer() override {  	} -	virtual char CharAt(int index) { +	char CharAt(int index) override {  		if (index < 0 || index >= end)  			return 0;  		else diff --git a/src/Editor.cxx b/src/Editor.cxx index 9366619ce..cee9cebd7 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -3934,7 +3934,7 @@ public:  	CaseFolderASCII() {  		StandardASCII();  	} -	~CaseFolderASCII() { +	~CaseFolderASCII() override {  	}  }; diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index ac1a46655..678dd1487 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -535,7 +535,7 @@ public:  	int lexLanguage;  	explicit LexState(Document *pdoc_); -	virtual ~LexState(); +	~LexState() override;  	void SetLexer(uptr_t wParam);  	void SetLexerLanguage(const char *languageName);  	const char *DescribeWordListSets(); | 
