[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit 79b0a66cce6170be7eda992469d565df76973820
Author: Christian Persch <chpe gnome org>
Date:   Sun Jan 31 18:53:15 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      |   12 ++++++------
 src/vteinternal.hh |   32 ++++++++++----------------------
 3 files changed, 17 insertions(+), 29 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 342f2f2..75fc13f 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -7463,7 +7463,7 @@ VteTerminalPrivate::widget_visibility_notify(GdkEventVisibility *event)
                }
        }
 
-       visibility_state = event->state;
+       m_visibility_state = event->state;
 
        /* no longer visible, stop processing display updates */
        if (m_visibility_state == GDK_VISIBILITY_FULLY_OBSCURED) {
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index b4fda0e..421dac6 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -115,7 +115,7 @@ static void
 vte_terminal_set_hscroll_policy(VteTerminal *terminal,
                                 GtkScrollablePolicy policy)
 {
-        IMPL(terminal)->hscroll_policy = policy;
+        IMPL(terminal)->m_hscroll_policy = policy;
         gtk_widget_queue_resize_no_redraw (GTK_WIDGET (terminal));
 }
 
@@ -124,7 +124,7 @@ static void
 vte_terminal_set_vscroll_policy(VteTerminal *terminal,
                                 GtkScrollablePolicy policy)
 {
-        IMPL(terminal)->vscroll_policy = policy;
+        IMPL(terminal)->m_vscroll_policy = policy;
         gtk_widget_queue_resize_no_redraw (GTK_WIDGET (terminal));
 }
 
@@ -394,16 +394,16 @@ vte_terminal_get_property (GObject *object,
        switch (prop_id)
                 {
                 case PROP_HADJUSTMENT:
-                        g_value_set_object (value, impl->hadjustment);
+                        g_value_set_object (value, impl->m_hadjustment);
                         break;
                 case PROP_VADJUSTMENT:
-                        g_value_set_object (value, impl->vadjustment);
+                        g_value_set_object (value, impl->m_vadjustment);
                         break;
                 case PROP_HSCROLL_POLICY:
-                        g_value_set_enum (value, impl->hscroll_policy);
+                        g_value_set_enum (value, impl->m_hscroll_policy);
                         break;
                 case PROP_VSCROLL_POLICY:
-                        g_value_set_enum (value, impl->vscroll_policy);
+                        g_value_set_enum (value, impl->m_vscroll_policy);
                         break;
                 case PROP_ALLOW_BOLD:
                         g_value_set_boolean (value, vte_terminal_get_allow_bold (terminal));
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index f080985..f871a37 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -520,29 +520,28 @@ public:
         char* m_current_file_uri_changed;
 
        /* Background */
-        gdouble background_alpha;
+        double m_background_alpha;
 
        /* Key modifiers. */
-       guint modifiers;
+        guint m_modifiers;
 
        /* Obscured? state. */
-       GdkVisibilityState visibility_state;
+        GdkVisibilityState m_visibility_state;
 
        /* Font stuff. */
         gboolean m_has_fonts;
-       glong line_thickness;
-       glong underline_position;
-       glong strikethrough_position;
+        long m_line_thickness;
+        long m_underline_position;
+        long m_strikethrough_position;
 
         /* Style stuff */
         GtkBorder m_padding;
 
         /* GtkScrollable impl */
-        GtkAdjustment *hadjustment; /* unused */
-        GtkAdjustment *vadjustment;
-        guint hscroll_policy : 1; /* unused */
-
-        guint vscroll_policy : 1;
+        GtkAdjustment* m_hadjustment; /* unused */
+        GtkAdjustment* m_vadjustment;
+        guint m_hscroll_policy : 1; /* unused */
+        guint m_vscroll_policy : 1;
 
 public:
 
@@ -1228,15 +1227,4 @@ public:
                           vte::grid::row_t row);
 };
 
-#define m_modifiers modifiers
-#define m_visibility_state visibility_state
-#define m_vadjustment vadjustment
-#define m_hadjustment hadjustment
-#define m_hscroll_policy hscroll_policy
-#define m_vscroll_policy vscroll_policy
-#define m_line_thickness line_thickness
-#define m_underline_position underline_position
-#define m_strikethrough_position strikethrough_position
-#define m_background_alpha background_alpha
-
 extern GTimer *process_timer;