[Cogl] [PATCH 3/4] Remove cogl-deprecated.h

[Damien Lespiau]

From: Damien Lespiau <damien.lespiau at intel.com>

---
 build/win32/vs10/cogl.props     |    2 --
 build/win32/vs9/cogl.vsprops    |    1 -
 cogl/Makefile.am                |    1 -
 cogl/cogl-deprecated.h          |   36 ------------------------------------
 cogl/cogl.h                     |    5 -----
 doc/reference/cogl2/Makefile.am |    1 -
 6 files changed, 0 insertions(+), 46 deletions(-)
 delete mode 100644 cogl/cogl-deprecated.h

diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index d257fc3..2aaf829 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -90,8 +90,6 @@ copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
 copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
-copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
 copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
 copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 1aedc44..f45cc90 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -123,7 +123,6 @@ copy ..\..\..\cogl\cogl-attribute-buffer.h $(OutDir)\include\cogl-$(CoglApiVersi
 copy ..\..\..\cogl\cogl-bitmap.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-color.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-deprecated.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-depth-state.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-euler.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-fixed.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index ef703a5..1f24aa2 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -478,7 +478,6 @@ nodist_libcogl2_la_SOURCES = $(BUILT_SOURCES)
 # Cogl installed headers
 cogl_headers = \
 	$(cogl_1_public_h) \
-	$(srcdir)/cogl-deprecated.h \
 	$(srcdir)/cogl-pango.h \
 	$(NULL)
 
diff --git a/cogl/cogl-deprecated.h b/cogl/cogl-deprecated.h
deleted file mode 100644
index aee5b1c..0000000
--- a/cogl/cogl-deprecated.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Cogl
- *
- * An object oriented GL/GLES Abstraction/Utility Layer
- *
- * Copyright (C) 2008,2009 Intel Corporation.
- *
- * 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/>.
- *
- *
- */
-
-#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.h b/cogl/cogl.h
index f2c915b..6fcb76e 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -116,11 +116,6 @@
 #include <cogl/cogl-sdl.h>
 #endif
 
-/*
- * API deprecations
- */
-#include <cogl/cogl-deprecated.h>
-
 /**
  * SECTION:cogl
  * @short_description: General purpose API
diff --git a/doc/reference/cogl2/Makefile.am b/doc/reference/cogl2/Makefile.am
index 6e0c2b6..4e3d901 100644
--- a/doc/reference/cogl2/Makefile.am
+++ b/doc/reference/cogl2/Makefile.am
@@ -101,7 +101,6 @@ IGNORE_HFILES=\
 	cogl-clip-stack.h 			\
 	cogl-debug.h 				\
 	cogl-defines.h 				\
-	cogl-deprecated.h 			\
 	cogl-internal.h 			\
 	cogl-matrix-mesa.h 			\
 	cogl-matrix-stack.h 			\
-- 
1.7.7.5