bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Use nullptr

Browse Source
This commit is contained in:
Scott Lahteine 2020-11-06 20:16:30 -06:00
parent 0a64f197d9
commit 97d7af7a23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
View File

@ -435,7 +435,7 @@
base_char = base_special ? NO_DOT_I : std_char; base_char = base_special ? NO_DOT_I : std_char;
} }
// If cmd != NULL, draw the glyph to the screen // If cmd != nullptr, draw the glyph to the screen
if (cmd) { if (cmd) {
ext_vertex2ii(*cmd, x, y, base_special ? alt_font : std_font, base_char); ext_vertex2ii(*cmd, x, y, base_special ? alt_font : std_font, base_char);
if (accent_char) if (accent_char)

4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
View File

@ -90,7 +90,7 @@ class PolyReader {
if (start_x != eol) if (start_x != eol)
close_loop(); close_loop();
else else
p = NULL; p = nullptr;
} }
else { else {
x = pgm_read_word_far(p++); x = pgm_read_word_far(p++);
@ -106,7 +106,7 @@ class PolyReader {
} }
} }
bool has_more() { return p != NULL; } bool has_more() { return p != nullptr; }
bool end_of_loop() { return start_x == eol; } bool end_of_loop() { return start_x == eol; }
}; };

14
Marlin/src/lcd/tft/tft_string.h
View File

@ -80,22 +80,22 @@ class TFT_String {
static font_t *font() { return font_header; }; static font_t *font() { return font_header; };
static uint16_t font_height() { return font_header->FontAscent - font_header->FontDescent; } static uint16_t font_height() { return font_header->FontAscent - font_header->FontDescent; }
static glyph_t *glyph(uint8_t character) { return glyphs[character] == NULL ? glyphs[0x3F] : glyphs[character]; } /* Use '?' for unknown glyphs */ static glyph_t *glyph(uint8_t character) { return glyphs[character] ?: glyphs[0x3F]; } /* Use '?' for unknown glyphs */
static inline glyph_t *glyph(uint8_t *character) { return glyph(*character); } static inline glyph_t *glyph(uint8_t *character) { return glyph(*character); }
static void set(); static void set();
static void add(uint8_t character) { add_character(character); eol(); } static void add(uint8_t character) { add_character(character); eol(); }
static void add(uint8_t *string); static void add(uint8_t *string);
static void add(uint8_t *string, int8_t index, uint8_t *itemString = NULL); static void add(uint8_t *string, int8_t index, uint8_t *itemString=nullptr);
static void set(uint8_t *string) { set(); add(string); }; static void set(uint8_t *string) { set(); add(string); };
static void set(uint8_t *string, int8_t index, const char *itemString = NULL) { set(); add(string, index, (uint8_t *)itemString); }; static void set(uint8_t *string, int8_t index, const char *itemString=nullptr) { set(); add(string, index, (uint8_t *)itemString); };
static inline void set(const char *string) { set((uint8_t *)string); } static inline void set(const char *string) { set((uint8_t *)string); }
static inline void set(const char *string, int8_t index, const char *itemString = NULL) { set((uint8_t *)string, index, itemString); } static inline void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
static inline void add(const char *string) { add((uint8_t *)string); } static inline void add(const char *string) { add((uint8_t *)string); }
static void trim(uint8_t character = 0x20); static void trim(uint8_t character=0x20);
static void rtrim(uint8_t character = 0x20); static void rtrim(uint8_t character=0x20);
static void ltrim(uint8_t character = 0x20); static void ltrim(uint8_t character=0x20);
static uint16_t width() { return span; } static uint16_t width() { return span; }
static uint8_t *string() { return data; } static uint8_t *string() { return data; }
static uint16_t center(uint16_t width) { return span > width ? 0 : (width - span) / 2; } static uint16_t center(uint16_t width) { return span > width ? 0 : (width - span) / 2; }