diff --git a/cogl/cogl/cogl-deprecated.h b/cogl/cogl/cogl-deprecated.h deleted file mode 100644 index ca56fa18a..000000000 --- a/cogl/cogl/cogl-deprecated.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Cogl - * - * A Low Level GPU Graphics and Utilities API - * - * Copyright (C) 2008,2009 Intel Corporation. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * - */ - -#ifndef COGL_DEPRECATED_H - -#define cogl_color cogl_color_REPLACED_BY_cogl_set_source_color -#define cogl_enable_depth_test cogl_enable_depth_test_RENAMED_TO_cogl_set_depth_test_enabled -#define cogl_enable_backface_culling cogl_enable_backface_culling_RENAMED_TO_cogl_set_backface_culling_enabled - -#define cogl_texture_rectangle cogl_texture_rectangle_REPLACE_BY_cogl_set_source_texture_AND_cogl_rectangle_with_texture_coords - -#define cogl_texture_multiple_rectangles cogl_texture_multiple_rectangles_REPLACED_BY_cogl_set_source_texture_AND_cogl_rectangles_with_texture_coords - -#define cogl_texture_polygon cogl_texture_polygon_REPLACED_BY_cogl_set_source_texture_AND_cogl_polygon - -#endif diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h index d93cb1b09..fb1b99a14 100644 --- a/cogl/cogl/cogl.h +++ b/cogl/cogl/cogl.h @@ -128,11 +128,6 @@ * code has been migrated down into Cogl! */ #include -/* - * API deprecations - */ -#include - /* * Cogl Path api compatability * diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build index 59363b5c5..c2fea5e96 100644 --- a/cogl/cogl/meson.build +++ b/cogl/cogl/meson.build @@ -98,8 +98,6 @@ cogl_headers = [ ] cogl_nonintrospected_headers = [ - 'cogl-deprecated.h', - 'cogl-pango.h', 'cogl-renderer.h', 'cogl-swap-chain.h', 'cogl-onscreen-template.h',