[vte] lib: Remove VteTerminalPrivate from public headers



commit 322e9ec2de50dee81905a6d7d056cf0d2bd69cb0
Author: Christian Persch <chpe gnome org>
Date:   Sun Jan 31 15:08:45 2016 +0100

    lib: Remove VteTerminalPrivate from public headers
    
    Finally!

 doc/reference/vte-sections.txt |    1 -
 src/vte.cc                     |    3 ---
 src/vte/vteterminal.h          |    9 +--------
 src/vtegtk.cc                  |    3 +--
 4 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
index bc5a8e0..8fa4107 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -127,7 +127,6 @@ vte_terminal_event_check_gregex_simple
 
 <SUBSECTION Private>
 VteCharAttributes
-VteTerminalPrivate
 VteTerminalClassPrivate
 </SECTION>
 
diff --git a/src/vte.cc b/src/vte.cc
index bcc3416..4d03c57 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -7930,9 +7930,6 @@ VteTerminalPrivate::VteTerminalPrivate(VteTerminal *t) :
         m_terminal(t),
         m_widget(&t->widget)
 {
-        // FIXMEchpe temporary workaround until all functions have been converted to members
-        m_terminal->pvt = this;
-
         /* Inits allocation to 1x1 @ -1,-1 */
         cairo_rectangle_int_t allocation;
         gtk_widget_get_allocation(m_widget, &allocation);
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index 1479e98..c5b900e 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -33,10 +33,6 @@
 #include "vtepty.h"
 #include "vteregex.h"
 
-#if defined(VTE_COMPILATION) && defined(__cplusplus)
-class VteTerminalPrivate;
-#endif
-
 G_BEGIN_DECLS
 
 #define VTE_TYPE_TERMINAL            (vte_terminal_get_type())
@@ -47,9 +43,6 @@ G_BEGIN_DECLS
 #define VTE_TERMINAL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  VTE_TYPE_TERMINAL, 
VteTerminalClass))
 
 typedef struct _VteTerminal             VteTerminal;
-#if !defined(VTE_COMPILATION) || !defined(__cplusplus)
-typedef struct _VteTerminalPrivate      VteTerminalPrivate;
-#endif
 typedef struct _VteTerminalClass        VteTerminalClass;
 typedef struct _VteTerminalClassPrivate VteTerminalClassPrivate;
 typedef struct _VteCharAttributes       VteCharAttributes;
@@ -60,7 +53,7 @@ typedef struct _VteCharAttributes       VteCharAttributes;
 struct _VteTerminal {
        GtkWidget widget;
         /*< private >*/
-       VteTerminalPrivate *pvt;
+       gpointer *_unused_padding[1];
 };
 
 /**
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index f961188..de3de08 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -366,7 +366,7 @@ vte_terminal_init(VteTerminal *terminal)
 
        /* Initialize private data. NOTE: place is zeroed */
        place = G_TYPE_INSTANCE_GET_PRIVATE (terminal, VTE_TYPE_TERMINAL, VteTerminalPrivate);
-        terminal->pvt = new (place) VteTerminalPrivate(terminal);
+        new (place) VteTerminalPrivate(terminal);
 
         gtk_widget_set_has_window(&terminal->widget, FALSE);
 }
@@ -377,7 +377,6 @@ vte_terminal_finalize(GObject *object)
        VteTerminal *terminal = VTE_TERMINAL (object);
 
         IMPL(terminal)->~VteTerminalPrivate();
-        terminal->pvt = nullptr;
 
        /* Call the inherited finalize() method. */
        G_OBJECT_CLASS(vte_terminal_parent_class)->finalize(object);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]