2.0: Remove include directives for deprecated headers

This commit is contained in:
Emmanuele Bassi 2012-08-24 12:35:25 +01:00
parent 03a8e2f7b8
commit f1846bcb53
7 changed files with 2 additions and 22 deletions

View File

@ -49,16 +49,11 @@
#include "config.h" #include "config.h"
#endif #endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "clutter-animatable.h" #include "clutter-animatable.h"
#include "clutter-interval.h" #include "clutter-interval.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "deprecated/clutter-animatable.h"
#include "deprecated/clutter-animation.h"
typedef ClutterAnimatableIface ClutterAnimatableInterface; typedef ClutterAnimatableIface ClutterAnimatableInterface;
G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT); G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);

View File

@ -55,9 +55,6 @@
#include "clutter-stage-window.h" #include "clutter-stage-window.h"
#include "clutter-version.h" #include "clutter-version.h"
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "deprecated/clutter-backend.h"
#ifdef HAVE_CLUTTER_WAYLAND_COMPOSITOR #ifdef HAVE_CLUTTER_WAYLAND_COMPOSITOR
#include "wayland/clutter-wayland-compositor.h" #include "wayland/clutter-wayland-compositor.h"
#endif /* HAVE_CLUTTER_WAYLAND_COMPOSITOR */ #endif /* HAVE_CLUTTER_WAYLAND_COMPOSITOR */

View File

@ -73,12 +73,10 @@
#include <math.h> #include <math.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "deprecated/clutter-container.h"
#include "clutter-actor.h" #include "clutter-actor.h"
#include "clutter-animatable.h" #include "clutter-animatable.h"
#include "clutter-child-meta.h" #include "clutter-child-meta.h"
#include "clutter-container.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-enum-types.h" #include "clutter-enum-types.h"
#include "clutter-flow-layout.h" #include "clutter-flow-layout.h"

View File

@ -62,8 +62,6 @@
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-units.h" #include "clutter-units.h"
#include "deprecated/clutter-fixed.h"
enum enum
{ {
PROP_0, PROP_0,

View File

@ -160,10 +160,7 @@
#include <glib-object.h> #include <glib-object.h>
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include "clutter-container.h"
#include "deprecated/clutter-container.h"
#include "deprecated/clutter-alpha.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-layout-manager.h" #include "clutter-layout-manager.h"
#include "clutter-layout-meta.h" #include "clutter-layout-meta.h"

View File

@ -49,12 +49,9 @@
#include <math.h> #include <math.h>
#include <cairo.h> #include <cairo.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#define CLUTTER_ENABLE_EXPERIMENTAL_API #define CLUTTER_ENABLE_EXPERIMENTAL_API
#include "clutter-stage.h" #include "clutter-stage.h"
#include "deprecated/clutter-stage.h"
#include "deprecated/clutter-container.h"
#include "clutter-actor-private.h" #include "clutter-actor-private.h"
#include "clutter-backend-private.h" #include "clutter-backend-private.h"

View File

@ -43,8 +43,6 @@
#include "clutter-interval.h" #include "clutter-interval.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "deprecated/clutter-util.h"
/*< private > /*< private >
* _clutter_gettext: * _clutter_gettext:
* @str: a string to localize * @str: a string to localize