diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-10-17 09:06:39 +1100 | 
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-10-17 09:06:39 +1100 | 
| commit | 2b65d913d87aa53b35e6a2626c0e542091a4bf81 (patch) | |
| tree | ca4cf34ae5cfd5eac5c7a03961e879989ed0f437 | |
| parent | 1525b912fb36d6d160dd1d3b3d2f8adb20d61d95 (diff) | |
| download | scintilla-mirror-2b65d913d87aa53b35e6a2626c0e542091a4bf81.tar.gz | |
Use nullptr and default brace initialisation for some simple cases.
| -rw-r--r-- | src/Catalogue.cxx | 4 | ||||
| -rw-r--r-- | src/Editor.cxx | 2 | ||||
| -rw-r--r-- | src/ExternalLexer.cxx | 2 | 
3 files changed, 4 insertions, 4 deletions
| diff --git a/src/Catalogue.cxx b/src/Catalogue.cxx index 979aaa1d7..55c15cca6 100644 --- a/src/Catalogue.cxx +++ b/src/Catalogue.cxx @@ -33,7 +33,7 @@ const LexerModule *Catalogue::Find(int language) {  			return lm;  		}  	} -	return 0; +	return nullptr;  }  const LexerModule *Catalogue::Find(const char *languageName) { @@ -45,7 +45,7 @@ const LexerModule *Catalogue::Find(const char *languageName) {  			}  		}  	} -	return 0; +	return nullptr;  }  void Catalogue::AddLexerModule(LexerModule *plm) { diff --git a/src/Editor.cxx b/src/Editor.cxx index 082d3d030..4163c45b2 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -91,7 +91,7 @@ static bool IsLastStep(const DocModification &mh) {  }  Timer::Timer() : -		ticking(false), ticksToWait(0), tickerID(0) {} +		ticking(false), ticksToWait(0), tickerID{} {}  Idler::Idler() :  		state(false), idlerID(0) {} diff --git a/src/ExternalLexer.cxx b/src/ExternalLexer.cxx index dd9a7179e..0326f19de 100644 --- a/src/ExternalLexer.cxx +++ b/src/ExternalLexer.cxx @@ -65,7 +65,7 @@ LexerLibrary::LexerLibrary(const char *moduleName_) {  				// Assign a buffer for the lexer name.  				char lexname[100] = "";  				GetLexerName(i, lexname, sizeof(lexname)); -				ExternalLexerModule *lex = new ExternalLexerModule(SCLEX_AUTOMATIC, NULL, lexname, NULL); +				ExternalLexerModule *lex = new ExternalLexerModule(SCLEX_AUTOMATIC, nullptr, lexname, nullptr);  				// This is storing a second reference to lex in the Catalogue as well as in modules.  				// TODO: Should use std::shared_ptr or similar to ensure allocation safety.  				Catalogue::AddLexerModule(lex); | 
