walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use C++11 override keyword.

This commit is contained in:
Bruce Mitchener 2019-06-03 22:31:50 +07:00 committed by Behdad Esfahbod
parent 2e16593b70
commit 659eeddb2d
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

30
util/options.hh
View File

@ -129,13 +129,13 @@ struct view_options_t : option_group_t
add_options (parser);
}
virtual ~view_options_t ()
~view_options_t () override
{
g_free (fore);
g_free (back);
}
void add_options (option_parser_t *parser);
void add_options (option_parser_t *parser) override;
hb_bool_t annotate;
char *fore;
@ -165,7 +165,7 @@ struct shape_options_t : option_group_t
add_options (parser);
}
virtual ~shape_options_t ()
~shape_options_t () override
{
g_free (direction);
g_free (language);
@ -174,7 +174,7 @@ struct shape_options_t : option_group_t
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)
{
@ -471,7 +471,7 @@ struct font_options_t : option_group_t
add_options (parser);
}
virtual ~font_options_t ()
~font_options_t () override
{
g_free (font_file);
free (variations);
@ -479,7 +479,7 @@ struct font_options_t : option_group_t
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;
@ -521,7 +521,7 @@ struct text_options_t : option_group_t
add_options (parser);
}
virtual ~text_options_t ()
~text_options_t () override
{
g_free (text_before);
g_free (text_after);
@ -533,9 +533,9 @@ struct text_options_t : option_group_t
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)
g_set_error (error,
G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
@ -572,7 +572,7 @@ struct output_options_t : option_group_t
add_options (parser);
}
virtual ~output_options_t ()
~output_options_t () override
{
g_free (output_file);
g_free (output_format);
@ -580,9 +580,9 @@ struct output_options_t : option_group_t
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)
explicit_output_format = true;
@ -627,7 +627,7 @@ struct format_options_t : option_group_t
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,
GString *gs);
@ -678,12 +678,12 @@ struct subset_options_t : option_group_t
add_options (parser);
}
virtual ~subset_options_t ()
~subset_options_t () override
{
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;
};