[2.0] Remove deprecated clutter_util public API

7 files changed, 0 insertions, 77 deletions

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index c1dbe98fe..9d836046f 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -118,7 +118,6 @@ source_h =					\
 	$(srcdir)/clutter-timeline.h 		\
 	$(srcdir)/clutter-types.h		\
 	$(srcdir)/clutter-units.h 		\
-	$(srcdir)/clutter-util.h 		\
 	$(NULL)
 
 source_c = \
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index ae04fc740..a032e5cc4 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -75,7 +75,6 @@
 #include "clutter-profile.h"
 #include "clutter-stage-manager-private.h"
 #include "clutter-stage-private.h"
-#include "clutter-util.h"
 #include "clutter-version.h" 	/* For flavour */
 #include "clutter-private.h"
 
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 4a917064d..167a463dd 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -55,7 +55,6 @@
 #include "clutter-private.h"
 #include "clutter-scriptable.h"
 #include "clutter-stage-private.h"
-#include "clutter-util.h"
 
 static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
 
diff --git a/clutter/clutter-util.c b/clutter/clutter-util.c
index 46e88d202..68354e2eb 100644
--- a/clutter/clutter-util.c
+++ b/clutter/clutter-util.c
@@ -23,43 +23,14 @@
  *
  */
 
-/**
- * SECTION:clutter-util
- * @short_description: Utility functions
- *
- * Various miscellaneous utilility functions.
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <glib/gi18n-lib.h>
 
-#include "clutter-util.h"
 #include "clutter-main.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;
-}
-
 /*< private >
  * _clutter_gettext:
  * @str: a string to localize
diff --git a/clutter/clutter-util.h b/clutter/clutter-util.h
deleted file mode 100644
index d1fe9f8f1..000000000
--- a/clutter/clutter-util.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Authored By Matthew Allum  <mallum@openedhand.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
-#ifndef __CLUTTER_UTIL_H__
-#define __CLUTTER_UTIL_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#ifndef CLUTTER_DISABLE_DEPRECATED
-
-gint clutter_util_next_p2 (gint a) G_GNUC_DEPRECATED;
-
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __CLUTTER_UTIL_H__ */
diff --git a/clutter/clutter.h b/clutter/clutter.h
index bc59edf94..054211d81 100644
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -99,7 +99,6 @@
 #include "clutter-timeline.h"
 #include "clutter-types.h"
 #include "clutter-units.h"
-#include "clutter-util.h"
 #include "clutter-version.h"
 
 #include "clutter-enum-types.h"
diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c
index 1e3fe29ae..a4f021cec 100644
--- a/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/cogl/clutter-stage-cogl.c
@@ -41,7 +41,6 @@
 #include "clutter-private.h"
 #include "clutter-actor-private.h"
 #include "clutter-stage-private.h"
-#include "clutter-util.h"
 
 #ifdef COGL_HAS_X11_SUPPORT
 static ClutterStageWindowIface *clutter_stage_window_parent_iface = NULL;