FIX uber-graph GLIB private

6 files changed, 23 insertions, 31 deletions

diff --git a/deps/uber-graph/uber-graph.c b/deps/uber-graph/uber-graph.c
index e8a6157a..9118f263 100644
--- a/deps/uber-graph/uber-graph.c
+++ b/deps/uber-graph/uber-graph.c
@@ -68,7 +68,6 @@
  * or a new #GtkStyle set, a full rendering of the graph will be required.
  */
 
-G_DEFINE_ABSTRACT_TYPE(UberGraph, uber_graph, GTK_TYPE_DRAWING_AREA)
 
 struct _UberGraphPrivate
 {
@@ -110,6 +109,8 @@ struct _UberGraphPrivate
 	gint             fps_count;     /* Track actual FPS. */
 };
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(UberGraph, uber_graph, GTK_TYPE_DRAWING_AREA)
+
 static gboolean show_fps = FALSE;
 
 enum
@@ -2087,7 +2088,6 @@ uber_graph_class_init (UberGraphClass *klass) /* IN */
 	object_class->finalize = uber_graph_finalize;
 	object_class->get_property = uber_graph_get_property;
 	object_class->set_property = uber_graph_set_property;
-	g_type_class_add_private(object_class, sizeof(UberGraphPrivate));
 
 	widget_class = GTK_WIDGET_CLASS(klass);
 	widget_class->draw = uber_graph_draw;
@@ -2135,9 +2135,8 @@ uber_graph_init (UberGraph *graph) /* IN */
 	/*
 	 * Store pointer to private data allocation.
 	 */
-	graph->priv = G_TYPE_INSTANCE_GET_PRIVATE(graph,
-	                                          UBER_TYPE_GRAPH,
-	                                          UberGraphPrivate);
+	graph->priv = uber_graph_get_instance_private(graph);
+
 	priv = graph->priv;
 	/*
 	 * Enable required events.
diff --git a/deps/uber-graph/uber-heat-map.c b/deps/uber-graph/uber-heat-map.c
index a01e0cb8..6c2caa3b 100644
--- a/deps/uber-graph/uber-heat-map.c
+++ b/deps/uber-graph/uber-heat-map.c
@@ -33,8 +33,6 @@
  * Section overview.
  */
 
