[glib-networking/mcatanzaro/base-rebase: 17/33] gtlsdatabase-openssl: Use G_DECLARE_DERIVABLE_TYPE



commit 67c08a3d82e28cf3f8ff2ea512732fdee0e9ad08
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Fri Apr 5 15:24:15 2019 -0500

    gtlsdatabase-openssl: Use G_DECLARE_DERIVABLE_TYPE

 tls/openssl/gtlsdatabase-openssl.h | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/tls/openssl/gtlsdatabase-openssl.h b/tls/openssl/gtlsdatabase-openssl.h
index 740a90c..f37d3ac 100644
--- a/tls/openssl/gtlsdatabase-openssl.h
+++ b/tls/openssl/gtlsdatabase-openssl.h
@@ -38,27 +38,14 @@ typedef enum {
 } GTlsDatabaseOpensslAssertion;
 
 #define G_TYPE_TLS_DATABASE_OPENSSL            (g_tls_database_openssl_get_type ())
-#define G_TLS_DATABASE_OPENSSL(inst)           (G_TYPE_CHECK_INSTANCE_CAST ((inst), 
G_TYPE_TLS_DATABASE_OPENSSL, GTlsDatabaseOpenssl))
-#define G_TLS_DATABASE_OPENSSL_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), 
G_TYPE_TLS_DATABASE_OPENSSL, GTlsDatabaseOpensslClass))
-#define G_IS_TLS_DATABASE_OPENSSL(inst)        (G_TYPE_CHECK_INSTANCE_TYPE ((inst), 
G_TYPE_TLS_DATABASE_OPENSSL))
-#define G_IS_TLS_DATABASE_OPENSSL_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), 
G_TYPE_TLS_DATABASE_OPENSSL))
-#define G_TLS_DATABASE_OPENSSL_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), 
G_TYPE_TLS_DATABASE_OPENSSL, GTlsDatabaseOpensslClass))
 
-typedef struct _GTlsDatabaseOpensslClass GTlsDatabaseOpensslClass;
-typedef struct _GTlsDatabaseOpenssl      GTlsDatabaseOpenssl;
+G_DECLARE_DERIVABLE_TYPE (GTlsDatabaseOpenssl, g_tls_database_openssl, G, TLS_DATABASE_OPENSSL, GTlsDatabase)
 
 struct _GTlsDatabaseOpensslClass
 {
   GTlsDatabaseClass parent_class;
 };
 
-struct _GTlsDatabaseOpenssl
-{
-  GTlsDatabase parent_instance;
-};
-
-GType          g_tls_database_openssl_get_type              (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif /* __G_TLS_DATABASE_OPENSSL_H___ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]