diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-05-14 15:34:02 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-05-14 15:34:02 +1000 |
| commit | bdb6763e14287aed0ded6d347ce45f0343f84ac8 (patch) | |
| tree | 85f1407d897b8bf7004edfa1853ff008d16462d4 | |
| parent | 3925ab4bfc2179983520713f67b820adfdd642a9 (diff) | |
| download | scintilla-mirror-bdb6763e14287aed0ded6d347ce45f0343f84ac8.tar.gz | |
Backport: Replace 0 with nullptr.
Backport of changeset 6945:044688817478.
| -rw-r--r-- | src/CellBuffer.h | 2 | ||||
| -rw-r--r-- | src/Document.h | 8 | ||||
| -rw-r--r-- | src/Style.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/CellBuffer.h b/src/CellBuffer.h index a98d9abcb..838968ec7 100644 --- a/src/CellBuffer.h +++ b/src/CellBuffer.h @@ -45,7 +45,7 @@ public: // Move constructor allows vector to be resized without reallocating. Action(Action &&other) noexcept = default; ~Action(); - void Create(actionType at_, Sci::Position position_=0, const char *data_=0, Sci::Position lenData_=0, bool mayCoalesce_=true); + void Create(actionType at_, Sci::Position position_=0, const char *data_=nullptr, Sci::Position lenData_=0, bool mayCoalesce_=true); void Clear(); }; diff --git a/src/Document.h b/src/Document.h index 9bfc0983f..b4639a9c2 100644 --- a/src/Document.h +++ b/src/Document.h @@ -174,14 +174,14 @@ protected: ILexer *instance; bool performingStyle; ///< Prevent reentrance public: - explicit LexInterface(Document *pdoc_) : pdoc(pdoc_), instance(0), performingStyle(false) { + explicit LexInterface(Document *pdoc_) : pdoc(pdoc_), instance(nullptr), performingStyle(false) { } virtual ~LexInterface() { } void Colourise(Sci::Position start, Sci::Position end); virtual int LineEndTypesSupported(); bool UseContainerLexing() const { - return instance == 0; + return instance == nullptr; } }; @@ -198,7 +198,7 @@ public: struct WatcherWithUserData { DocWatcher *watcher; void *userData; - WatcherWithUserData(DocWatcher *watcher_=0, void *userData_=0) : + WatcherWithUserData(DocWatcher *watcher_=nullptr, void *userData_=nullptr) : watcher(watcher_), userData(userData_) { } bool operator==(const WatcherWithUserData &other) const { @@ -509,7 +509,7 @@ public: Sci::Position token; DocModification(int modificationType_, Sci::Position position_=0, Sci::Position length_=0, - Sci::Line linesAdded_=0, const char *text_=0, Sci::Line line_=0) : + Sci::Line linesAdded_=0, const char *text_=nullptr, Sci::Line line_=0) : modificationType(modificationType_), position(position_), length(length_), diff --git a/src/Style.h b/src/Style.h index 58cc3cd82..441d0150a 100644 --- a/src/Style.h +++ b/src/Style.h @@ -18,7 +18,7 @@ struct FontSpecification { int characterSet; int extraFontFlag; FontSpecification() : - fontName(0), + fontName(nullptr), weight(SC_WEIGHT_NORMAL), italic(false), size(10 * SC_FONT_SIZE_MULTIPLIER), |