diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h index 46cbf897a..706ed94f8 100644 --- a/clutter/clutter/clutter-deprecated.h +++ b/clutter/clutter/clutter-deprecated.h @@ -37,7 +37,6 @@ #include "deprecated/clutter-texture.h" #include "deprecated/clutter-timeline.h" #include "deprecated/clutter-timeout-pool.h" -#include "deprecated/clutter-util.h" #undef __CLUTTER_DEPRECATED_H_INSIDE__ diff --git a/clutter/clutter/clutter-util.c b/clutter/clutter/clutter-util.c index 698cc200b..83e15c041 100644 --- a/clutter/clutter/clutter-util.c +++ b/clutter/clutter/clutter-util.c @@ -39,29 +39,6 @@ #include "clutter-interval.h" #include "clutter-private.h" -#include "deprecated/clutter-util.h" - -/** - * clutter_util_next_p2: - * @a: Value to get the next power - * - * Calculates the nearest power of two, greater than or equal to @a. - * - * Return value: The nearest power of two, greater or equal to @a. - * - * Deprecated: 1.2 - */ -gint -clutter_util_next_p2 (gint a) -{ - int rval = 1; - - while (rval < a) - rval <<= 1; - - return rval; -} - /* Help macros to scale from OpenGL <-1,1> coordinates system to * window coordinates ranging [0,window-size] */ diff --git a/clutter/clutter/deprecated/clutter-texture.c b/clutter/clutter/deprecated/clutter-texture.c index f0747595b..07e9c3324 100644 --- a/clutter/clutter/deprecated/clutter-texture.c +++ b/clutter/clutter/deprecated/clutter-texture.c @@ -66,7 +66,6 @@ #include "deprecated/clutter-shader.h" #include "deprecated/clutter-texture.h" -#include "deprecated/clutter-util.h" typedef struct _ClutterTextureAsyncData ClutterTextureAsyncData; diff --git a/clutter/clutter/deprecated/clutter-util.h b/clutter/clutter/deprecated/clutter-util.h deleted file mode 100644 index 26fb7d860..000000000 --- a/clutter/clutter/deprecated/clutter-util.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Clutter. - * - * An OpenGL based 'interactive canvas' library. - * - * Authored By Matthew Allum - * - * Copyright (C) 2006 OpenedHand - * - * 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_UTIL_H__ -#define __CLUTTER_UTIL_H__ - -#include - -G_BEGIN_DECLS - -CLUTTER_DEPRECATED -gint clutter_util_next_p2 (gint a); - -G_END_DECLS - -#endif /* __CLUTTER_UTIL_H__ */ diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index d8387bfde..3f8af2d07 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -250,7 +250,6 @@ clutter_deprecated_headers = [ 'deprecated/clutter-texture.h', 'deprecated/clutter-timeline.h', 'deprecated/clutter-timeout-pool.h', - 'deprecated/clutter-util.h', ] clutter_deprecated_sources = [