[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit e99f32de91934a3c31d903dde57103020c684af8
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      |   10 +++++-----
 src/vteinternal.hh |   43 ++++++++++++++-----------------------------
 src/vteseq.cc      |    8 ++++----
 3 files changed, 23 insertions(+), 38 deletions(-)
---
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 68582a2..37e833a 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -412,7 +412,7 @@ vte_terminal_get_property (GObject *object,
                         g_value_set_boolean (value, vte_terminal_get_audible_bell (terminal));
                         break;
                 case PROP_BACKSPACE_BINDING:
-                        g_value_set_enum (value, impl->backspace_binding);
+                        g_value_set_enum (value, impl->m_backspace_binding);
                         break;
                 case PROP_CJK_AMBIGUOUS_WIDTH:
                         g_value_set_int (value, vte_terminal_get_cjk_ambiguous_width (terminal));
@@ -430,7 +430,7 @@ vte_terminal_get_property (GObject *object,
                         g_value_set_enum (value, vte_terminal_get_cursor_shape (terminal));
                         break;
                 case PROP_DELETE_BINDING:
-                        g_value_set_enum (value, impl->delete_binding);
+                        g_value_set_enum (value, impl->m_delete_binding);
                         break;
                 case PROP_ENCODING:
                         g_value_set_string (value, vte_terminal_get_encoding (terminal));
@@ -2526,7 +2526,7 @@ gboolean
 vte_terminal_get_allow_bold(VteTerminal *terminal)
 {
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-       return IMPL(terminal)->allow_bold;
+       return IMPL(terminal)->m_allow_bold;
 }
 
 /**
@@ -2562,7 +2562,7 @@ gboolean
 vte_terminal_get_audible_bell(VteTerminal *terminal)
 {
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-       return IMPL(terminal)->audible_bell;
+       return IMPL(terminal)->m_audible_bell;
 }
 
 /**
@@ -3373,7 +3373,7 @@ gboolean
 vte_terminal_get_rewrap_on_resize(VteTerminal *terminal)
 {
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-       return IMPL(terminal)->rewrap_on_resize;
+       return IMPL(terminal)->m_rewrap_on_resize;
 }
 
 /**
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 981bc13..3539ad4 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -381,19 +381,20 @@ public:
         ClipboardTextRequestGtk<VteTerminalPrivate> m_paste_request;
 
        /* Miscellaneous options. */
-       VteEraseBinding backspace_binding, delete_binding;
-       gboolean meta_sends_escape;
-       gboolean audible_bell;
-       gboolean margin_bell;
-       guint bell_margin;
-       gboolean allow_bold;
-        gboolean deccolm_mode; /* DECCOLM allowed */
-       GHashTable *tabstops;
-       gboolean text_modified_flag;
-       gboolean text_inserted_flag;
-       gboolean text_deleted_flag;
-       gboolean rewrap_on_resize;
-       gboolean bracketed_paste_mode;
+        VteEraseBinding m_backspace_binding;
+        VteEraseBinding m_delete_binding;
+        gboolean m_meta_sends_escape;
+        gboolean m_audible_bell;
+        gboolean m_margin_bell;
+        guint m_bell_margin;
+        gboolean m_allow_bold;
+        gboolean m_deccolm_mode; /* DECCOLM allowed */
+        GHashTable *m_tabstops;
+        gboolean m_text_modified_flag;
+        gboolean m_text_inserted_flag;
+        gboolean m_text_deleted_flag;
+        gboolean m_rewrap_on_resize;
+        gboolean m_bracketed_paste_mode;
 
        /* Scrolling options. */
        gboolean scroll_background;
@@ -1261,14 +1262,8 @@ public:
 #define m_mouse_mousing_cursor mouse_mousing_cursor
 #define m_mouse_default_cursor mouse_default_cursor
 #define m_mouse_inviso_cursor mouse_inviso_cursor
-#define m_audible_bell audible_bell
-#define m_margin_bell margin_bell
-#define m_bell_margin bell_margin
 #define m_im_preedit_active im_preedit_active
 #define m_input_enabled input_enabled
-#define m_backspace_binding backspace_binding
-#define m_delete_binding delete_binding
-#define m_meta_sends_escape meta_sends_escape
 #define m_scroll_on_keystroke scroll_on_keystroke
 #define m_scroll_on_output scroll_on_output
 #define m_visibility_state visibility_state
@@ -1282,9 +1277,6 @@ public:
 #define m_fontdirty fontdirty
 #define m_contents_changed_pending contents_changed_pending
 #define m_cursor_moved_pending cursor_moved_pending
-#define m_text_modified_flag text_modified_flag
-#define m_text_inserted_flag text_inserted_flag
-#define m_text_deleted_flag text_deleted_flag
 #define m_im_preedit_active im_preedit_active
 #define m_im_preedit im_preedit
 #define m_hadjustment hadjustment
@@ -1297,11 +1289,6 @@ public:
 #define m_strikethrough_position strikethrough_position
 #define m_palette palette
 #define m_scrollback_lines scrollback_lines
-#define m_meta_sends_escape meta_sends_escape
-#define m_bell_margin bell_margin
-#define m_allow_bold allow_bold
-#define m_deccolm_mode deccolm_mode
-#define m_rewrap_on_resize rewrap_on_resize
 #define m_cursor_shape cursor_shape
 #define m_search_regex search_regex
 #define m_background_alpha background_alpha
@@ -1312,7 +1299,6 @@ public:
 #define m_fontdesc fontdesc
 #define m_search_attrs search_attrs
 #define m_adjustment_changed_pending adjustment_changed_pending
-#define m_tabstops tabstops
 #define m_window_title window_title
 #define m_window_title_changed window_title_changed
 #define m_icon_title_changed icon_title_changed
@@ -1323,7 +1309,6 @@ public:
 #define m_icon_title icon_title
 #define m_search_wrap_around search_wrap_around
 #define m_scrolling_restricted scrolling_restricted
-#define m_bracketed_paste_mode bracketed_paste_mode
 #define m_adjustment_value_changed_pending adjustment_value_changed_pending
 #define m_accessible_emit accessible_emit
 #define m_scrolling_region scrolling_region
diff --git a/src/vteseq.cc b/src/vteseq.cc
index aac0fef..c3655a5 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -666,14 +666,14 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                {35, 0, 0, 0, 0, 0, NULL, NULL,},
                /* 38: enter Tektronix mode. */
                 /* 40: Enable DECCOLM mode. */
-                {40, PRIV_OFFSET(deccolm_mode), 0, 0,
+                {40, PRIV_OFFSET(m_deccolm_mode), 0, 0,
                  FALSE,
                  TRUE,
                  NULL, NULL,},
                /* 41: more(1) fix. */
                /* 42: Enable NLS replacements. */
                /* 44: Margin bell. */
-               {44, PRIV_OFFSET(margin_bell), 0, 0,
+               {44, PRIV_OFFSET(m_margin_bell), 0, 0,
                 FALSE,
                 TRUE,
                 NULL, NULL,},
@@ -742,7 +742,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                /* 1035: disallowed, don't know what to do with it. */
                {1035, 0, 0, 0, 0, 0, NULL, NULL,},
                /* 1036: Meta-sends-escape. */
-               {1036, PRIV_OFFSET(meta_sends_escape), 0, 0,
+               {1036, PRIV_OFFSET(m_meta_sends_escape), 0, 0,
                 FALSE,
                 TRUE,
                 NULL, NULL,},
@@ -768,7 +768,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                  vte_sequence_handler_normal_screen_and_restore_cursor,
                  vte_sequence_handler_save_cursor_and_alternate_screen,},
                /* 2004: Bracketed paste mode. */
-               {2004, PRIV_OFFSET(bracketed_paste_mode), 0, 0,
+               {2004, PRIV_OFFSET(m_bracketed_paste_mode), 0, 0,
                 FALSE,
                 TRUE,
                 NULL, NULL,},