Chiebot-Mirror
/
harfbuzz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use C++11 override keyword.

Browse Source
pull/1756/head
Bruce Mitchener 6 years ago committed by Behdad Esfahbod
parent 2e16593b70
commit 659eeddb2d
2 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      util/hb-ot-shape-closure.cc
  2. 30
      util/options.hh

2
util/hb-ot-shape-closure.cc
Unescape View File

@ -39,7 +39,7 @@ struct shape_closure_consumer_t : option_group_t
add_options (parser); add_options (parser);
} }
void add_options (struct option_parser_t *parser) void add_options (struct option_parser_t *parser) override
{ {
GOptionEntry entries[] = GOptionEntry entries[] =
{ {

30
util/options.hh
Unescape View File

@ -129,13 +129,13 @@ struct view_options_t : option_group_t
add_options (parser); add_options (parser);
} }
virtual ~view_options_t () ~view_options_t () override
{ {
g_free (fore); g_free (fore);
g_free (back); g_free (back);
} }
void add_options (option_parser_t *parser); void add_options (option_parser_t *parser) override;
hb_bool_t annotate; hb_bool_t annotate;
char *fore; char *fore;
@ -165,7 +165,7 @@ struct shape_options_t : option_group_t
add_options (parser); add_options (parser);
} }
virtual ~shape_options_t () ~shape_options_t () override
{ {
g_free (direction); g_free (direction);
g_free (language); g_free (language);
@ -174,7 +174,7 @@ struct shape_options_t : option_group_t
g_strfreev (shapers); g_strfreev (shapers);
} }
void add_options (option_parser_t *parser); void add_options (option_parser_t *parser) override;
void setup_buffer (hb_buffer_t *buffer) void setup_buffer (hb_buffer_t *buffer)
{ {
@ -471,7 +471,7 @@ struct font_options_t : option_group_t
add_options (parser); add_options (parser);
} }
virtual ~font_options_t () ~font_options_t () override
{ {
g_free (font_file); g_free (font_file);
free (variations); free (variations);
@ -479,7 +479,7 @@ struct font_options_t : option_group_t
hb_font_destroy (font); hb_font_destroy (font);
} }
void add_options (option_parser_t *parser); void add_options (option_parser_t *parser) override;
hb_font_t *get_font () const; hb_font_t *get_font () const;
@ -521,7 +521,7 @@ struct text_options_t : option_group_t
add_options (parser); add_options (parser);
} }
virtual ~text_options_t () ~text_options_t () override
{ {
g_free (text_before); g_free (text_before);
g_free (text_after); g_free (text_after);
@ -533,9 +533,9 @@ struct text_options_t : option_group_t
fclose (fp); fclose (fp);
} }
void add_options (option_parser_t *parser); void add_options (option_parser_t *parser) override;
void post_parse (GError **error G_GNUC_UNUSED) { void post_parse (GError **error G_GNUC_UNUSED) override {
if (text && text_file) if (text && text_file)
g_set_error (error, g_set_error (error,
G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
@ -572,7 +572,7 @@ struct output_options_t : option_group_t
add_options (parser); add_options (parser);
} }
virtual ~output_options_t () ~output_options_t () override
{ {
g_free (output_file); g_free (output_file);
g_free (output_format); g_free (output_format);
@ -580,9 +580,9 @@ struct output_options_t : option_group_t
fclose (fp); fclose (fp);
} }
void add_options (option_parser_t *parser); void add_options (option_parser_t *parser) override;
void post_parse (GError **error G_GNUC_UNUSED) void post_parse (GError **error G_GNUC_UNUSED) override
{ {
if (output_format) if (output_format)
explicit_output_format = true; explicit_output_format = true;
@ -627,7 +627,7 @@ struct format_options_t : option_group_t
add_options (parser); add_options (parser);
} }
void add_options (option_parser_t *parser); void add_options (option_parser_t *parser) override;
void serialize_unicode (hb_buffer_t *buffer, void serialize_unicode (hb_buffer_t *buffer,
GString *gs); GString *gs);
@ -678,12 +678,12 @@ struct subset_options_t : option_group_t
add_options (parser); add_options (parser);
} }
virtual ~subset_options_t () ~subset_options_t () override
{ {
hb_subset_input_destroy (input); hb_subset_input_destroy (input);
} }
void add_options (option_parser_t *parser); void add_options (option_parser_t *parser) override;
hb_subset_input_t *input; hb_subset_input_t *input;
}; };

Write Preview
Loading…
Cancel
Save