diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h index c26c68175..1673be861 100644 --- a/clutter/clutter/clutter-deprecated.h +++ b/clutter/clutter/clutter-deprecated.h @@ -17,7 +17,6 @@ #include "deprecated/clutter-container.h" #include "deprecated/clutter-group.h" #include "deprecated/clutter-keysyms.h" -#include "deprecated/clutter-main.h" #include "deprecated/clutter-rectangle.h" #include "deprecated/clutter-stage-manager.h" #include "deprecated/clutter-stage.h" diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c index 7b0b3fdfe..6dc36e3c8 100644 --- a/clutter/clutter/clutter-main.c +++ b/clutter/clutter/clutter-main.c @@ -933,21 +933,6 @@ _clutter_threads_release_lock (void) (* clutter_threads_unlock) (); } -/** - * clutter_get_debug_enabled: - * - * Check if Clutter has debugging enabled. - * - * Return value: %FALSE - * - * Deprecated: 1.10: This function does not do anything. - */ -gboolean -clutter_get_debug_enabled (void) -{ - return FALSE; -} - void _clutter_context_lock (void) { @@ -1015,36 +1000,6 @@ _clutter_context_get_default (void) return retval; } -/** - * clutter_get_timestamp: - * - * Returns the approximate number of microseconds passed since Clutter was - * intialised. - * - * This function shdould not be used by application code. - * - * The output of this function depends on whether Clutter was configured to - * enable its debugging code paths, so it's less useful than intended. - * - * Since Clutter 1.10, this function is an alias to g_get_monotonic_time() - * if Clutter was configured to enable the debugging code paths. - * - * Return value: Number of microseconds since clutter_init() was called, or - * zero if Clutter was not configured with debugging code paths. - * - * Deprecated: 1.10: Use #GTimer or g_get_monotonic_time() for a proper - * timing source - */ -gulong -clutter_get_timestamp (void) -{ -#ifdef CLUTTER_ENABLE_DEBUG - return (gulong) g_get_monotonic_time (); -#else - return 0L; -#endif -} - static gboolean clutter_arg_direction_cb (const char *key, const char *value, @@ -2447,24 +2402,6 @@ clutter_get_default_frame_rate (void) return context->frame_rate; } -/** - * clutter_set_default_frame_rate: - * @frames_per_sec: the new default frame rate - * - * Sets the default frame rate. This frame rate will be used to limit - * the number of frames drawn if Clutter is not able to synchronize - * with the vertical refresh rate of the display. When synchronization - * is possible, this value is ignored. - * - * Since: 0.6 - * - * Deprecated: 1.10: This function does not do anything any more. - */ -void -clutter_set_default_frame_rate (guint frames_per_sec) -{ -} - static void on_grab_actor_destroy (ClutterActor *actor, ClutterInputDevice *device) diff --git a/clutter/clutter/deprecated/clutter-main.h b/clutter/clutter/deprecated/clutter-main.h deleted file mode 100644 index 1551c8125..000000000 --- a/clutter/clutter/deprecated/clutter-main.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Clutter. - * - * An OpenGL based 'interactive canvas' library. - * - * Copyright (C) 2011 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 . - */ - -#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef __CLUTTER_MAIN_DEPRECATED_H__ -#define __CLUTTER_MAIN_DEPRECATED_H__ - -#include -#include - -G_BEGIN_DECLS - -CLUTTER_DEPRECATED -void clutter_set_default_frame_rate (guint frames_per_sec); - -CLUTTER_DEPRECATED -gulong clutter_get_timestamp (void); - -CLUTTER_DEPRECATED -gboolean clutter_get_debug_enabled (void); - -G_END_DECLS - -#endif /* __CLUTTER_MAIN_DEPRECATED_H__ */ diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index ab9f3d47c..674f96a6c 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -234,7 +234,6 @@ clutter_deprecated_headers = [ 'deprecated/clutter-container.h', 'deprecated/clutter-group.h', 'deprecated/clutter-keysyms.h', - 'deprecated/clutter-main.h', 'deprecated/clutter-rectangle.h', 'deprecated/clutter-stage-manager.h', 'deprecated/clutter-stage.h',