From 185058456ff3e73785acfe6769b80dbfdc0e164f Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Thu, 29 Jun 2023 09:54:45 +0200 Subject: [PATCH] clutter: Remove deprecated BoxLayout pack-start property Part-of: --- clutter/clutter/clutter-box-layout.c | 48 ------------------- clutter/clutter/clutter-deprecated.h | 1 - .../clutter/deprecated/clutter-box-layout.h | 48 ------------------- clutter/clutter/meson.build | 1 - .../scripts/test-script-named-object.json | 3 +- 5 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 clutter/clutter/deprecated/clutter-box-layout.h diff --git a/clutter/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c index 9f523d9dd..0e53c8182 100644 --- a/clutter/clutter/clutter-box-layout.c +++ b/clutter/clutter/clutter-box-layout.c @@ -51,7 +51,6 @@ #include #define CLUTTER_DISABLE_DEPRECATION_WARNINGS -#include "deprecated/clutter-box-layout.h" #include "deprecated/clutter-container.h" #include "clutter-box-layout.h" @@ -83,7 +82,6 @@ enum PROP_SPACING, PROP_HOMOGENEOUS, - PROP_PACK_START, PROP_ORIENTATION, PROP_LAST @@ -878,10 +876,6 @@ clutter_box_layout_set_property (GObject *gobject, clutter_box_layout_set_spacing (self, g_value_get_uint (value)); break; - case PROP_PACK_START: - clutter_box_layout_set_pack_start (self, g_value_get_boolean (value)); - break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); break; @@ -910,10 +904,6 @@ clutter_box_layout_get_property (GObject *gobject, g_value_set_uint (value, priv->spacing); break; - case PROP_PACK_START: - g_value_set_boolean (value, FALSE); - break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); break; @@ -957,16 +947,6 @@ clutter_box_layout_class_init (ClutterBoxLayoutClass *klass) FALSE, CLUTTER_PARAM_READWRITE); - /** - * ClutterBoxLayout:pack-start: - * - * Deprecated: No longer has any effect - */ - obj_props[PROP_PACK_START] = - g_param_spec_boolean ("pack-start", NULL, NULL, - FALSE, - CLUTTER_PARAM_READWRITE | G_PARAM_DEPRECATED); - /** * ClutterBoxLayout:spacing: * @@ -1151,31 +1131,3 @@ clutter_box_layout_get_homogeneous (ClutterBoxLayout *layout) return layout->priv->is_homogeneous; } -/** - * clutter_box_layout_set_pack_start: - * @layout: a #ClutterBoxLayout - * @pack_start: %TRUE if the @layout should pack children at the - * beginning of the layout - * - * Deprecated: No longer has any effect - */ -void -clutter_box_layout_set_pack_start (ClutterBoxLayout *layout, - gboolean pack_start) -{ -} - -/** - * clutter_box_layout_get_pack_start: - * @layout: a #ClutterBoxLayout - * - * Return value: The value of the :pack-start property, - * always %FALSE - * - * Deprecated: No longer has any effect - */ -gboolean -clutter_box_layout_get_pack_start (ClutterBoxLayout *layout) -{ - return FALSE; -} diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h index 733eb14b1..8d790660c 100644 --- a/clutter/clutter/clutter-deprecated.h +++ b/clutter/clutter/clutter-deprecated.h @@ -3,7 +3,6 @@ #define __CLUTTER_DEPRECATED_H_INSIDE__ -#include "deprecated/clutter-box-layout.h" #include "deprecated/clutter-container.h" #undef __CLUTTER_DEPRECATED_H_INSIDE__ diff --git a/clutter/clutter/deprecated/clutter-box-layout.h b/clutter/clutter/deprecated/clutter-box-layout.h deleted file mode 100644 index 11e0a2d44..000000000 --- a/clutter/clutter/deprecated/clutter-box-layout.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Clutter. - * - * An OpenGL based 'interactive canvas' library. - * - * Copyright (C) 2009 Intel Corporation. - * - * 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 . - * - * Author: - * Emmanuele Bassi - * - * Based on the NBTK NbtkBoxLayout actor by: - * Thomas Wood - */ - -#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef __CLUTTER_BOX_LAYOUT_DEPRECATED_H__ -#define __CLUTTER_BOX_LAYOUT_DEPRECATED_H__ - -#include - -G_BEGIN_DECLS - -CLUTTER_DEPRECATED -void clutter_box_layout_set_pack_start (ClutterBoxLayout *layout, - gboolean pack_start); -CLUTTER_DEPRECATED -gboolean clutter_box_layout_get_pack_start (ClutterBoxLayout *layout); - -G_END_DECLS - -#endif /* __CLUTTER_BOX_LAYOUT_DEPRECATED_H__ */ - diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index 0a3270523..293fee53e 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -232,7 +232,6 @@ clutter_nonintrospected_sources = [ ] clutter_deprecated_headers = [ - 'deprecated/clutter-box-layout.h', 'deprecated/clutter-container.h', 'deprecated/clutter-timeline.h', ] diff --git a/src/tests/clutter/conform/scripts/test-script-named-object.json b/src/tests/clutter/conform/scripts/test-script-named-object.json index 4ba5d2c92..347583275 100644 --- a/src/tests/clutter/conform/scripts/test-script-named-object.json +++ b/src/tests/clutter/conform/scripts/test-script-named-object.json @@ -3,8 +3,7 @@ "id" : "layout", "type" : "ClutterBoxLayout", "orientation" : "vertical", - "spacing" : 12, - "pack-start" : false + "spacing" : 12 }, { "type" : "ClutterStage",