[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit aae7da9bd7e50af68d5ccb529502aca25fe3b69b
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 |   38 +++++++++++++-------------------------
 2 files changed, 18 insertions(+), 30 deletions(-)
---
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 622d798..569409e 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -3079,7 +3079,7 @@ vte_terminal_get_font(VteTerminal *terminal)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
 
-        return IMPL(terminal)->unscaled_font_desc;
+        return IMPL(terminal)->m_unscaled_font_desc;
 }
 
 /**
@@ -3114,7 +3114,7 @@ vte_terminal_get_font_scale(VteTerminal *terminal)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), 1.);
 
-        return IMPL(terminal)->font_scale;
+        return IMPL(terminal)->m_font_scale;
 }
 
 /**
@@ -3176,8 +3176,8 @@ vte_terminal_get_geometry_hints(VteTerminal *terminal,
 
         hints->base_width  = padding.left + padding.right;
         hints->base_height = padding.top  + padding.bottom;
-        hints->width_inc   = impl->char_width;
-        hints->height_inc  = impl->char_height;
+        hints->width_inc   = impl->m_char_width;
+        hints->height_inc  = impl->m_char_height;
         hints->min_width   = hints->base_width  + hints->width_inc  * min_columns;
         hints->min_height  = hints->base_height + hints->height_inc * min_rows;
 
@@ -3187,7 +3187,7 @@ vte_terminal_get_geometry_hints(VteTerminal *terminal,
                          "                       increments width %d height %d\n"
                          "                       minimum    width %d height %d\n",
                          terminal,
-                         impl->char_width, impl->char_height,
+                         impl->m_char_width, impl->m_char_height,
                          hints->base_width, hints->base_height,
                          hints->width_inc, hints->height_inc,
                          hints->min_width, hints->min_height);
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index d138ea6..387d719 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -471,22 +471,22 @@ public:
 
        /* Data used when rendering the text which does not require server
         * resources and which can be kept after unrealizing. */
-        PangoFontDescription *unscaled_font_desc;
-       PangoFontDescription *fontdesc;
-        gdouble font_scale;
-       gboolean fontdirty;
-        glong char_ascent;
-        glong char_descent;
+        PangoFontDescription *m_unscaled_font_desc;
+        PangoFontDescription *m_fontdesc;
+        gdouble m_font_scale;
+        gboolean m_fontdirty;
+        glong m_char_ascent;
+        glong m_char_descent;
         /* dimensions of character cells */
-        glong char_width;
-        glong char_height;
+        glong m_char_width;
+        glong m_char_height;
 
        /* Data used when rendering the text which reflects server resources
         * and data, which should be dropped when unrealizing and (re)created
         * when realizing. */
-       struct _vte_draw *draw;
+        struct _vte_draw *m_draw;
 
-       VtePaletteColor palette[VTE_PALETTE_SIZE];
+        VtePaletteColor m_palette[VTE_PALETTE_SIZE];
 
        /* Mouse cursors. */
         gboolean m_mouse_cursor_visible;
@@ -530,7 +530,7 @@ public:
        GdkVisibilityState visibility_state;
 
        /* Font stuff. */
-       gboolean has_fonts;
+        gboolean m_has_fonts;
        glong line_thickness;
        glong underline_position;
        glong strikethrough_position;
@@ -1091,8 +1091,8 @@ public:
                                           gunichar **arrayp,
                                           gsize *lenp);
 
-        long get_char_height() { ensure_font(); return char_height; }
-        long get_char_width()  { ensure_font(); return char_width;  }
+        long get_char_height() { ensure_font(); return m_char_height; }
+        long get_char_width()  { ensure_font(); return m_char_width;  }
 
         vte::color::rgb const* get_color(int entry) const;
         void set_color(int entry,
@@ -1229,20 +1229,14 @@ public:
                           vte::grid::row_t row);
 };
 
-#define m_char_width char_width
-#define m_char_height char_height
-#define m_draw draw
-#define m_unscaled_font_desc unscaled_font_desc
 #define m_modifiers modifiers
 #define m_im_context im_context
 #define m_im_preedit_active im_preedit_active
 #define m_visibility_state visibility_state
 #define m_vadjustment vadjustment
-#define m_draw draw
 #define m_im_preedit_string im_preedit_string
 #define m_im_preedit_attrs im_preedit_attrs
 #define m_im_preedit_cursor im_preedit_cursor
-#define m_fontdirty fontdirty
 #define m_contents_changed_pending contents_changed_pending
 #define m_cursor_moved_pending cursor_moved_pending
 #define m_im_preedit_active im_preedit_active
@@ -1250,16 +1244,10 @@ public:
 #define m_hadjustment hadjustment
 #define m_hscroll_policy hscroll_policy
 #define m_vscroll_policy vscroll_policy
-#define m_char_ascent char_ascent
-#define m_char_descent char_descent
 #define m_line_thickness line_thickness
 #define m_underline_position underline_position
 #define m_strikethrough_position strikethrough_position
-#define m_palette palette
 #define m_background_alpha background_alpha
-#define m_font_scale font_scale
-#define m_has_fonts has_fonts
-#define m_fontdesc fontdesc
 #define m_adjustment_changed_pending adjustment_changed_pending
 #define m_window_title window_title
 #define m_window_title_changed window_title_changed