mirror of
https://github.com/brl/mutter.git
synced 2024-11-25 01:20:42 -05:00
clutter: Remove deprecated/clutter-util.h
https://gitlab.gnome.org/GNOME/mutter/merge_requests/445
This commit is contained in:
parent
a81435ab5f
commit
75071aba68
@ -37,7 +37,6 @@
|
|||||||
#include "deprecated/clutter-texture.h"
|
#include "deprecated/clutter-texture.h"
|
||||||
#include "deprecated/clutter-timeline.h"
|
#include "deprecated/clutter-timeline.h"
|
||||||
#include "deprecated/clutter-timeout-pool.h"
|
#include "deprecated/clutter-timeout-pool.h"
|
||||||
#include "deprecated/clutter-util.h"
|
|
||||||
|
|
||||||
#undef __CLUTTER_DEPRECATED_H_INSIDE__
|
#undef __CLUTTER_DEPRECATED_H_INSIDE__
|
||||||
|
|
||||||
|
@ -39,29 +39,6 @@
|
|||||||
#include "clutter-interval.h"
|
#include "clutter-interval.h"
|
||||||
#include "clutter-private.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
|
/* Help macros to scale from OpenGL <-1,1> coordinates system to
|
||||||
* window coordinates ranging [0,window-size]
|
* window coordinates ranging [0,window-size]
|
||||||
*/
|
*/
|
||||||
|
@ -66,7 +66,6 @@
|
|||||||
|
|
||||||
#include "deprecated/clutter-shader.h"
|
#include "deprecated/clutter-shader.h"
|
||||||
#include "deprecated/clutter-texture.h"
|
#include "deprecated/clutter-texture.h"
|
||||||
#include "deprecated/clutter-util.h"
|
|
||||||
|
|
||||||
typedef struct _ClutterTextureAsyncData ClutterTextureAsyncData;
|
typedef struct _ClutterTextureAsyncData ClutterTextureAsyncData;
|
||||||
|
|
||||||
|
@ -1,40 +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 <clutter/clutter-types.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
CLUTTER_DEPRECATED
|
|
||||||
gint clutter_util_next_p2 (gint a);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif /* __CLUTTER_UTIL_H__ */
|
|
@ -250,7 +250,6 @@ clutter_deprecated_headers = [
|
|||||||
'deprecated/clutter-texture.h',
|
'deprecated/clutter-texture.h',
|
||||||
'deprecated/clutter-timeline.h',
|
'deprecated/clutter-timeline.h',
|
||||||
'deprecated/clutter-timeout-pool.h',
|
'deprecated/clutter-timeout-pool.h',
|
||||||
'deprecated/clutter-util.h',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
clutter_deprecated_sources = [
|
clutter_deprecated_sources = [
|
||||||
|
Loading…
Reference in New Issue
Block a user