[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit ed3a4550bdc3d730c7a75d9eb45a575c93f79ca0
Author: Christian Persch <chpe gnome org>
Date:   Sun Jan 31 18:53:13 2016 +0100

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

 src/vteinternal.hh |   13 ++++---------
 src/vteseq.cc      |   10 +++++-----
 2 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 16fd7a7..3f068c4 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -289,11 +289,11 @@ public:
         vte::grid::column_t m_column_count;
 
        /* Emulation setup data. */
-       struct _vte_matcher *matcher;   /* control sequence matcher */
-        gboolean autowrap;              /* auto wraparound at right margin */
-       int keypad_mode, cursor_mode;   /* these would be VteKeymodes, but we
+        struct _vte_matcher *m_matcher;   /* control sequence matcher */
+        gboolean m_autowrap;              /* auto wraparound at right margin */
+        int m_keypad_mode, m_cursor_mode; /* these would be VteKeymodes, but we
                                           need to guarantee its type */
-       GHashTable *dec_saved;
+        GHashTable *m_dec_saved;
 
        /* PTY handling data. */
        VtePty *pty;
@@ -1276,8 +1276,6 @@ public:
 #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_cursor_mode cursor_mode
-#define m_keypad_mode keypad_mode
 #define m_has_selection has_selection
 #define m_selecting_restart selecting_restart
 #define m_selecting_after_threshold selecting_after_threshold
@@ -1317,10 +1315,7 @@ public:
 #define m_outgoing outgoing
 #define m_outgoing_conv outgoing_conv
 #define m_conv_buffer conv_buffer
-#define m_autowrap autowrap
 #define m_sendrecv_mode sendrecv_mode
-#define m_dec_saved dec_saved
-#define m_matcher matcher
 #define m_pty_input_source pty_input_source
 #define m_pty_output_source pty_output_source
 #define m_pty_pid pty_pid
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 4891c1c..1f20c12 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -616,7 +616,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
 #define PRIV_OFFSET(member) (G_STRUCT_OFFSET(VteTerminalPrivate, member))
 #define SCREEN_OFFSET(member) (-G_STRUCT_OFFSET(VteScreen, member))
                /* 1: Application/normal cursor keys. */
-               {1, 0, PRIV_OFFSET(cursor_mode), 0,
+               {1, 0, PRIV_OFFSET(m_cursor_mode), 0,
                 VTE_KEYMODE_NORMAL,
                 VTE_KEYMODE_APPLICATION,
                 NULL, NULL,},
@@ -639,7 +639,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                 TRUE,
                 NULL, NULL,},
                /* 7: Wraparound mode. */
-                {7, PRIV_OFFSET(autowrap), 0, 0,
+                {7, PRIV_OFFSET(m_autowrap), 0, 0,
                 FALSE,
                 TRUE,
                 NULL, NULL,},
@@ -684,7 +684,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                  vte_sequence_handler_normal_screen,
                  vte_sequence_handler_alternate_screen,},
                /* 66: Keypad mode. */
-               {66, PRIV_OFFSET(keypad_mode), 0, 0,
+               {66, PRIV_OFFSET(m_keypad_mode), 0, 0,
                 VTE_KEYMODE_NORMAL,
                 VTE_KEYMODE_APPLICATION,
                 NULL, NULL,},
@@ -818,7 +818,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
 
                /* Read the old setting. */
                if (restore) {
-                       p = g_hash_table_lookup(that->dec_saved,
+                       p = g_hash_table_lookup(that->m_dec_saved,
                                                GINT_TO_POINTER(setting));
                        set = (p != NULL);
                        _vte_debug_print(VTE_DEBUG_PARSE,
@@ -839,7 +839,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                        _vte_debug_print(VTE_DEBUG_PARSE,
                                        "Setting %d is %s, saving.\n",
                                        setting, set ? "set" : "unset");
-                       g_hash_table_insert(that->dec_saved,
+                       g_hash_table_insert(that->m_dec_saved,
                                            GINT_TO_POINTER(setting),
                                            GINT_TO_POINTER(set));
                }