From cf9c4e651d0527be08f889a246c3366171437e4b Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 13 Feb 2012 15:04:18 +0000 Subject: [PATCH] timeline: Move deprecated methods into a separate header --- clutter/Makefile.am | 1 + clutter/clutter-deprecated.h | 1 + clutter/clutter-timeline.h | 10 ------- clutter/deprecated/clutter-timeline.h | 41 +++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 clutter/deprecated/clutter-timeline.h diff --git a/clutter/Makefile.am b/clutter/Makefile.am index b78b26328..71f3a4473 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -247,6 +247,7 @@ deprecated_h = \ $(srcdir)/deprecated/clutter-score.h \ $(srcdir)/deprecated/clutter-shader.h \ $(srcdir)/deprecated/clutter-stage.h \ + $(srcdir)/deprecated/clutter-timeline.h \ $(srcdir)/deprecated/clutter-timeout-pool.h \ $(NULL) diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h index 175ac7ae5..f58033231 100644 --- a/clutter/clutter-deprecated.h +++ b/clutter/clutter-deprecated.h @@ -23,6 +23,7 @@ #include "deprecated/clutter-score.h" #include "deprecated/clutter-shader.h" #include "deprecated/clutter-stage.h" +#include "deprecated/clutter-timeline.h" #include "deprecated/clutter-timeout-pool.h" #undef __CLUTTER_DEPRECATED_H_INSIDE__ diff --git a/clutter/clutter-timeline.h b/clutter/clutter-timeline.h index 8c7a0f092..0a2018736 100644 --- a/clutter/clutter-timeline.h +++ b/clutter/clutter-timeline.h @@ -138,16 +138,6 @@ gboolean clutter_timeline_has_marker (Clutter void clutter_timeline_advance_to_marker (ClutterTimeline *timeline, const gchar *marker_name); -CLUTTER_DEPRECATED_FOR(clutter_timeline_new) -ClutterTimeline * clutter_timeline_clone (ClutterTimeline *timeline); - -CLUTTER_DEPRECATED_FOR(clutter_timeline_set_repeat_count) -void clutter_timeline_set_loop (ClutterTimeline *timeline, - gboolean loop); - -CLUTTER_DEPRECATED_FOR(clutter_timeline_get_repeat_count) -gboolean clutter_timeline_get_loop (ClutterTimeline *timeline); - G_END_DECLS #endif /* _CLUTTER_TIMELINE_H__ */ diff --git a/clutter/deprecated/clutter-timeline.h b/clutter/deprecated/clutter-timeline.h new file mode 100644 index 000000000..950362e90 --- /dev/null +++ b/clutter/deprecated/clutter-timeline.h @@ -0,0 +1,41 @@ +/* + * Clutter. + * + * An OpenGL based 'interactive canvas' library. + * + * Copyright (C) 2012 Intel Corp + * + * 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 __CLUTTER_TIMELINE_PRIVATE_H__ +#define __CLUTTER_TIMELINE_PRIVATE_H__ + +#include + +G_BEGIN_DECLS + +CLUTTER_DEPRECATED_FOR(clutter_timeline_new) +ClutterTimeline * clutter_timeline_clone (ClutterTimeline *timeline); + +CLUTTER_DEPRECATED_FOR(clutter_timeline_set_repeat_count) +void clutter_timeline_set_loop (ClutterTimeline *timeline, + gboolean loop); + +CLUTTER_DEPRECATED_FOR(clutter_timeline_get_repeat_count) +gboolean clutter_timeline_get_loop (ClutterTimeline *timeline); + +G_END_DECLS + +#endif /* __CLUTTER_TIMELINE_PRIVATE_H__ */