[gnome-shell/wip/clutter-deprecation-fixes: 4/7] st: Remove st-container

[Jasper St. Pierre <jstpierre src gnome org>]

commit 76e8f47cf34683d72e185207ba5af34c07d1e7f4
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Feb 16 13:14:53 2012 -0500

    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(-)
---
diff --git a/docs/reference/st/st-docs.sgml.in b/docs/reference/st/st-docs.sgml.in
index b1d07d0..22d1db4 100644
--- a/docs/reference/st/st-docs.sgml.in
+++ b/docs/reference/st/st-docs.sgml.in
@@ -20,7 +20,6 @@
       <title>Abstract classes and Interfaces</title>
       <xi:include href="xml/st-widget.xml"/>
       <xi:include href="xml/st-widget-accessible.xml"/>
-      <xi:include href="xml/st-container.xml"/>
       <xi:include href="xml/st-scrollable.xml"/>
     </chapter>
     <chapter id="widgets">
diff --git a/src/Makefile-st.am b/src/Makefile-st.am
index 6b97766..0ae490a 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 c5eb306..48b8b3c 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 f49b78a..93637bb 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 f788ee4..55d5d03 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 e89d39f..73df518 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 86f1388..f75cbcf 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 4db806b..ff4a1f8 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 <st/st-container.h>
+#include <st/st-widget.h>
 
 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-table.c b/src/st/st-table.c
index b1226ed..f059bf5 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 f6b8d71..a87baa4 100644
--- a/src/st/st-table.h
+++ b/src/st/st-table.h
@@ -25,7 +25,7 @@
 #define __ST_TABLE_H__
 
 #include <st/st-types.h>
-#include <st/st-container.h>
+#include <st/st-widget.h>
 
 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;