[vte] widget: Rename instance members

[Christian Persch <chpe src gnome org>]

commit 99e2c8346a33036fe9f98125485ab9bf730440d4
Author: Christian Persch <chpe gnome org>
Date:   Sun Jan 31 18:53:13 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/vtegtk.cc      |    4 ++--
 src/vteinternal.hh |    8 +++-----
 src/vteseq.cc      |    2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index 75dfe58..828d81d 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -389,10 +389,10 @@ VteTerminalPrivate::invalidate_region(vte::grid::column_t scolumn,
        } else {
                invalidate_cells(
                                scolumn,
-                               column_count - scolumn,
+                               m_column_count - scolumn,
                                srow, 1);
                invalidate_cells(
-                               0, column_count,
+                               0, m_column_count,
                                srow + 1, erow - srow - 1);
                invalidate_cells(
                                0, ecolumn + 1,
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index de3de08..c4fdee5 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -2890,7 +2890,7 @@ glong
 vte_terminal_get_column_count(VteTerminal *terminal)
 {
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), -1);
-       return IMPL(terminal)->column_count;
+       return IMPL(terminal)->m_column_count;
 }
 
 /**
@@ -3405,7 +3405,7 @@ glong
 vte_terminal_get_row_count(VteTerminal *terminal)
 {
        g_return_val_if_fail(VTE_IS_TERMINAL(terminal), -1);
-       return IMPL(terminal)->row_count;
+       return IMPL(terminal)->m_row_count;
 }
 
 /**
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 039489a..16fd7a7 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -285,8 +285,8 @@ public:
         GdkWindow *m_event_window;
 
         /* Metric and sizing data: dimensions of the window */
-        glong row_count;
-        glong column_count;
+        vte::grid::row_t m_row_count;
+        vte::grid::column_t m_column_count;
 
        /* Emulation setup data. */
        struct _vte_matcher *matcher;   /* control sequence matcher */
@@ -923,7 +923,7 @@ public:
         void adjust_adjustments_full();
 
         void scroll_lines(long lines);
-        void scroll_pages(long pages) { scroll_lines(pages * row_count); }
+        void scroll_pages(long pages) { scroll_lines(pages * m_row_count); }
         void maybe_scroll_to_top();
         void maybe_scroll_to_bottom();
 
@@ -1231,8 +1231,6 @@ public:
 };
 
 #define m_invalidated_all invalidated_all
-#define m_column_count column_count
-#define m_row_count row_count
 #define m_char_width char_width
 #define m_char_height char_height
 #define m_draw draw
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 9e0d163..4891c1c 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -557,7 +557,7 @@ vte_sequence_handler_multiple_r(VteTerminalPrivate *that,
                                 VteTerminalSequenceHandler handler)
 {
         vte_sequence_handler_multiple_limited(that, params, handler,
-                                              that->column_count - that->m_screen->cursor.col);
+                                              that->m_column_count - that->m_screen->cursor.col);
 }
 
 static void