From 62330f273dd7e244b3ee6aa704ed96a862ee5ce8 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Thu, 31 Mar 2022 14:47:57 -0300
Subject: [PATCH] cogl: Drop CoglHandleObject and CoglHandleClass

They're just typedefs to CoglObject and CoglObjectClass, respectively,
and the latter is unused already. The former is used in a couple of
deprecated headers, which can easily be changed.

Change all CoglHandleObject instances to CoglObject, and drop the types

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2355>
---
 cogl/cogl/cogl-object-private.h             | 4 ----
 cogl/cogl/deprecated/cogl-program-private.h | 2 +-
 cogl/cogl/deprecated/cogl-shader-private.h  | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cogl/cogl/cogl-object-private.h b/cogl/cogl/cogl-object-private.h
index 83f42b410..ac24f188c 100644
--- a/cogl/cogl/cogl-object-private.h
+++ b/cogl/cogl/cogl-object-private.h
@@ -38,10 +38,6 @@
 #include "cogl-object.h"
 #include "cogl-debug.h"
 
-/* For compatibility until all components have been converted */
-typedef struct _CoglObjectClass CoglHandleClass;
-typedef struct _CoglObject      CoglHandleObject;
-
 /* XXX: sadly we didn't fully consider when we copied the cairo API
  * for _set_user_data that the callback doesn't get a pointer to the
  * instance which is desired in most cases. This means you tend to end
diff --git a/cogl/cogl/deprecated/cogl-program-private.h b/cogl/cogl/deprecated/cogl-program-private.h
index 38b5f59d8..86ebdfd04 100644
--- a/cogl/cogl/deprecated/cogl-program-private.h
+++ b/cogl/cogl/deprecated/cogl-program-private.h
@@ -38,7 +38,7 @@ typedef struct _CoglProgram CoglProgram;
 
 struct _CoglProgram
 {
-  CoglHandleObject _parent;
+  CoglObject _parent;
 
   GSList *attached_shaders;
 
diff --git a/cogl/cogl/deprecated/cogl-shader-private.h b/cogl/cogl/deprecated/cogl-shader-private.h
index ae47f1879..329a4ffac 100644
--- a/cogl/cogl/deprecated/cogl-shader-private.h
+++ b/cogl/cogl/deprecated/cogl-shader-private.h
@@ -40,7 +40,7 @@ typedef struct _CoglShader CoglShader;
 
 struct _CoglShader
 {
-  CoglHandleObject _parent;
+  CoglObject _parent;
   GLuint gl_handle;
   CoglPipeline *compilation_pipeline;
   CoglShaderType type;