[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit 0aef3e33170a2ff4cb13e985e6842818f8b02c91
Author: Christian Persch <chpe gnome org>
Date:   Sun Jan 31 18:53:14 2016 +0100

    widget: Rename instance members
    
    Now that all of VteTerminalPrivate is ported over, remove the #define
    and just rename the member variable.

 src/vtegtk.cc      |    6 +++---
 src/vteinternal.hh |   19 ++++++-------------
 src/vteseq.cc      |    2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)
---
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 37e833a..13d2897 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -457,13 +457,13 @@ vte_terminal_get_property (GObject *object,
                         g_value_set_boolean (value, vte_terminal_get_rewrap_on_resize (terminal));
                         break;
                 case PROP_SCROLLBACK_LINES:
-                        g_value_set_uint (value, impl->scrollback_lines);
+                        g_value_set_uint (value, impl->m_scrollback_lines);
                         break;
                 case PROP_SCROLL_ON_KEYSTROKE:
-                        g_value_set_boolean (value, impl->scroll_on_keystroke);
+                        g_value_set_boolean (value, impl->m_scroll_on_keystroke);
                         break;
                 case PROP_SCROLL_ON_OUTPUT:
-                        g_value_set_boolean (value, impl->scroll_on_output);
+                        g_value_set_boolean (value, impl->m_scroll_on_output);
                         break;
                 case PROP_WINDOW_TITLE:
                         g_value_set_string (value, vte_terminal_get_window_title (terminal));
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 3539ad4..de3fee4 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -397,15 +397,14 @@ public:
         gboolean m_bracketed_paste_mode;
 
        /* Scrolling options. */
-       gboolean scroll_background;
-       gboolean scroll_on_output;
-       gboolean scroll_on_keystroke;
-       gboolean alternate_screen_scroll;
-       long scrollback_lines;
+        gboolean m_scroll_on_output;
+        gboolean m_scroll_on_keystroke;
+        gboolean m_alternate_screen_scroll;
+        vte::grid::row_t m_scrollback_lines;
 
         /* Restricted scrolling */
-        struct vte_scrolling_region scrolling_region;     /* the region we scroll in */
-        gboolean scrolling_restricted;
+        struct vte_scrolling_region m_scrolling_region;     /* the region we scroll in */
+        gboolean m_scrolling_restricted;
 
        /* Cursor shape, as set via API */
        VteCursorShape cursor_shape;
@@ -1264,12 +1263,9 @@ public:
 #define m_mouse_inviso_cursor mouse_inviso_cursor
 #define m_im_preedit_active im_preedit_active
 #define m_input_enabled input_enabled
-#define m_scroll_on_keystroke scroll_on_keystroke
-#define m_scroll_on_output scroll_on_output
 #define m_visibility_state visibility_state
 #define m_mouse_smooth_scroll_delta mouse_smooth_scroll_delta
 #define m_vadjustment vadjustment
-#define m_alternate_screen_scroll alternate_screen_scroll
 #define m_draw draw
 #define m_im_preedit_string im_preedit_string
 #define m_im_preedit_attrs im_preedit_attrs
@@ -1288,7 +1284,6 @@ public:
 #define m_underline_position underline_position
 #define m_strikethrough_position strikethrough_position
 #define m_palette palette
-#define m_scrollback_lines scrollback_lines
 #define m_cursor_shape cursor_shape
 #define m_search_regex search_regex
 #define m_background_alpha background_alpha
@@ -1308,9 +1303,7 @@ public:
 #define m_current_file_uri current_file_uri
 #define m_icon_title icon_title
 #define m_search_wrap_around search_wrap_around
-#define m_scrolling_restricted scrolling_restricted
 #define m_adjustment_value_changed_pending adjustment_value_changed_pending
 #define m_accessible_emit accessible_emit
-#define m_scrolling_region scrolling_region
 
 extern GTimer *process_timer;
diff --git a/src/vteseq.cc b/src/vteseq.cc
index c3655a5..307b254 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -726,7 +726,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                 TRUE,
                 NULL, NULL,},
                /* 1007: Alternate screen scroll. */
-               {1007, PRIV_OFFSET(alternate_screen_scroll), 0, 0,
+               {1007, PRIV_OFFSET(m_alternate_screen_scroll), 0, 0,
                 FALSE,
                 TRUE,
                 NULL, NULL,},