isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st: Remove st-container

Browse Source 
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
This commit is contained in:
Jasper St. Pierre 2012-02-16 13:14:53 -05:00
parent bb862e20c0
commit d5285674ae
12 changed files with 14 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/st/st-docs.sgml.in
View File

@ -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">

2
src/Makefile-st.am
View File

@ -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 \

2
src/shell-generic-container.c
View File

@ -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));

4
src/shell-generic-container.h
View File

@ -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;

2
src/shell-stack.c
View File

@ -18,7 +18,7 @@
G_DEFINE_TYPE (ShellStack,
shell_stack,
ST_TYPE_CONTAINER);
ST_TYPE_WIDGET);
static void
shell_stack_allocate (ClutterActor *self,

4
src/shell-stack.h
View File

@ -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;

2
src/st/st-box-layout.c
View File

@ -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,

6
src/st/st-box-layout.h
View File

@ -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);

41
src/st/st-container.c
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h>
#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)
{
}

55
src/st/st-container.h
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION)
#error "Only <st/st.h> can be included directly.h"
#endif
#ifndef __ST_CONTAINER_H__
#define __ST_CONTAINER_H__
#include <st/st-widget.h>
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__ */

2
src/st/st-table.c
View File

@ -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));

6
src/st/st-table.h
View File

@ -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;