ply-rich-text: Rename functions from ending in _init to _initialize

diff --git a/src/libply-splash-core/ply-rich-text.c b/src/libply-splash-core/ply-rich-text.c
index 83fa988e0b05fcfc34c7358b695f3a87706e6699..8e65b4248921332b8c1cc5af3c77f8ad11d29ab4 100644 (file)
--- a/src/libply-splash-core/ply-rich-text.c
+++ b/src/libply-splash-core/ply-rich-text.c
@@ -141,7 +141,7 @@ ply_rich_text_get_length (ply_rich_text_t *rich_text)
 }
 
 void
-ply_rich_text_character_style_init (ply_rich_text_character_style_t *default_style)
+ply_rich_text_character_style_initialize (ply_rich_text_character_style_t *default_style)
 {
         default_style->foreground_color = PLY_TERMINAL_COLOR_DEFAULT;
         default_style->background_color = PLY_TERMINAL_COLOR_DEFAULT;
@@ -269,9 +269,9 @@ ply_rich_text_set_character (ply_rich_text_t                *rich_text,
 }
 
 void
-ply_rich_text_iterator_init (ply_rich_text_iterator_t *iterator,
-                             ply_rich_text_t          *rich_text,
-                             ply_rich_text_span_t     *span)
+ply_rich_text_iterator_initialize (ply_rich_text_iterator_t *iterator,
+                                   ply_rich_text_t          *rich_text,
+                                   ply_rich_text_span_t     *span)
 {
         iterator->rich_text = rich_text;
         iterator->span = *span;

diff --git a/src/libply-splash-core/ply-rich-text.h b/src/libply-splash-core/ply-rich-text.h
index 0073557061bda627fe68c0ec2198503731259e94..bce267cfe2ce102a3aa3649441d1cd9872c51b6e 100644 (file)
--- a/src/libply-splash-core/ply-rich-text.h
+++ b/src/libply-splash-core/ply-rich-text.h
@@ -80,13 +80,13 @@ void ply_rich_text_remove_characters (ply_rich_text_t *rich_text);
 ply_rich_text_character_t **ply_rich_text_get_characters (ply_rich_text_t *rich_text);
 void ply_rich_text_free (ply_rich_text_t *rich_text);
 
-void ply_rich_text_character_style_init (ply_rich_text_character_style_t *default_style);
+void ply_rich_text_character_style_initialize (ply_rich_text_character_style_t *default_style);
 ply_rich_text_character_t *ply_rich_text_character_new (void);
 void ply_rich_text_character_free (ply_rich_text_character_t *character);
 
-void ply_rich_text_iterator_init (ply_rich_text_iterator_t *iterator,
-                                  ply_rich_text_t          *rich_text,
-                                  ply_rich_text_span_t     *span);
+void ply_rich_text_iterator_initialize (ply_rich_text_iterator_t *iterator,
+                                        ply_rich_text_t          *rich_text,
+                                        ply_rich_text_span_t     *span);
 bool ply_rich_text_iterator_next (ply_rich_text_iterator_t   *iterator,
                                   ply_rich_text_character_t **character);
 

diff --git a/src/libply-splash-core/ply-terminal-emulator.c b/src/libply-splash-core/ply-terminal-emulator.c
index 9dbe21ab5a9119f081948e0c884bf145d2972862..bc31d2d4757e6adc2f2eb335daf1ab4047fdb65c 100644 (file)
--- a/src/libply-splash-core/ply-terminal-emulator.c
+++ b/src/libply-splash-core/ply-terminal-emulator.c
@@ -157,7 +157,7 @@ ply_terminal_emulator_new (size_t number_of_rows,
 
         terminal_emulator->pending_commands = ply_list_new ();
 
-        ply_rich_text_character_style_init (&terminal_emulator->current_style);
+        ply_rich_text_character_style_initialize (&terminal_emulator->current_style);
 
         return terminal_emulator;
 }
@@ -208,7 +208,7 @@ fill_offsets_with_padding (ply_terminal_emulator_t *terminal_emulator,
         ssize_t bytes_to_pad = pad_stop - pad_start;
         ply_rich_text_character_style_t default_style;
 
-        ply_rich_text_character_style_init (&default_style);
+        ply_rich_text_character_style_initialize (&default_style);
 
         if (pad_start < 0 || bytes_to_pad <= 0)
                 return;
@@ -321,7 +321,7 @@ on_control_sequence_insert_blank_characters (ply_terminal_emulator_t *terminal_e
 
         fill_offsets_with_padding (terminal_emulator, string_length, new_string_length);
 
-        ply_rich_text_character_style_init (&default_style);
+        ply_rich_text_character_style_initialize (&default_style);
 
         for (int i = string_move_end_offset; i >= terminal_emulator->cursor_column; i--) {
                 ply_rich_text_move_character (terminal_emulator->current_line,
@@ -935,7 +935,7 @@ on_escape_character_tab (ply_terminal_emulator_t *terminal_emulator,
         if (new_string_length >= maximum_characters - 1)
                 new_string_length = maximum_characters - 1;
 
-        ply_rich_text_character_style_init (&default_style);
+        ply_rich_text_character_style_initialize (&default_style);
 
         for (size_t i = string_length; i < new_string_length; i++) {
                 ply_rich_text_set_character (terminal_emulator->current_line, default_style, i, " ", 1);

diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c
index dfe4f3f06e4582a498db7eaeef1c571e6e515a9a..487abcd3e54c8b47296d8420b4e4cc21b85ceee0 100644 (file)
--- a/src/plugins/controls/label-freetype/plugin.c
+++ b/src/plugins/controls/label-freetype/plugin.c
@@ -242,9 +242,9 @@ size_control (ply_label_plugin_control_t *label)
         }
 
         if (label->rich_text != NULL) {
-                ply_rich_text_iterator_init (&rich_text_iterator,
-                                             label->rich_text,
-                                             &label->span);
+                ply_rich_text_iterator_initialize (&rich_text_iterator,
+                                                   label->rich_text,
+                                                   &label->span);
         } else {
                 ply_utf8_string_iterator_init (&utf8_string_iterator,
                                                label->text,
@@ -450,9 +450,9 @@ draw_control (ply_label_plugin_control_t *label,
         slot = label->face->glyph;
 
         if (label->rich_text != NULL) {
-                ply_rich_text_iterator_init (&rich_text_iterator,
-                                             label->rich_text,
-                                             &label->span);
+                ply_rich_text_iterator_initialize (&rich_text_iterator,
+                                                   label->rich_text,
+                                                   &label->span);
         } else {
                 ply_utf8_string_iterator_init (&utf8_string_iterator,
                                                label->text,