[vte] widget: Move some methods to VteTerminalPrivate

[Christian Persch <chpe src gnome org>]

commit 186b4f6a56f78f915ac24d43785aa6527567471b
Author: Christian Persch <chpe gnome org>
Date:   Mon Nov 30 17:23:34 2015 +0100

    widget: Move some methods to VteTerminalPrivate

 src/vte-private.h  |    1 -
 src/vte.cc         |   10 ++++------
 src/vteinternal.hh |    2 ++
 src/vteseq.cc      |    4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/src/vte-private.h b/src/vte-private.h
index 2b9d8de..8f1ba4e 100644
--- a/src/vte-private.h
+++ b/src/vte-private.h
@@ -71,7 +71,6 @@ void _vte_terminal_restore_cursor (VteTerminal *terminal, VteScreen *screen);
 void _vte_terminal_save_cursor (VteTerminal *terminal, VteScreen *screen);
 void _vte_terminal_scroll_region(VteTerminal *terminal,
                                 long row, glong count, glong delta);
-void _vte_terminal_set_default_attributes(VteTerminal *terminal);
 void _vte_terminal_update_insert_delta(VteTerminal *terminal);
 
 void _vte_terminal_feed_focus_event(VteTerminal *terminal, gboolean in);
diff --git a/src/vte.cc b/src/vte.cc
index cea7a3b..9acfa0e 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -264,11 +264,9 @@ _vte_terminal_ring_remove (VteTerminal *terminal, glong position)
 
 /* Reset defaults for character insertion. */
 void
-_vte_terminal_set_default_attributes(VteTerminal *terminal)
+VteTerminalPrivate::reset_default_attributes()
 {
-        terminal->pvt->defaults = basic_cell.cell;
-        terminal->pvt->color_defaults = terminal->pvt->defaults;
-        terminal->pvt->fill_defaults = terminal->pvt->defaults;
+        m_defaults = m_color_defaults = m_fill_defaults = basic_cell.cell;
 }
 
 /* Height excluding padding, but including additional bottom area if not grid aligned */
@@ -8027,7 +8025,7 @@ VteTerminalPrivate::VteTerminalPrivate(VteTerminal *t) :
        _vte_ring_init (m_normal_screen.row_data, VTE_SCROLLBACK_INIT, TRUE);
        m_screen = &m_normal_screen;
 
-       _vte_terminal_set_default_attributes(m_terminal);
+       reset_default_attributes();
 
         /* Initialize charset modes. */
         m_character_replacements[0] = VTE_CHARACTER_REPLACEMENT_NONE;
@@ -10347,7 +10345,7 @@ VteTerminalPrivate::reset(bool clear_tabstops,
                m_palette[i].sources[VTE_COLOR_SOURCE_ESCAPE].is_set = FALSE;
        /* Reset the default attributes.  Reset the alternate attribute because
         * it's not a real attribute, but we need to treat it as one here. */
-       _vte_terminal_set_default_attributes(m_terminal);
+       reset_default_attributes();
         /* Reset charset modes. */
         m_character_replacements[0] = VTE_CHARACTER_REPLACEMENT_NONE;
         m_character_replacements[1] = VTE_CHARACTER_REPLACEMENT_NONE;
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index acb9e86..1afd071 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -600,6 +600,8 @@ public:
         void select_all();
         void deselect_all();
 
+        void reset_default_attributes();
+
         void ensure_font();
         void update_font();
 
diff --git a/src/vteseq.cc b/src/vteseq.cc
index bbe70c0..f852d8c 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -1999,7 +1999,7 @@ vte_sequence_handler_character_attributes (VteTerminal *terminal, GValueArray *p
                param = g_value_get_long(value);
                switch (param) {
                case 0:
-                       _vte_terminal_set_default_attributes(terminal);
+                       terminal->pvt->reset_default_attributes();
                        break;
                case 1:
                         terminal->pvt->defaults.attr.bold = 1;
@@ -2143,7 +2143,7 @@ vte_sequence_handler_character_attributes (VteTerminal *terminal, GValueArray *p
        }
        /* If we had no parameters, default to the defaults. */
        if (i == 0) {
-               _vte_terminal_set_default_attributes(terminal);
+               terminal->pvt->reset_default_attributes();
        }
        /* Save the new colors. */
         terminal->pvt->color_defaults.attr.fore =