From 9beb5490f58476d8f3e812b0666b4c4d754ef706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Sat, 3 Mar 2018 11:28:57 +0100
Subject: [PATCH] overlay: Remove priv pointer

---
 gtk/gtkoverlay.c | 21 +++++++++------------
 gtk/gtkoverlay.h |  4 +---
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index 287d63eb06..5c5092572d 100644
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -258,7 +258,7 @@ gtk_overlay_size_allocate (GtkWidget           *widget,
                            GtkAllocation       *out_clip)
 {
   GtkOverlay *overlay = GTK_OVERLAY (widget);
-  GtkOverlayPrivate *priv = overlay->priv;
+  GtkOverlayPrivate *priv = gtk_overlay_get_instance_private (overlay);
   GSList *children;
   GtkWidget *main_widget;
 
@@ -352,7 +352,7 @@ static void
 gtk_overlay_remove (GtkContainer *container,
                     GtkWidget    *widget)
 {
-  GtkOverlayPrivate *priv = GTK_OVERLAY (container)->priv;
+  GtkOverlayPrivate *priv = gtk_overlay_get_instance_private (GTK_OVERLAY (container));
   GtkOverlayChild *child;
   GSList *children, *next;
   gboolean removed;
@@ -401,7 +401,7 @@ gtk_overlay_reorder_overlay (GtkOverlay *overlay,
                              GtkWidget  *child,
                              gint        position)
 {
-  GtkOverlayPrivate *priv;
+  GtkOverlayPrivate *priv = gtk_overlay_get_instance_private (overlay);
   GSList *old_link;
   GSList *new_link;
   GSList *l;
@@ -412,8 +412,6 @@ gtk_overlay_reorder_overlay (GtkOverlay *overlay,
   g_return_if_fail (GTK_IS_OVERLAY (overlay));
   g_return_if_fail (GTK_IS_WIDGET (child));
 
-  priv = GTK_OVERLAY (overlay)->priv;
-
   old_link = priv->children;
   old_index = 0;
   while (old_link)
@@ -466,7 +464,7 @@ gtk_overlay_forall (GtkContainer *overlay,
                     GtkCallback   callback,
                     gpointer      callback_data)
 {
-  GtkOverlayPrivate *priv = GTK_OVERLAY (overlay)->priv;
+  GtkOverlayPrivate *priv = gtk_overlay_get_instance_private (GTK_OVERLAY (overlay));
   GtkOverlayChild *child;
   GSList *children;
   GtkWidget *main_widget;
@@ -489,7 +487,7 @@ static GtkOverlayChild *
 gtk_overlay_get_overlay_child (GtkOverlay *overlay,
 			       GtkWidget *child)
 {
-  GtkOverlayPrivate *priv = GTK_OVERLAY (overlay)->priv;
+  GtkOverlayPrivate *priv = gtk_overlay_get_instance_private (overlay);
   GtkOverlayChild *child_info;
   GSList *children;
 
@@ -574,7 +572,7 @@ gtk_overlay_get_child_property (GtkContainer *container,
 				GParamSpec   *pspec)
 {
   GtkOverlay *overlay = GTK_OVERLAY (container);
-  GtkOverlayPrivate *priv = GTK_OVERLAY (overlay)->priv;
+  GtkOverlayPrivate *priv = gtk_overlay_get_instance_private (overlay);
   GtkOverlayChild *child_info;
   GtkWidget *main_widget;
 
@@ -791,14 +789,14 @@ gtk_overlay_class_init (GtkOverlayClass *klass)
                   GTK_TYPE_WIDGET,
                   GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE);
 
+  child_data_quark = g_quark_from_static_string ("gtk-overlay-child-data");
+
   gtk_widget_class_set_css_name (widget_class, I_("overlay"));
 }
 
 static void
 gtk_overlay_init (GtkOverlay *overlay)
 {
-  overlay->priv = gtk_overlay_get_instance_private (overlay);
-
   gtk_widget_set_has_window (GTK_WIDGET (overlay), FALSE);
 }
 
@@ -856,13 +854,12 @@ void
 gtk_overlay_add_overlay (GtkOverlay *overlay,
                          GtkWidget  *widget)
 {
-  GtkOverlayPrivate *priv;
+  GtkOverlayPrivate *priv = gtk_overlay_get_instance_private (overlay);
   GtkOverlayChild *child;
 
   g_return_if_fail (GTK_IS_OVERLAY (overlay));
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  priv = overlay->priv;
   child = g_slice_new0 (GtkOverlayChild);
   child->widget = widget;
 
diff --git a/gtk/gtkoverlay.h b/gtk/gtkoverlay.h
index 2de50f44b1..e59a3926a0 100644
--- a/gtk/gtkoverlay.h
+++ b/gtk/gtkoverlay.h
@@ -42,9 +42,7 @@ typedef struct _GtkOverlayPrivate  GtkOverlayPrivate;
 
 struct _GtkOverlay
 {
-  GtkBin parent;
-
-  GtkOverlayPrivate *priv;
+  GtkBin parent_instance;
 };
 
 /**