[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit 43ed39913aff84a462dbf7aea27c915ebdf0b708
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 |    9 +++------
 2 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 0d9b9f7..622d798 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -2027,8 +2027,8 @@ vte_terminal_search_get_regex(VteTerminal *terminal)
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
 
         auto impl = IMPL(terminal);
-        if (G_LIKELY(impl->search_regex.mode == VTE_REGEX_PCRE2))
-                return impl->search_regex.pcre.regex;
+        if (G_LIKELY(impl->m_search_regex.mode == VTE_REGEX_PCRE2))
+                return impl->m_search_regex.pcre.regex;
         else
                 return NULL;
 }
@@ -2067,8 +2067,8 @@ vte_terminal_search_get_gregex (VteTerminal *terminal)
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
 
         auto impl = IMPL(terminal);
-        if (G_LIKELY(impl->search_regex.mode == VTE_REGEX_GREGEX))
-                return impl->search_regex.gregex.regex;
+        if (G_LIKELY(impl->m_search_regex.mode == VTE_REGEX_GREGEX))
+                return impl->m_search_regex.gregex.regex;
         else
                 return NULL;
 }
@@ -2101,7 +2101,7 @@ vte_terminal_search_get_wrap_around (VteTerminal *terminal)
 {
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
 
-       return IMPL(terminal)->search_wrap_around;
+       return IMPL(terminal)->m_search_wrap_around;
 }
 
 
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index ff69d65..d138ea6 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -465,9 +465,9 @@ public:
         bool m_show_match;
 
        /* Search data. */
-        struct vte_regex_and_flags search_regex;
-       gboolean search_wrap_around;
-       GArray *search_attrs; /* Cache attrs */
+        struct vte_regex_and_flags m_search_regex;
+        gboolean m_search_wrap_around;
+        GArray* m_search_attrs; /* Cache attrs */
 
        /* Data used when rendering the text which does not require server
         * resources and which can be kept after unrealizing. */
@@ -1256,12 +1256,10 @@ public:
 #define m_underline_position underline_position
 #define m_strikethrough_position strikethrough_position
 #define m_palette palette
-#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_fontdesc fontdesc
-#define m_search_attrs search_attrs
 #define m_adjustment_changed_pending adjustment_changed_pending
 #define m_window_title window_title
 #define m_window_title_changed window_title_changed
@@ -1271,7 +1269,6 @@ public:
 #define m_current_file_uri_changed current_file_uri_changed
 #define m_current_file_uri current_file_uri
 #define m_icon_title icon_title
-#define m_search_wrap_around search_wrap_around
 #define m_adjustment_value_changed_pending adjustment_value_changed_pending
 #define m_accessible_emit accessible_emit