From ec1c94d4a7f7f3d21f1a23641557a6c82aa9889a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 12 Nov 2019 19:36:35 +0100 Subject: [PATCH] cally: Remove CallyTexture CallyTexture is an accessibility object associated with ClutterTexture. ClutterTexture is going away, so prepare by first removing the accessibility object that would be constructed for it. https://gitlab.gnome.org/GNOME/mutter/merge_requests/932 --- clutter/clutter/cally/cally-texture.c | 98 --------------------------- clutter/clutter/cally/cally-texture.h | 84 ----------------------- clutter/clutter/cally/cally.c | 3 - clutter/clutter/cally/cally.h | 1 - clutter/clutter/meson.build | 2 - 5 files changed, 188 deletions(-) delete mode 100644 clutter/clutter/cally/cally-texture.c delete mode 100644 clutter/clutter/cally/cally-texture.h diff --git a/clutter/clutter/cally/cally-texture.c b/clutter/clutter/cally/cally-texture.c deleted file mode 100644 index e7df6190d..000000000 --- a/clutter/clutter/cally/cally-texture.c +++ /dev/null @@ -1,98 +0,0 @@ -/* CALLY - The Clutter Accessibility Implementation Library - * - * Copyright (C) 2009 Igalia, S.L. - * - * Author: Alejandro Piñeiro Iglesias - * - * 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, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/** - * SECTION:cally-texture - * @Title: CallyTexture - * @short_description: Implementation of the ATK interfaces for a #ClutterTexture - * @see_also: #ClutterTexture - * - * #CallyTexture implements the required ATK interfaces of #ClutterTexture - * - * In particular it sets a proper role for the texture. - */ -#include "clutter-build-config.h" - -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS - -#include "cally-texture.h" -#include "cally-actor-private.h" - -#include "deprecated/clutter-texture.h" - -/* AtkObject */ -static void cally_texture_real_initialize (AtkObject *obj, - gpointer data); - -G_DEFINE_TYPE (CallyTexture, cally_texture, CALLY_TYPE_ACTOR) - -static void -cally_texture_class_init (CallyTextureClass *klass) -{ -/* GObjectClass *gobject_class = G_OBJECT_CLASS (klass); */ - AtkObjectClass *class = ATK_OBJECT_CLASS (klass); - - class->initialize = cally_texture_real_initialize; -} - -static void -cally_texture_init (CallyTexture *texture) -{ - /* nothing to do yet */ -} - -/** - * cally_texture_new: - * @actor: a #ClutterActor - * - * Creates a new #CallyTexture for the given @actor. @actor must be - * a #ClutterTexture. - * - * Return value: the newly created #AtkObject - * - * Since: 1.4 - */ -AtkObject* -cally_texture_new (ClutterActor *actor) -{ - GObject *object = NULL; - AtkObject *accessible = NULL; - - g_return_val_if_fail (CLUTTER_IS_TEXTURE (actor), NULL); - - object = g_object_new (CALLY_TYPE_TEXTURE, NULL); - - accessible = ATK_OBJECT (object); - atk_object_initialize (accessible, actor); - - return accessible; -} - -static void -cally_texture_real_initialize (AtkObject *obj, - gpointer data) -{ - ATK_OBJECT_CLASS (cally_texture_parent_class)->initialize (obj, data); - - /* default role */ - obj->role = ATK_ROLE_IMAGE; -} diff --git a/clutter/clutter/cally/cally-texture.h b/clutter/clutter/cally/cally-texture.h deleted file mode 100644 index 909a53333..000000000 --- a/clutter/clutter/cally/cally-texture.h +++ /dev/null @@ -1,84 +0,0 @@ -/* CALLY - The Clutter Accessibility Implementation Library - * - * Copyright (C) 2009 Igalia, S.L. - * - * Author: Alejandro Piñeiro Iglesias - * - * 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 . - */ - -#ifndef __CALLY_TEXTURE_H__ -#define __CALLY_TEXTURE_H__ - -#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) -#error "Only can be included directly." -#endif - -#include -#include - -G_BEGIN_DECLS - -#define CALLY_TYPE_TEXTURE (cally_texture_get_type ()) -#define CALLY_TEXTURE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_TEXTURE, CallyTexture)) -#define CALLY_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_TEXTURE, CallyTextureClass)) -#define CALLY_IS_TEXTURE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_TEXTURE)) -#define CALLY_IS_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_TEXTURE)) -#define CALLY_TEXTURE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_TEXTURE, CallyTextureClass)) - -typedef struct _CallyTexture CallyTexture; -typedef struct _CallyTextureClass CallyTextureClass; -typedef struct _CallyTexturePrivate CallyTexturePrivate; - -/** - * CallyTexture: - * - * The CallyTexture structure contains only - * private data and should be accessed using the provided API - * - * Since: 1.4 - */ -struct _CallyTexture -{ - /*< private >*/ - CallyActor parent; - - CallyTexturePrivate *priv; -}; - -/** - * CallyTextureClass: - * - * The CallyTextureClass structure contains - * only private data - * - * Since: 1.4 - */ -struct _CallyTextureClass -{ - /*< private >*/ - CallyActorClass parent_class; - - /* padding for future expansion */ - gpointer _padding_dummy[8]; -}; - -CLUTTER_EXPORT -GType cally_texture_get_type (void) G_GNUC_CONST; -CLUTTER_EXPORT -AtkObject *cally_texture_new (ClutterActor *actor); - -G_END_DECLS - -#endif /* __CALLY_TEXTURE_H__ */ diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c index 4e1b79ada..8b92682db 100644 --- a/clutter/clutter/cally/cally.c +++ b/clutter/clutter/cally/cally.c @@ -39,7 +39,6 @@ #include "cally-group.h" #include "cally-stage.h" #include "cally-text.h" -#include "cally-texture.h" #include "cally-rectangle.h" #include "cally-clone.h" @@ -56,7 +55,6 @@ CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_ACTOR, cally_actor, cally_actor_new) CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_GROUP, cally_group, cally_group_new) CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_STAGE, cally_stage, cally_stage_new) CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXT, cally_text, cally_text_new) -CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXTURE, cally_texture, cally_texture_new) CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_RECTANGLE, cally_rectangle, cally_rectangle_new) CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_CLONE, cally_clone, cally_clone_new) @@ -78,7 +76,6 @@ cally_accessibility_init (void) CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_GROUP, cally_group); CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_STAGE, cally_stage); CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXT, cally_text); - CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXTURE, cally_texture); CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_RECTANGLE, cally_rectangle); CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_CLONE, cally_clone); diff --git a/clutter/clutter/cally/cally.h b/clutter/clutter/cally/cally.h index 11fa9fc6c..440c30be3 100644 --- a/clutter/clutter/cally/cally.h +++ b/clutter/clutter/cally/cally.h @@ -32,7 +32,6 @@ #include "cally-root.h" #include "cally-stage.h" #include "cally-text.h" -#include "cally-texture.h" #include "cally-util.h" #undef __CALLY_H_INSIDE__ diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index a2d2b1f88..ba43724cb 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -307,7 +307,6 @@ cally_headers = [ 'cally/cally-root.h', 'cally/cally-stage.h', 'cally/cally-text.h', - 'cally/cally-texture.h', 'cally/cally-util.h', ] @@ -320,7 +319,6 @@ cally_sources = [ 'cally/cally-root.c', 'cally/cally-stage.c', 'cally/cally-text.c', - 'cally/cally-texture.c', 'cally/cally-util.c', ]