[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit 487cc04093612225ee4cb4cb09efaafa19845cca
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         |    3 ++-
 src/vtegtk.cc      |    4 ++--
 src/vteinternal.hh |   36 ++++++++++++------------------------
 src/vteseq.cc      |    2 +-
 4 files changed, 17 insertions(+), 28 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 37bb4d8..936d854 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -4037,7 +4037,8 @@ next_match:
         if ((saved_cursor.col != m_screen->cursor.col) ||
             (saved_cursor.row != m_screen->cursor.row)) {
                /* invalidate the old and new cursor positions */
-               if (cursor_visible)
+                // FIXMEchpe shouldn't this be old_cursor_visible with an 'auto old_cursor_visible = 
...'above?
+               if (m_cursor_visible)
                        invalidate_cell(saved_cursor.col, saved_cursor.row);
                invalidate_cursor_once();
                check_cursor_blink();
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 13d2897..7f0d6bb 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -2935,7 +2935,7 @@ vte_terminal_get_cursor_blink_mode(VteTerminal *terminal)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), VTE_CURSOR_BLINK_SYSTEM);
 
-        return IMPL(terminal)->cursor_blink_mode;
+        return IMPL(terminal)->m_cursor_blink_mode;
 }
 
 /**
@@ -2970,7 +2970,7 @@ vte_terminal_get_cursor_shape(VteTerminal *terminal)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), VTE_CURSOR_SHAPE_BLOCK);
 
-        return IMPL(terminal)->cursor_shape;
+        return IMPL(terminal)->m_cursor_shape;
 }
 
 /**
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index de3fee4..1c01793 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -407,23 +407,23 @@ public:
         gboolean m_scrolling_restricted;
 
        /* Cursor shape, as set via API */
-       VteCursorShape cursor_shape;
-        float cursor_aspect_ratio;
+        VteCursorShape m_cursor_shape;
+        double m_cursor_aspect_ratio;
 
        /* Cursor blinking, as set in dconf. */
-        VteCursorBlinkMode cursor_blink_mode;
-       gboolean cursor_blink_state;
-       guint cursor_blink_tag;           /* cursor blinking timeout ID */
-        gint cursor_blink_cycle;          /* gtk-cursor-blink-time / 2 */
-       gint cursor_blink_timeout;        /* gtk-cursor-blink-timeout */
-        gboolean cursor_blinks;           /* whether the cursor is actually blinking */
-       gint64 cursor_blink_time;         /* how long the cursor has been blinking yet */
-       gboolean cursor_visible;
-       gboolean has_focus;               /* is the terminal window focused */
+        VteCursorBlinkMode m_cursor_blink_mode;
+        gboolean m_cursor_blink_state;
+        guint m_cursor_blink_tag;           /* cursor blinking timeout ID */
+        gint m_cursor_blink_cycle;          /* gtk-cursor-blink-time / 2 */
+        gint m_cursor_blink_timeout;        /* gtk-cursor-blink-timeout */
+        gboolean m_cursor_blinks;           /* whether the cursor is actually blinking */
+        gint64 m_cursor_blink_time;         /* how long the cursor has been blinking yet */
+        gboolean m_cursor_visible;
+        gboolean m_has_focus;               /* is the terminal window focused */
 
         /* DECSCUSR cursor style (shape and blinking possibly overridden
          * via escape sequence) */
-        VteCursorStyle cursor_style;
+        VteCursorStyle m_cursor_style;
 
        /* Input device options. */
         gboolean input_enabled;
@@ -1232,14 +1232,6 @@ public:
 #define m_char_width char_width
 #define m_char_height char_height
 #define m_draw draw
-#define m_cursor_blinks cursor_blinks
-#define m_cursor_visible cursor_visible
-#define m_cursor_blink_state cursor_blink_state
-#define m_cursor_blink_time cursor_blink_time
-#define m_cursor_blink_cycle cursor_blink_cycle
-#define m_cursor_blink_timeout cursor_blink_timeout
-#define m_cursor_blink_tag cursor_blink_tag
-#define m_cursor_aspect_ratio cursor_aspect_ratio
 #define m_unscaled_font_desc unscaled_font_desc
 #define m_match_regexes match_regexes
 #define m_match_attributes match_attributes
@@ -1253,7 +1245,6 @@ public:
 #define m_focus_tracking_mode focus_tracking_mode
 #define m_match_tag match_tag
 #define m_match match
-#define m_has_focus has_focus
 #define m_im_context im_context
 #define m_mouse_cursor_visible mouse_cursor_visible
 #define m_mouse_handled_buttons mouse_handled_buttons
@@ -1284,13 +1275,10 @@ public:
 #define m_underline_position underline_position
 #define m_strikethrough_position strikethrough_position
 #define m_palette palette
-#define m_cursor_shape cursor_shape
 #define m_search_regex search_regex
 #define m_background_alpha background_alpha
 #define m_font_scale font_scale
 #define m_has_fonts has_fonts
-#define m_cursor_blink_mode cursor_blink_mode
-#define m_cursor_style cursor_style
 #define m_fontdesc fontdesc
 #define m_search_attrs search_attrs
 #define m_adjustment_changed_pending adjustment_changed_pending
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 307b254..c483d97 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -656,7 +656,7 @@ vte_sequence_handler_decset_internal(VteTerminalPrivate *that,
                /* 18: print form feed. */
                /* 19: set print extent to full screen. */
                /* 25: Cursor visible. */
-               {25, PRIV_OFFSET(cursor_visible), 0, 0,
+               {25, PRIV_OFFSET(m_cursor_visible), 0, 0,
                 FALSE,
                 TRUE,
                 NULL, NULL,},