From d5285674aeec82b2c17ce0e1799d26ca6643d599 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 16 Feb 2012 13:14:53 -0500 Subject: [PATCH] st: Remove st-container At this point, StContainer is a dummy class that does nothing, so it's safe to remove. https://bugzilla.gnome.org/show_bug.cgi?id=670034 --- docs/reference/st/st-docs.sgml.in | 1 - src/Makefile-st.am | 2 -- src/shell-generic-container.c | 2 +- src/shell-generic-container.h | 4 +-- src/shell-stack.c | 2 +- src/shell-stack.h | 4 +-- src/st/st-box-layout.c | 2 +- src/st/st-box-layout.h | 6 ++-- src/st/st-container.c | 41 ----------------------- src/st/st-container.h | 55 ------------------------------- src/st/st-table.c | 2 +- src/st/st-table.h | 6 ++-- 12 files changed, 14 insertions(+), 113 deletions(-) delete mode 100644 src/st/st-container.c delete mode 100644 src/st/st-container.h diff --git a/docs/reference/st/st-docs.sgml.in b/docs/reference/st/st-docs.sgml.in index b1d07d017..22d1db444 100644 --- a/docs/reference/st/st-docs.sgml.in +++ b/docs/reference/st/st-docs.sgml.in @@ -20,7 +20,6 @@ Abstract classes and Interfaces - diff --git a/src/Makefile-st.am b/src/Makefile-st.am index 6b97766b9..0ae490a6f 100644 --- a/src/Makefile-st.am +++ b/src/Makefile-st.am @@ -50,7 +50,6 @@ st_source_h = \ st/st-box-layout-child.h \ st/st-button.h \ st/st-clipboard.h \ - st/st-container.h \ st/st-drawing-area.h \ st/st-entry.h \ st/st-focus-manager.h \ @@ -104,7 +103,6 @@ st_source_c = \ st/st-box-layout-child.c \ st/st-button.c \ st/st-clipboard.c \ - st/st-container.c \ st/st-drawing-area.c \ st/st-entry.c \ st/st-focus-manager.c \ diff --git a/src/shell-generic-container.c b/src/shell-generic-container.c index c5eb30694..48b8b3c2d 100644 --- a/src/shell-generic-container.c +++ b/src/shell-generic-container.c @@ -25,7 +25,7 @@ static void shell_generic_container_iface_init (ClutterContainerIface *iface); G_DEFINE_TYPE_WITH_CODE(ShellGenericContainer, shell_generic_container, - ST_TYPE_CONTAINER, + ST_TYPE_WIDGET, G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER, shell_generic_container_iface_init)); diff --git a/src/shell-generic-container.h b/src/shell-generic-container.h index f49b78a85..93637bb37 100644 --- a/src/shell-generic-container.h +++ b/src/shell-generic-container.h @@ -29,14 +29,14 @@ typedef struct _ShellGenericContainerPrivate ShellGenericContainerPrivate; struct _ShellGenericContainer { - StContainer parent; + StWidget parent; ShellGenericContainerPrivate *priv; }; struct _ShellGenericContainerClass { - StContainerClass parent_class; + StWidgetClass parent_class; }; GType shell_generic_container_get_type (void) G_GNUC_CONST; diff --git a/src/shell-stack.c b/src/shell-stack.c index f788ee4ef..55d5d03af 100644 --- a/src/shell-stack.c +++ b/src/shell-stack.c @@ -18,7 +18,7 @@ G_DEFINE_TYPE (ShellStack, shell_stack, - ST_TYPE_CONTAINER); + ST_TYPE_WIDGET); static void shell_stack_allocate (ClutterActor *self, diff --git a/src/shell-stack.h b/src/shell-stack.h index e89d39f28..73df5185c 100644 --- a/src/shell-stack.h +++ b/src/shell-stack.h @@ -19,14 +19,14 @@ typedef struct _ShellStackPrivate ShellStackPrivate; struct _ShellStack { - StContainer parent; + StWidget parent; ShellStackPrivate *priv; }; struct _ShellStackClass { - StContainerClass parent_class; + StWidgetClass parent_class; }; GType shell_stack_get_type (void) G_GNUC_CONST; diff --git a/src/st/st-box-layout.c b/src/st/st-box-layout.c index 86f1388b3..f75cbcff5 100644 --- a/src/st/st-box-layout.c +++ b/src/st/st-box-layout.c @@ -59,7 +59,7 @@ static void st_box_container_iface_init (ClutterContainerIface *iface); static void st_box_scrollable_interface_init (StScrollableInterface *iface); -G_DEFINE_TYPE_WITH_CODE (StBoxLayout, st_box_layout, ST_TYPE_CONTAINER, +G_DEFINE_TYPE_WITH_CODE (StBoxLayout, st_box_layout, ST_TYPE_WIDGET, G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER, st_box_container_iface_init) G_IMPLEMENT_INTERFACE (ST_TYPE_SCROLLABLE, diff --git a/src/st/st-box-layout.h b/src/st/st-box-layout.h index 4db806ba6..ff4a1f807 100644 --- a/src/st/st-box-layout.h +++ b/src/st/st-box-layout.h @@ -25,7 +25,7 @@ #ifndef _ST_BOX_LAYOUT_H #define _ST_BOX_LAYOUT_H -#include +#include G_BEGIN_DECLS @@ -64,14 +64,14 @@ typedef struct _StBoxLayoutPrivate StBoxLayoutPrivate; struct _StBoxLayout { /*< private >*/ - StContainer parent; + StWidget parent; StBoxLayoutPrivate *priv; }; struct _StBoxLayoutClass { - StContainerClass parent_class; + StWidgetClass parent_class; }; GType st_box_layout_get_type (void); diff --git a/src/st/st-container.c b/src/st/st-container.c deleted file mode 100644 index 61beaa09b..000000000 --- a/src/st/st-container.c +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -/* - * st-container.c: Base class for St container actors - * - * Copyright 2007 OpenedHand - * Copyright 2008, 2009 Intel Corporation. - * Copyright 2010 Florian Müllner - * Copyright 2010 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU Lesser General Public License, - * version 2.1, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 program. If not, see . - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -#include "st-container.h" - -G_DEFINE_ABSTRACT_TYPE (StContainer, st_container, ST_TYPE_WIDGET); - -static void -st_container_init (StContainer *container) -{ -} - -static void -st_container_class_init (StContainerClass *klass) -{ -} diff --git a/src/st/st-container.h b/src/st/st-container.h deleted file mode 100644 index 915e809f9..000000000 --- a/src/st/st-container.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -/* - * st-container.h: Base class for St container actors - * - * Copyright 2007 OpenedHand - * Copyright 2008, 2009 Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU Lesser General Public License, - * version 2.1, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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 program. If not, see . - */ - -#if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION) -#error "Only can be included directly.h" -#endif - -#ifndef __ST_CONTAINER_H__ -#define __ST_CONTAINER_H__ - -#include - -G_BEGIN_DECLS - -#define ST_TYPE_CONTAINER (st_container_get_type ()) -#define ST_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ST_TYPE_CONTAINER, StContainer)) -#define ST_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ST_TYPE_CONTAINER)) -#define ST_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ST_TYPE_CONTAINER, StContainerClass)) -#define ST_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ST_TYPE_CONTAINER)) -#define ST_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ST_TYPE_CONTAINER, StContainerClass)) - -typedef struct _StContainer StContainer; -typedef struct _StContainerClass StContainerClass; -typedef struct _StContainerPrivate StContainerPrivate; - -struct _StContainer { - StWidget parent; -}; - -struct _StContainerClass { - StWidgetClass parent_class; -}; - -GType st_container_get_type (void) G_GNUC_CONST; - -G_END_DECLS - -#endif /* __ST_CONTAINER_H__ */ diff --git a/src/st/st-table.c b/src/st/st-table.c index b1226ed4a..f059bf539 100644 --- a/src/st/st-table.c +++ b/src/st/st-table.c @@ -85,7 +85,7 @@ struct _StTablePrivate static void st_table_container_iface_init (ClutterContainerIface *iface); -G_DEFINE_TYPE_WITH_CODE (StTable, st_table, ST_TYPE_CONTAINER, +G_DEFINE_TYPE_WITH_CODE (StTable, st_table, ST_TYPE_WIDGET, G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER, st_table_container_iface_init)); diff --git a/src/st/st-table.h b/src/st/st-table.h index f6b8d7181..a87baa448 100644 --- a/src/st/st-table.h +++ b/src/st/st-table.h @@ -25,7 +25,7 @@ #define __ST_TABLE_H__ #include -#include +#include G_BEGIN_DECLS @@ -68,14 +68,14 @@ typedef struct _StTableClass StTableClass; struct _StTable { /*< private >*/ - StContainer parent_instance; + StWidget parent_instance; StTablePrivate *priv; }; struct _StTableClass { - StContainerClass parent_class; + StWidgetClass parent_class; }; GType st_table_get_type (void) G_GNUC_CONST;