[libgda] GdaCapiParser: ported to G_DEFINE/G_DECLARE



commit fbf02fe2fbbebb26fb09bf9899e13be291018c5a
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Apr 4 12:54:29 2019 -0600

    GdaCapiParser: ported to G_DEFINE/G_DECLARE

 .../skel-implementation/capi/gda-capi-parser.c     | 31 ++--------------------
 .../skel-implementation/capi/gda-capi-parser.h     | 17 +-----------
 2 files changed, 3 insertions(+), 45 deletions(-)
---
diff --git a/providers/skel-implementation/capi/gda-capi-parser.c 
b/providers/skel-implementation/capi/gda-capi-parser.c
index 1ab88a352..4a3857c02 100644
--- a/providers/skel-implementation/capi/gda-capi-parser.c
+++ b/providers/skel-implementation/capi/gda-capi-parser.c
@@ -32,34 +32,7 @@
 static void gda_capi_parser_class_init (GdaCapiParserClass *klass);
 static void gda_capi_parser_init (GdaCapiParser *stmt);
 
-GType
-gda_capi_parser_get_type (void)
-{
-       static GType type = 0;
-
-       if (G_UNLIKELY (type == 0)) {
-               static GMutex registering;
-               static const GTypeInfo info = {
-                       sizeof (GdaCapiParserClass),
-                       (GBaseInitFunc) NULL,
-                       (GBaseFinalizeFunc) NULL,
-                       (GClassInitFunc) gda_capi_parser_class_init,
-                       NULL,
-                       NULL,
-                       sizeof (GdaCapiParser),
-                       0,
-                       (GInstanceInitFunc) gda_capi_parser_init,
-                       0
-               };
-               
-               g_mutex_lock (&registering);
-               if (type == 0)
-                       type = g_type_register_static (GDA_TYPE_SQL_PARSER, "GdaCapiParser", &info, 0);
-               g_mutex_unlock (&registering);
-       }
-       return type;
-}
-
+G_DEFINE_TYPE (GdaCapiParser, gda_capi_parser, GDA_TYPE_SQL_PARSER)
 /*
  * The interface to the LEMON-generated parser
  */
@@ -77,7 +50,7 @@ gda_capi_parser_class_init (GdaCapiParserClass * klass)
        pclass->parser_free = gda_lemon_capi_parserFree;
        pclass->parser_trace = gda_lemon_capi_parserTrace;
        pclass->parser_parse = gda_lemon_capi_parser;
-       pclass->parser_tokens_trans = capi_parser_tokens;
+       pclass->parser_tokens_trans = NULL;
 }
 
 static void
diff --git a/providers/skel-implementation/capi/gda-capi-parser.h 
b/providers/skel-implementation/capi/gda-capi-parser.h
index acfb821b4..2fca9d226 100644
--- a/providers/skel-implementation/capi/gda-capi-parser.h
+++ b/providers/skel-implementation/capi/gda-capi-parser.h
@@ -31,22 +31,7 @@
 G_BEGIN_DECLS
 
 #define GDA_TYPE_CAPI_PARSER            (gda_capi_parser_get_type())
-#define GDA_CAPI_PARSER(obj)            (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_CAPI_PARSER, 
GdaCapiParser))
-#define GDA_CAPI_PARSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_CAPI_PARSER, 
GdaCapiParserClass))
-#define GDA_IS_CAPI_PARSER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_CAPI_PARSER))
-#define GDA_IS_CAPI_PARSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDA_TYPE_CAPI_PARSER))
-
-typedef struct _GdaCapiParser GdaCapiParser;
-typedef struct _GdaCapiParserClass GdaCapiParserClass;
-typedef struct _GdaCapiParserPrivate GdaCapiParserPrivate;
-
-/* struct for the object's data */
-struct _GdaCapiParser
-{
-       GdaSqlParser          object;
-       GdaCapiParserPrivate *priv;
-};
-
+G_DECLARE_DERIVABLE_TYPE (GdaCapiParser, gda_capi_parser, GDA, CAPI_PARSER, GdaSqlParser)
 /* struct for the object's class */
 struct _GdaCapiParserClass
 {


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