[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit 850cd97de0ab914097711e1789c92b3cb5433623
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/vtegtk.cc      |    8 ++++----
 src/vteinternal.hh |   24 ++++++++----------------
 2 files changed, 12 insertions(+), 20 deletions(-)
---
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 569409e..b4fda0e 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -2904,7 +2904,7 @@ const char *
 vte_terminal_get_current_directory_uri(VteTerminal *terminal)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
-        return IMPL(terminal)->current_directory_uri;
+        return IMPL(terminal)->m_current_directory_uri;
 }
 
 /**
@@ -2919,7 +2919,7 @@ const char *
 vte_terminal_get_current_file_uri(VteTerminal *terminal)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
-        return IMPL(terminal)->current_file_uri;
+        return IMPL(terminal)->m_current_file_uri;
 }
 
 /**
@@ -3248,7 +3248,7 @@ const char *
 vte_terminal_get_icon_title(VteTerminal *terminal)
 {
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), "");
-       return IMPL(terminal)->icon_title;
+       return IMPL(terminal)->m_icon_title;
 }
 
 /**
@@ -3485,7 +3485,7 @@ const char *
 vte_terminal_get_window_title(VteTerminal *terminal)
 {
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), "");
-       return IMPL(terminal)->window_title;
+       return IMPL(terminal)->m_window_title;
 }
 
 /**
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 759c1d7..f080985 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -510,14 +510,14 @@ public:
         gboolean m_contents_changed_pending;
 
        /* window name changes */
-        gchar *window_title;
-       gchar *window_title_changed;
-        gchar *icon_title;
-       gchar *icon_title_changed;
-        gchar *current_directory_uri;
-        gchar *current_directory_uri_changed;
-        gchar *current_file_uri;
-        gchar *current_file_uri_changed;
+        char* m_window_title;
+        char* m_window_title_changed;
+        char* m_icon_title;
+        char* m_icon_title_changed;
+        char* m_current_directory_uri;
+        char* m_current_directory_uri_changed;
+        char* m_current_file_uri;
+        char* m_current_file_uri_changed;
 
        /* Background */
         gdouble background_alpha;
@@ -1238,13 +1238,5 @@ public:
 #define m_underline_position underline_position
 #define m_strikethrough_position strikethrough_position
 #define m_background_alpha background_alpha
-#define m_window_title window_title
-#define m_window_title_changed window_title_changed
-#define m_icon_title_changed icon_title_changed
-#define m_current_directory_uri_changed current_directory_uri_changed
-#define m_current_directory_uri current_directory_uri
-#define m_current_file_uri_changed current_file_uri_changed
-#define m_current_file_uri current_file_uri
-#define m_icon_title icon_title
 
 extern GTimer *process_timer;