[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit 3b50659ebb361413bec32d9265793da8c509e019
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         |    4 ++--
 src/vteinternal.hh |   20 +++++++-------------
 2 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index d10bb91..b81ee87 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -1237,7 +1237,7 @@ VteTerminalPrivate::match_rowcol_to_offset(vte::grid::column_t column,
 
        /* Map the pointer position to a portion of the string. */
         // FIXME do a bsearch here?
-       eattr = match_attributes->len;
+       eattr = m_match_attributes->len;
        for (offset = eattr; offset--; ) {
                attr = &g_array_index(m_match_attributes,
                                      struct _VteCharAttributes,
@@ -2060,7 +2060,7 @@ VteTerminalPrivate::regex_match_check_extra(GdkEvent *event,
         if (!rowcol_from_event(event, &col, &row))
                 return false;
 
-       if (match_contents == nullptr) {
+       if (m_match_contents == nullptr) {
                match_contents_refresh();
        }
 
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 8c04690..ff69d65 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -447,12 +447,12 @@ public:
         gboolean m_focus_tracking_mode;
 
        /* State variables for handling match checks. */
-       char *match_contents;
-       GArray *match_attributes;
-        VteRegexMode match_regex_mode;
-       GArray *match_regexes;
-       char *match;
-       int match_tag;
+        char* m_match_contents;
+        GArray* m_match_attributes;
+        VteRegexMode m_match_regex_mode;
+        GArray* m_match_regexes;
+        char* m_match;
+        int m_match_tag;
         /* If m_match non-null, then m_match_span contains the region of the match.
          * If m_match is null, and m_match_span is not .empty(), then it contains
          * the minimal region around the last checked coordinates that don't contain
@@ -462,7 +462,7 @@ public:
         /* Whether the match is being highlighted.
          * Only used if m_match is non-null.
          */
-       bool m_show_match;
+        bool m_show_match;
 
        /* Search data. */
         struct vte_regex_and_flags search_regex;
@@ -1233,13 +1233,7 @@ public:
 #define m_char_height char_height
 #define m_draw draw
 #define m_unscaled_font_desc unscaled_font_desc
-#define m_match_regexes match_regexes
-#define m_match_attributes match_attributes
-#define m_match_contents match_contents
-#define m_match_regex_mode match_regex_mode
 #define m_modifiers modifiers
-#define m_match_tag match_tag
-#define m_match match
 #define m_im_context im_context
 #define m_im_preedit_active im_preedit_active
 #define m_visibility_state visibility_state