[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit 5a7deca573b744b008207bae3e571ffe06ac2ed2
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/vteinternal.hh |   17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index b81ee87..342f2f2 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -4578,7 +4578,7 @@ VteTerminalPrivate::im_preedit_changed()
        PangoAttrList *attrs;
        gint cursorpos;
 
-       gtk_im_context_get_preedit_string(im_context, &str, &attrs, &cursorpos);
+       gtk_im_context_get_preedit_string(m_im_context, &str, &attrs, &cursorpos);
        _vte_debug_print(VTE_DEBUG_EVENTS,
                        "Input method pre-edit changed (%s,%d).\n",
                        str, cursorpos);
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 387d719..b13877e 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -495,11 +495,11 @@ public:
        GdkCursor* m_mouse_inviso_cursor;
 
        /* Input method support. */
-       GtkIMContext *im_context;
-       gboolean im_preedit_active;
-       char *im_preedit;
-       PangoAttrList *im_preedit_attrs;
-       int im_preedit_cursor;
+        GtkIMContext *m_im_context;
+        gboolean m_im_preedit_active;
+        char *m_im_preedit;
+        PangoAttrList *m_im_preedit_attrs;
+        int m_im_preedit_cursor;
 
        gboolean accessible_emit;
 
@@ -1230,17 +1230,10 @@ public:
 };
 
 #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_im_preedit_string im_preedit_string
-#define m_im_preedit_attrs im_preedit_attrs
-#define m_im_preedit_cursor im_preedit_cursor
 #define m_contents_changed_pending contents_changed_pending
 #define m_cursor_moved_pending cursor_moved_pending
-#define m_im_preedit_active im_preedit_active
-#define m_im_preedit im_preedit
 #define m_hadjustment hadjustment
 #define m_hscroll_policy hscroll_policy
 #define m_vscroll_policy vscroll_policy