From c24110790c646f40c307c88656c3eca7ed134e01 Mon Sep 17 00:00:00 2001 From: Neil Date: Wed, 16 May 2018 16:57:48 +1000 Subject: Backport: Move implementations into cxx file. Replace 0 and NULL with nullptr. Update comments. Backport of changeset 6955:440e02c389df. --- src/Catalogue.cxx | 4 +++- src/Catalogue.h | 2 ++ src/ExternalLexer.cxx | 2 +- src/ExternalLexer.h | 8 ++++---- 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Catalogue.cxx b/src/Catalogue.cxx index 3f75096ad..d15d0572c 100644 --- a/src/Catalogue.cxx +++ b/src/Catalogue.cxx @@ -1,6 +1,8 @@ // Scintilla source code edit control /** @file Catalogue.cxx - ** Colourise for particular languages. + ** Lexer infrastructure. + ** Contains a list of LexerModules which can be searched to find a module appropriate for a + ** particular language. **/ // Copyright 1998-2002 by Neil Hodgson // The License.txt file describes the conditions under which this software may be distributed. diff --git a/src/Catalogue.h b/src/Catalogue.h index b75a59fc8..d8769a896 100644 --- a/src/Catalogue.h +++ b/src/Catalogue.h @@ -1,6 +1,8 @@ // Scintilla source code edit control /** @file Catalogue.h ** Lexer infrastructure. + ** Contains a list of LexerModules which can be searched to find a module appropriate for a + ** particular language. **/ // Copyright 1998-2010 by Neil Hodgson // The License.txt file describes the conditions under which this software may be distributed. diff --git a/src/ExternalLexer.cxx b/src/ExternalLexer.cxx index fdef2ad57..a8ed2fef5 100644 --- a/src/ExternalLexer.cxx +++ b/src/ExternalLexer.cxx @@ -1,6 +1,6 @@ // Scintilla source code edit control /** @file ExternalLexer.cxx - ** Support external lexers in DLLs. + ** Support external lexers in DLLs or shared libraries. **/ // Copyright 2001 Simon Steele , portions copyright Neil Hodgson. // The License.txt file describes the conditions under which this software may be distributed. diff --git a/src/ExternalLexer.h b/src/ExternalLexer.h index 1373c911d..ea7f20958 100644 --- a/src/ExternalLexer.h +++ b/src/ExternalLexer.h @@ -1,6 +1,6 @@ // Scintilla source code edit control /** @file ExternalLexer.h - ** Support external lexers in DLLs. + ** Support external lexers in DLLs or shared libraries. **/ // Copyright 2001 Simon Steele , portions copyright Neil Hodgson. // The License.txt file describes the conditions under which this software may be distributed. @@ -28,9 +28,9 @@ protected: std::string name; public: ExternalLexerModule(int language_, LexerFunction fnLexer_, - const char *languageName_=0, LexerFunction fnFolder_=0) : - LexerModule(language_, fnLexer_, 0, fnFolder_), - fneFactory(0), name(languageName_){ + const char *languageName_=nullptr, LexerFunction fnFolder_=nullptr) : + LexerModule(language_, fnLexer_, nullptr, fnFolder_), + fneFactory(nullptr), name(languageName_){ languageName = name.c_str(); } virtual void SetExternal(GetLexerFactoryFunction fFactory, int index); -- cgit v1.2.3