gsk: Dissolve gsk-autocleanup.h

Move the autocleanup declarations into their
respective headers.

diff --git a/gsk/gsk-autocleanup.h b/gsk/gsk-autocleanup.h
deleted file mode 100644 (file)
index d2d2189..0000000
--- a/gsk/gsk-autocleanup.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright 2018 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#if !defined (__GSK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gsk/gsk.h> can be included directly."
-#endif
-
-#ifndef __GI_SCANNER__
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskRenderer, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskRenderNode, gsk_render_node_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskTransform, gsk_transform_unref)
-
-#endif

diff --git a/gsk/gsk.h b/gsk/gsk.h
index 73cb1daa57452a32cc76e67b5d342f80f41d4b79..25fe1b7bf6454573f18203e1a436312f079c2f27 100644 (file)
--- a/gsk/gsk.h
+++ b/gsk/gsk.h
@@ -32,8 +32,6 @@
 #include <gsk/gsktypes.h>
 #include <gsk/gskenumtypes.h>
 
-#include <gsk/gsk-autocleanup.h>
-
 #undef __GSK_H_INSIDE__
 
 #endif /* __GSK_H__ */

diff --git a/gsk/gskrenderer.h b/gsk/gskrenderer.h
index 70f05a71804b461ab3035a3c53fb45c9e1ee29fb..b14898d39dda7d3077afc1bdbd804e5cf7ace0c9 100644 (file)
--- a/gsk/gskrenderer.h
+++ b/gsk/gskrenderer.h
@@ -63,6 +63,8 @@ void                    gsk_renderer_render                     (GskRenderer
                                                                  GskRenderNode           *root,
                                                                  const cairo_region_t    *region);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskRenderer, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GSK_RENDERER_H__ */

diff --git a/gsk/gskrendernode.h b/gsk/gskrendernode.h
index ba05d606f9540187b6b6331b069915a70224f930..3fa1d057c25ceb0211fb04bad4d08f733828dc36 100644 (file)
--- a/gsk/gskrendernode.h
+++ b/gsk/gskrendernode.h
@@ -553,6 +553,7 @@ GskRenderNode *         gsk_value_get_render_node               (const GValue
 GDK_AVAILABLE_IN_4_4
 GskRenderNode *         gsk_value_dup_render_node               (const GValue             *value);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskRenderNode, gsk_render_node_unref)
 
 G_END_DECLS
 

diff --git a/gsk/gsktransform.h b/gsk/gsktransform.h
index d74d4e197ff2be126821b3ca332211911a6358fd..9579a684b7ad423f64f51dd5ad18bf2d2be06383 100644 (file)
--- a/gsk/gsktransform.h
+++ b/gsk/gsktransform.h
@@ -134,6 +134,7 @@ void                    gsk_transform_transform_point           (GskTransform
                                                                  const graphene_point_t          *point,
                                                                  graphene_point_t                *out_point);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskTransform, gsk_transform_unref)
 
 G_END_DECLS
 

diff --git a/gsk/meson.build b/gsk/meson.build
index b65b4261dbe19e79aea80270567bffbb163e136b..02e9c58954d7d2fa107683ec498b23fad489fc57 100644 (file)
--- a/gsk/meson.build
+++ b/gsk/meson.build
@@ -70,7 +70,6 @@ gsk_public_headers = files([
   'gskroundedrect.h',
   'gsktransform.h',
   'gsktypes.h',
-  'gsk-autocleanup.h',
 ])
 install_headers(gsk_public_headers, 'gsk.h', subdir: 'gtk-4.0/gsk')