[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit 412aecfb230d7cceedabd6532980b53e73114643
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/vte.cc         |    2 +-
 src/vtegtk.cc      |    4 ++--
 src/vteinternal.hh |   45 ++++++++++++++++-----------------------------
 src/vteseq.cc      |   16 ++++++++--------
 4 files changed, 27 insertions(+), 40 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 936d854..d10bb91 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -7245,7 +7245,7 @@ VteTerminalPrivate::widget_button_press(GdkEventButton *event)
                                                 selection_type_char);
                                handled = true;
                        }
-                        if ((mouse_handled_buttons & 1) != 0) {
+                        if ((m_mouse_handled_buttons & 1) != 0) {
                                start_selection(pos.x, pos.y,
                                                 selection_type_word);
                                handled = true;
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 7f0d6bb..0d9b9f7 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -3262,7 +3262,7 @@ vte_terminal_get_input_enabled (VteTerminal *terminal)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
 
-        return IMPL(terminal)->input_enabled;
+        return IMPL(terminal)->m_input_enabled;
 }
 
 /**
@@ -3299,7 +3299,7 @@ gboolean
 vte_terminal_get_mouse_autohide(VteTerminal *terminal)
 {
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-       return IMPL(terminal)->mouse_autohide;
+       return IMPL(terminal)->m_mouse_autohide;
 }
 
 /**
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 1c01793..8c04690 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -426,25 +426,25 @@ public:
         VteCursorStyle m_cursor_style;
 
        /* Input device options. */
-        gboolean input_enabled;
-       time_t last_keypress_time;
+        gboolean m_input_enabled;
+        time_t m_last_keypress_time;
 
-       int mouse_tracking_mode; /* this is of type MouseTrackingMode,
-                                   but we need to guarantee its type. */
-        guint mouse_pressed_buttons;      /* bits 0, 1, 2 resp. for buttons 1, 2, 3 */
-        guint mouse_handled_buttons;      /* similar bitmap for buttons we handled ourselves */
+        int m_mouse_tracking_mode; /* this is of type MouseTrackingMode,
+                                      but we need to guarantee its type. */
+        guint m_mouse_pressed_buttons;      /* bits 0, 1, 2 resp. for buttons 1, 2, 3 */
+        guint m_mouse_handled_buttons;      /* similar bitmap for buttons we handled ourselves */
         /* The last known position the mouse pointer from an event. We don't store
          * this in grid coordinates because we want also to check if they were outside
          * the viewable area.
          */
         vte::view::coords m_mouse_last_position;
-       gboolean mouse_autohide;
-       guint m_mouse_autoscroll_tag;
-       gboolean mouse_xterm_extension;
-       gboolean mouse_urxvt_extension;
-       double mouse_smooth_scroll_delta;
+        gboolean m_mouse_autohide;
+        guint m_mouse_autoscroll_tag;
+        gboolean m_mouse_xterm_extension;
+        gboolean m_mouse_urxvt_extension;
+        double m_mouse_smooth_scroll_delta;
 
-        gboolean focus_tracking_mode;
+        gboolean m_focus_tracking_mode;
 
        /* State variables for handling match checks. */
        char *match_contents;
@@ -489,10 +489,10 @@ public:
        VtePaletteColor palette[VTE_PALETTE_SIZE];
 
        /* Mouse cursors. */
-       gboolean mouse_cursor_visible;
-       GdkCursor *mouse_default_cursor,
-                 *mouse_mousing_cursor,
-                 *mouse_inviso_cursor;
+        gboolean m_mouse_cursor_visible;
+        GdkCursor* m_mouse_default_cursor;
+        GdkCursor* m_mouse_mousing_cursor;
+       GdkCursor* m_mouse_inviso_cursor;
 
        /* Input method support. */
        GtkIMContext *im_context;
@@ -1237,25 +1237,12 @@ public:
 #define m_match_attributes match_attributes
 #define m_match_contents match_contents
 #define m_match_regex_mode match_regex_mode
-#define m_mouse_tracking_mode mouse_tracking_mode
-#define m_mouse_pressed_buttons mouse_pressed_buttons
-#define m_mouse_xterm_extension mouse_xterm_extension
-#define m_mouse_urxvt_extension mouse_urxvt_extension
 #define m_modifiers modifiers
-#define m_focus_tracking_mode focus_tracking_mode
 #define m_match_tag match_tag
 #define m_match match
 #define m_im_context im_context
-#define m_mouse_cursor_visible mouse_cursor_visible
-#define m_mouse_handled_buttons mouse_handled_buttons
-#define m_mouse_autohide mouse_autohide
-#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_im_preedit_active im_preedit_active
-#define m_input_enabled input_enabled
 #define m_visibility_state visibility_state
-#define m_mouse_smooth_scroll_delta mouse_smooth_scroll_delta
 #define m_vadjustment vadjustment
 #define m_draw draw
 #define m_im_preedit_string im_preedit_string
diff --git a/src/vteseq.cc b/src/vteseq.cc
index c483d97..0b61f6e 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -646,7 +646,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                /* 8: disallowed, keyboard repeat is set by user. */
                {8, 0, 0, 0, 0, 0, NULL, NULL,},
                /* 9: Send-coords-on-click. */
-               {9, 0, PRIV_OFFSET(mouse_tracking_mode), 0,
+               {9, 0, PRIV_OFFSET(m_mouse_tracking_mode), 0,
                 0,
                 MOUSE_TRACKING_SEND_XY_ON_CLICK,
                 vte_reset_mouse_smooth_scroll_delta,
@@ -691,37 +691,37 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                /* 67: disallowed, backspace key policy is set by user. */
                {67, 0, 0, 0, 0, 0, NULL, NULL,},
                /* 1000: Send-coords-on-button. */
-               {1000, 0, PRIV_OFFSET(mouse_tracking_mode), 0,
+               {1000, 0, PRIV_OFFSET(m_mouse_tracking_mode), 0,
                 0,
                 MOUSE_TRACKING_SEND_XY_ON_BUTTON,
                 vte_reset_mouse_smooth_scroll_delta,
                 vte_reset_mouse_smooth_scroll_delta,},
                /* 1001: Hilite tracking. */
-               {1001, 0, PRIV_OFFSET(mouse_tracking_mode), 0,
+               {1001, 0, PRIV_OFFSET(m_mouse_tracking_mode), 0,
                 (0),
                 (MOUSE_TRACKING_HILITE_TRACKING),
                 vte_reset_mouse_smooth_scroll_delta,
                 vte_reset_mouse_smooth_scroll_delta,},
                /* 1002: Cell motion tracking. */
-               {1002, 0, PRIV_OFFSET(mouse_tracking_mode), 0,
+               {1002, 0, PRIV_OFFSET(m_mouse_tracking_mode), 0,
                 (0),
                 (MOUSE_TRACKING_CELL_MOTION_TRACKING),
                 vte_reset_mouse_smooth_scroll_delta,
                 vte_reset_mouse_smooth_scroll_delta,},
                /* 1003: All motion tracking. */
-               {1003, 0, PRIV_OFFSET(mouse_tracking_mode), 0,
+               {1003, 0, PRIV_OFFSET(m_mouse_tracking_mode), 0,
                 (0),
                 (MOUSE_TRACKING_ALL_MOTION_TRACKING),
                 vte_reset_mouse_smooth_scroll_delta,
                 vte_reset_mouse_smooth_scroll_delta,},
                /* 1004: Focus tracking. */
-               {1004, PRIV_OFFSET(focus_tracking_mode), 0, 0,
+               {1004, PRIV_OFFSET(m_focus_tracking_mode), 0, 0,
                 FALSE,
                 TRUE,
                  NULL,
                  vte_set_focus_tracking_mode,},
                /* 1006: Extended mouse coordinates. */
-               {1006, PRIV_OFFSET(mouse_xterm_extension), 0, 0,
+               {1006, PRIV_OFFSET(m_mouse_xterm_extension), 0, 0,
                 FALSE,
                 TRUE,
                 NULL, NULL,},
@@ -735,7 +735,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                /* 1011/rxvt: disallowed, scroll-on-keypress is set by user. */
                {1011, 0, 0, 0, 0, 0, NULL, NULL,},
                /* 1015/urxvt: Extended mouse coordinates. */
-               {1015, PRIV_OFFSET(mouse_urxvt_extension), 0, 0,
+               {1015, PRIV_OFFSET(m_mouse_urxvt_extension), 0, 0,
                 FALSE,
                 TRUE,
                 NULL, NULL,},