[libgda/metat: 9/9] sqlite-provider: use G_DEFINE_TYPE
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda/metat: 9/9] sqlite-provider: use G_DEFINE_TYPE
- Date: Wed, 7 Nov 2018 15:37:22 +0000 (UTC)
commit 78438d2f632feca822118b63bda13fa1f379c054
Author: Daniel Espinosa <esodan gmail com>
Date: Mon Aug 20 12:01:41 2018 -0500
sqlite-provider: use G_DEFINE_TYPE
libgda/sqlite/gda-sqlite-provider.c | 59 ++-----------------------------------
1 file changed, 2 insertions(+), 57 deletions(-)
---
diff --git a/libgda/sqlite/gda-sqlite-provider.c b/libgda/sqlite/gda-sqlite-provider.c
index 54794e30b..1aab79d85 100644
--- a/libgda/sqlite/gda-sqlite-provider.c
+++ b/libgda/sqlite/gda-sqlite-provider.c
@@ -250,10 +250,7 @@ pending_blobs_free_list (GSList *blist)
/*
* GObject methods
*/
-static void gda_sqlite_provider_class_init (GdaSqliteProviderClass *klass);
-static void gda_sqlite_provider_init (GdaSqliteProvider *provider,
- GdaSqliteProviderClass *klass);
-static GObjectClass *parent_class = NULL;
+G_DEFINE_TYPE(GdaSqliteProvider, gda_sqlite_provider, GDA_TYPE_SERVER_PROVIDER)
/*
* GdaServerProvider's virtual methods
@@ -749,8 +746,6 @@ GdaServerProviderMeta sqlite_meta_functions = {
static void
gda_sqlite_provider_class_init (GdaSqliteProviderClass *klass)
{
- parent_class = g_type_class_peek_parent (klass);
-
/* set virtual functions */
gda_server_provider_set_impl_functions (GDA_SERVER_PROVIDER_CLASS (klass),
GDA_SERVER_PROVIDER_FUNCTIONS_BASE,
@@ -764,7 +759,7 @@ gda_sqlite_provider_class_init (GdaSqliteProviderClass *klass)
}
static void
-gda_sqlite_provider_init (GdaSqliteProvider *sqlite_prv, G_GNUC_UNUSED GdaSqliteProviderClass *klass)
+gda_sqlite_provider_init (GdaSqliteProvider *sqlite_prv)
{
g_mutex_lock (&init_mutex);
@@ -790,56 +785,6 @@ gda_sqlite_provider_init (GdaSqliteProvider *sqlite_prv, G_GNUC_UNUSED GdaSqlite
g_mutex_unlock (&init_mutex);
}
-GType
-gda_sqlite_provider_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0)) {
- static GMutex registering;
- static GTypeInfo info = {
- sizeof (GdaSqliteProviderClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) gda_sqlite_provider_class_init,
- NULL, NULL,
- sizeof (GdaSqliteProvider),
- 0,
- (GInstanceInitFunc) gda_sqlite_provider_init,
- 0
- };
- g_mutex_lock (®istering);
- if (type == 0) {
-#ifdef WITH_BDBSQLITE
- type = g_type_register_static (GDA_TYPE_SERVER_PROVIDER, CLASS_PREFIX "Provider",
&info, 0);
-#else
- #ifdef STATIC_SQLITE
- type = g_type_register_static (GDA_TYPE_SERVER_PROVIDER, CLASS_PREFIX "Provider",
&info, 0);
- #else
- #ifdef HAVE_SQLITE
- GModule *module2;
-
- module2 = find_sqlite_library ("libsqlite3");
- if (module2)
- load_symbols (module2);
- if (s3r)
- type = g_type_register_static (GDA_TYPE_SERVER_PROVIDER, CLASS_PREFIX
"Provider", &info, 0);
- else
- g_warning (_("Can't find libsqlite3." G_MODULE_SUFFIX " file."));
- #else
- type = g_type_register_static (GDA_TYPE_SERVER_PROVIDER, CLASS_PREFIX "Provider",
&info, 0);
- #endif
- #endif
-#endif
- }
- g_mutex_unlock (®istering);
- }
-
- return type;
-}
-
-
-
static GdaWorker *
gda_sqlite_provider_create_worker (GdaServerProvider *provider, gboolean for_cnc)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]