diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-10-11 16:38:05 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-10-11 16:38:05 +1100 |
| commit | e462c018b9dda9e111a07d298bae8fcebb14c8b2 (patch) | |
| tree | 03fec25e9b83d576f73d91facdd092e4eeece597 /src/Style.cxx | |
| parent | 083b30ff1783f7b6c803d2c5489ddcd5d0dce14f (diff) | |
| download | scintilla-mirror-e462c018b9dda9e111a07d298bae8fcebb14c8b2.tar.gz | |
Backport: Replace NULL and 0 with nullptr in clear cases of pure C++ code.
Backport of changeset 7111:e3cecaf6bd37.
Diffstat (limited to 'src/Style.cxx')
| -rw-r--r-- | src/Style.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Style.cxx b/src/Style.cxx index 54f489c48..2cb82616b 100644 --- a/src/Style.cxx +++ b/src/Style.cxx @@ -76,13 +76,13 @@ void FontMeasurements::ClearMeasurements() { Style::Style() : FontSpecification() { Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff), - Platform::DefaultFontSize() * SC_FONT_SIZE_MULTIPLIER, 0, SC_CHARSET_DEFAULT, + Platform::DefaultFontSize() * SC_FONT_SIZE_MULTIPLIER, nullptr, SC_CHARSET_DEFAULT, SC_WEIGHT_NORMAL, false, false, false, caseMixed, true, true, false); } Style::Style(const Style &source) : FontSpecification(), FontMeasurements() { Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff), - 0, 0, 0, + 0, nullptr, 0, SC_WEIGHT_NORMAL, false, false, false, caseMixed, true, true, false); fore = source.fore; back = source.back; @@ -106,7 +106,7 @@ Style &Style::operator=(const Style &source) { if (this == &source) return * this; Clear(ColourDesired(0, 0, 0), ColourDesired(0xff, 0xff, 0xff), - 0, 0, SC_CHARSET_DEFAULT, + 0, nullptr, SC_CHARSET_DEFAULT, SC_WEIGHT_NORMAL, false, false, false, caseMixed, true, true, false); fore = source.fore; back = source.back; |