-G_DEFINE_TYPE(UberHeatMap, uber_heat_map, UBER_TYPE_GRAPH)
-
 struct _UberHeatMapPrivate
 {
 	GRing           *raw_data;
@@ -45,6 +43,9 @@ struct _UberHeatMapPrivate
 	gpointer         func_user_data;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(UberHeatMap, uber_heat_map, UBER_TYPE_GRAPH)
+
+
 /**
  * uber_heat_map_new:
  *
@@ -322,7 +323,6 @@ uber_heat_map_class_init (UberHeatMapClass *klass) /* IN */
 
 	object_class = G_OBJECT_CLASS(klass);
 	object_class->finalize = uber_heat_map_finalize;
-	g_type_class_add_private(object_class, sizeof(UberHeatMapPrivate));
 
 	graph_class = UBER_GRAPH_CLASS(klass);
 	graph_class->render = uber_heat_map_render;
@@ -343,7 +343,5 @@ uber_heat_map_class_init (UberHeatMapClass *klass) /* IN */
 static void
 uber_heat_map_init (UberHeatMap *map) /* IN */
 {
-	map->priv = G_TYPE_INSTANCE_GET_PRIVATE(map,
-	                                        UBER_TYPE_HEAT_MAP,
-	                                        UberHeatMapPrivate);
+	map->priv = uber_heat_map_get_instance_private(map);
 }
diff --git a/deps/uber-graph/uber-label.c b/deps/uber-graph/uber-label.c
index 83f632e0..abc865fc 100644
--- a/deps/uber-graph/uber-label.c
+++ b/deps/uber-graph/uber-label.c
@@ -32,7 +32,6 @@
  * Section overview.
  */
 
-G_DEFINE_TYPE(UberLabel, uber_label, GTK_TYPE_WIDGET)
 
 struct _UberLabelPrivate
 {
@@ -43,6 +42,8 @@ struct _UberLabelPrivate
 	gboolean   in_block;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(UberLabel, uber_label, GTK_TYPE_WIDGET)
+
 enum
 {
 	COLOR_CHANGED,
@@ -303,7 +304,6 @@ uber_label_class_init (UberLabelClass *klass) /* IN */
 	object_class = G_OBJECT_CLASS(klass);
 	object_class->finalize = uber_label_finalize;
 	object_class->set_property = uber_label_set_property;
-	g_type_class_add_private(object_class, sizeof(UberLabelPrivate));
 
 	g_object_class_install_property(object_class,
 	                                PROP_COLOR,
@@ -354,9 +354,8 @@ uber_label_init (UberLabel *label) /* IN */
 {
 	UberLabelPrivate *priv;
 
-	label->priv = G_TYPE_INSTANCE_GET_PRIVATE(label,
-	                                          UBER_TYPE_LABEL,
-	                                          UberLabelPrivate);
+	label->priv = uber_label_get_instance_private(label);
+
 	priv = label->priv;
 	priv->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	priv->block = gtk_drawing_area_new();
diff --git a/deps/uber-graph/uber-line-graph.c b/deps/uber-graph/uber-line-graph.c
index 73941f10..2e42ed60 100644
--- a/deps/uber-graph/uber-line-graph.c
+++ b/deps/uber-graph/uber-line-graph.c
@@ -40,7 +40,6 @@
  * Section overview.
  */
 
-G_DEFINE_TYPE(UberLineGraph, uber_line_graph, UBER_TYPE_GRAPH)
 
 typedef struct
 {
@@ -69,6 +68,9 @@ struct _UberLineGraphPrivate
 	GDestroyNotify     func_notify;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(UberLineGraph, uber_line_graph, UBER_TYPE_GRAPH)
+
+
 enum
 {
 	PROP_0,
@@ -956,7 +958,6 @@ uber_line_graph_class_init (UberLineGraphClass *klass) /* IN */
 	object_class->finalize = uber_line_graph_finalize;
 	object_class->get_property = uber_line_graph_get_property;
 	object_class->set_property = uber_line_graph_set_property;
-	g_type_class_add_private(object_class, sizeof(UberLineGraphPrivate));
 
 	graph_class = UBER_GRAPH_CLASS(klass);
 	graph_class->downscale = uber_line_graph_downscale;
@@ -1000,9 +1001,8 @@ uber_line_graph_init (UberLineGraph *graph) /* IN */
 	/*
 	 * Keep pointer to private data.
 	 */
-	graph->priv = G_TYPE_INSTANCE_GET_PRIVATE(graph,
-	                                          UBER_TYPE_LINE_GRAPH,
-	                                          UberLineGraphPrivate);
+	graph->priv = uber_line_graph_get_instance_private(graph);
+
 	priv = graph->priv;
 	/*
 	 * Initialize defaults.
diff --git a/deps/uber-graph/uber-scatter.c b/deps/uber-graph/uber-scatter.c
index fba3280d..1889cfa8 100644
--- a/deps/uber-graph/uber-scatter.c
+++ b/deps/uber-graph/uber-scatter.c
@@ -38,7 +38,6 @@
  * Section overview.
  */
 
-G_DEFINE_TYPE(UberScatter, uber_scatter, UBER_TYPE_GRAPH)
 
 struct _UberScatterPrivate
 {
@@ -52,6 +51,8 @@ struct _UberScatterPrivate
 	GDestroyNotify   func_destroy;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE(UberScatter, uber_scatter, UBER_TYPE_GRAPH)
+
 /**
  * uber_scatter_new:
  *
@@ -388,7 +389,6 @@ uber_scatter_class_init (UberScatterClass *klass) /* IN */
 
 	object_class = G_OBJECT_CLASS(klass);
 	object_class->finalize = uber_scatter_finalize;
-	g_type_class_add_private(object_class, sizeof(UberScatterPrivate));
 
 	graph_class = UBER_GRAPH_CLASS(klass);
 	graph_class->render = uber_scatter_render;
@@ -411,9 +411,8 @@ uber_scatter_init (UberScatter *scatter) /* IN */
 {
 	UberScatterPrivate *priv;
 
-	scatter->priv = G_TYPE_INSTANCE_GET_PRIVATE(scatter,
-	                                            UBER_TYPE_SCATTER,
-	                                            UberScatterPrivate);
+	scatter->priv = uber_scatter_get_instance_private(scatter);
+
 	priv = scatter->priv;
 
 	priv->range.begin = 0.;
diff --git a/deps/uber-graph/uber-window.c b/deps/uber-graph/uber-window.c
index 4e68f49c..989f3374 100644
--- a/deps/uber-graph/uber-window.c
+++ b/deps/uber-graph/uber-window.c
@@ -30,7 +30,6 @@
  * Section overview.
  */
 
-G_DEFINE_TYPE(UberWindow, uber_window, GTK_TYPE_WINDOW)
 
 struct _UberWindowPrivate
 {
@@ -39,6 +38,7 @@ struct _UberWindowPrivate
 	GtkWidget *notebook;
 	GtkWidget *table;
 };
+G_DEFINE_TYPE_WITH_PRIVATE(UberWindow, uber_window, GTK_TYPE_WINDOW)
 
 /**
  * uber_window_new:
@@ -286,7 +286,6 @@ uber_window_class_init (UberWindowClass *klass) /* IN */
 
 	object_class = G_OBJECT_CLASS(klass);
 	object_class->finalize = uber_window_finalize;
-	g_type_class_add_private(object_class, sizeof(UberWindowPrivate));
 }
 
 /**
@@ -303,9 +302,7 @@ uber_window_init (UberWindow *window) /* IN */
 {
 	UberWindowPrivate *priv;
 
-	window->priv = G_TYPE_INSTANCE_GET_PRIVATE(window,
-	                                           UBER_TYPE_WINDOW,
-	                                           UberWindowPrivate);
+	window->priv = uber_window_get_instance_private(window);
 
 	/*
 	 * Initialize defaults.