GNOME.org
 

[nautilus-actions] Core API: rename GType macros according to GObject usages

commit 3c69d079b44d1401859ecbbded0c0cd2507d7722
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jan 13 11:12:03 2012 +0100

    Core API: rename GType macros according to GObject usages

 ChangeLog                   |   29 +++++++++++++++++++++++++++++
 src/core/na-import-mode.c   |    2 +-
 src/core/na-import-mode.h   |   16 ++++++++--------
 src/core/na-importer-ask.c  |    2 +-
 src/core/na-importer-ask.h  |   12 ++++++------
 src/core/na-module.c        |    2 +-
 src/core/na-module.h        |   12 ++++++------
 src/core/na-pivot.c         |    4 ++--
 src/core/na-pivot.h         |   12 ++++++------
 src/core/na-selected-info.c |    2 +-
 src/core/na-selected-info.h |   12 ++++++------
 src/core/na-tokens.c        |    4 ++--
 src/core/na-tokens.h        |   12 ++++++------
 src/core/na-updater.c       |    4 ++--
 src/core/na-updater.h       |   12 ++++++------
 src/test/test-module.c      |   14 +++++++-------
 16 files changed, 90 insertions(+), 61 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 01f12d1..dcdc569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,34 @@
 2012-01-13 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/na-import-mode.c:
+	* src/core/na-import-mode.h:
+	NA_IMPORT_MODE_TYPE GType macro renamed as NA_TYPE_IMPORT_MODE.
+
+	* src/core/na-importer-ask.c:
+	* src/core/na-importer-ask.h:
+	NA_IMPORTER_ASK_TYPE GType macro renamed as NA_TYPE_IMPORTER_ASK.
+
+	* src/core/na-module.c:
+	* src/core/na-module.h:
+	* src/test/test-module.c:
+	NA_MODULE_TYPE GType macro renamed as NA_TYPE_MODULE.
+
+	* src/core/na-pivot.c:
+	* src/core/na-pivot.h:
+	NA_PIVOT_TYPE GType macro renamed as NA_TYPE_PIVOT.
+
+	* src/core/na-selected-info.c:
+	* src/core/na-selected-info.h:
+	NA_SELECTED_INFO_TYPE GType macro renamed as NA_TYPE_SELECTED_INFO.
+
+	* src/core/na-tokens.c:
+	* src/core/na-tokens.h:
+	NA_TOKENS_TYPE GType macro renamed as NA_TYPE_TOKENS.
+
+	* src/core/na-updater.c:
+	* src/core/na-updater.h:
+	NA_UPDATER_TYPE GType macro renamed as NA_TYPE_UPDATER.
+
 	* src/api/na-boxed.h:
 	* src/core/na-boxed.c:
 	NA_BOXED_TYPE GType macro renamed as NA_TYPE_BOXED.
diff --git a/src/core/na-import-mode.c b/src/core/na-import-mode.c
index 07090f0..521902c 100644
--- a/src/core/na-import-mode.c
+++ b/src/core/na-import-mode.c
@@ -437,7 +437,7 @@ na_import_mode_new( guint mode_id )
 {
 	NAImportMode *mode;
 
-	mode = g_object_new( NA_IMPORT_MODE_TYPE, NULL );
+	mode = g_object_new( NA_TYPE_IMPORT_MODE, NULL );
 
 	mode->private->id = mode_id;
 
diff --git a/src/core/na-import-mode.h b/src/core/na-import-mode.h
index 2dfc5f3..ac6530c 100644
--- a/src/core/na-import-mode.h
+++ b/src/core/na-import-mode.h
@@ -44,14 +44,14 @@
 
 G_BEGIN_DECLS
 
-#define NA_IMPORT_MODE_TYPE           ( na_import_mode_get_type())
-#define NA_IMPORT_MODE( o )           ( G_TYPE_CHECK_INSTANCE_CAST( o, NA_IMPORT_MODE_TYPE, NAImportMode ))
-#define NA_IMPORT_MODE_CLASS( c )     ( G_TYPE_CHECK_CLASS_CAST( c, NA_IMPORT_MODE_TYPE, NAImportModeClass ))
-#define NA_IS_IMPORT_MODE( o )        ( G_TYPE_CHECK_INSTANCE_TYPE( o, NA_IMPORT_MODE_TYPE ))
-#define NA_IS_IMPORT_MODE_CLASS( c )  ( G_TYPE_CHECK_CLASS_TYPE(( c ), NA_IMPORT_MODE_TYPE ))
-#define NA_IMPORT_MODE_GET_CLASS( o ) ( G_TYPE_INSTANCE_GET_CLASS(( o ), NA_IMPORT_MODE_TYPE, NAImportModeClass ))
+#define NA_TYPE_IMPORT_MODE                ( na_import_mode_get_type())
+#define NA_IMPORT_MODE( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_IMPORT_MODE, NAImportMode ))
+#define NA_IMPORT_MODE_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_IMPORT_MODE, NAImportModeClass ))
+#define NA_IS_IMPORT_MODE( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_IMPORT_MODE ))
+#define NA_IS_IMPORT_MODE_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_IMPORT_MODE ))
+#define NA_IMPORT_MODE_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_IMPORT_MODE, NAImportModeClass ))
 
-typedef struct _NAImportModePrivate      NAImportModePrivate;
+typedef struct _NAImportModePrivate        NAImportModePrivate;
 
 typedef struct {
 	GObject              parent;
@@ -59,7 +59,7 @@ typedef struct {
 }
 	NAImportMode;
 
-typedef struct _NAImportModeClassPrivate NAImportModeClassPrivate;
+typedef struct _NAImportModeClassPrivate   NAImportModeClassPrivate;
 
 typedef struct {
 	GObjectClass              parent;
diff --git a/src/core/na-importer-ask.c b/src/core/na-importer-ask.c
index a43d9b6..8cd6473 100644
--- a/src/core/na-importer-ask.c
+++ b/src/core/na-importer-ask.c
@@ -253,7 +253,7 @@ import_ask_new( GtkWindow *parent )
 		dialog = st_dialog;
 
 	} else {
-		dialog = g_object_new( NA_IMPORTER_ASK_TYPE, NULL );
+		dialog = g_object_new( NA_TYPE_IMPORTER_ASK, NULL );
 
 		builder = gtk_builder_new();
 		error = NULL;
diff --git a/src/core/na-importer-ask.h b/src/core/na-importer-ask.h
index ba5f7f3..6ad664e 100644
--- a/src/core/na-importer-ask.h
+++ b/src/core/na-importer-ask.h
@@ -48,12 +48,12 @@
 
 G_BEGIN_DECLS
 
-#define NA_IMPORTER_ASK_TYPE                ( na_importer_ask_get_type())
-#define NA_IMPORTER_ASK( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_IMPORTER_ASK_TYPE, NAImporterAsk ))
-#define NA_IMPORTER_ASK_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_IMPORTER_ASK_TYPE, NAImporterAskClass ))
-#define NA_IS_IMPORTER_ASK( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_IMPORTER_ASK_TYPE ))
-#define NA_IS_IMPORTER_ASK_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_IMPORTER_ASK_TYPE ))
-#define NA_IMPORTER_ASK_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_IMPORTER_ASK_TYPE, NAImporterAskClass ))
+#define NA_TYPE_IMPORTER_ASK                ( na_importer_ask_get_type())
+#define NA_IMPORTER_ASK( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_IMPORTER_ASK, NAImporterAsk ))
+#define NA_IMPORTER_ASK_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_IMPORTER_ASK, NAImporterAskClass ))
+#define NA_IS_IMPORTER_ASK( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_IMPORTER_ASK ))
+#define NA_IS_IMPORTER_ASK_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_IMPORTER_ASK ))
+#define NA_IMPORTER_ASK_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_IMPORTER_ASK, NAImporterAskClass ))
 
 typedef struct _NAImporterAskPrivate        NAImporterAskPrivate;
 
diff --git a/src/core/na-module.c b/src/core/na-module.c
index 6f4db0b..8ac47f5 100644
--- a/src/core/na-module.c
+++ b/src/core/na-module.c
@@ -282,7 +282,7 @@ module_new( const gchar *fname )
 {
 	NAModule *module;
 
-	module = g_object_new( NA_MODULE_TYPE, NULL );
+	module = g_object_new( NA_TYPE_MODULE, NULL );
 	module->private->path = g_strdup( fname );
 
 	if( !g_type_module_use( G_TYPE_MODULE( module )) || !is_a_na_plugin( module )){
diff --git a/src/core/na-module.h b/src/core/na-module.h
index a93f45a..9ce1c87 100644
--- a/src/core/na-module.h
+++ b/src/core/na-module.h
@@ -68,12 +68,12 @@
 
 G_BEGIN_DECLS
 
-#define NA_MODULE_TYPE                ( na_module_get_type())
-#define NA_MODULE( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_MODULE_TYPE, NAModule ))
-#define NA_MODULE_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_MODULE_TYPE, NAModuleClass ))
-#define NA_IS_MODULE( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_MODULE_TYPE ))
-#define NA_IS_MODULE_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_MODULE_TYPE ))
-#define NA_MODULE_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_MODULE_TYPE, NAModuleClass ))
+#define NA_TYPE_MODULE                ( na_module_get_type())
+#define NA_MODULE( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_MODULE, NAModule ))
+#define NA_MODULE_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_MODULE, NAModuleClass ))
+#define NA_IS_MODULE( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_MODULE ))
+#define NA_IS_MODULE_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_MODULE ))
+#define NA_MODULE_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_MODULE, NAModuleClass ))
 
 typedef struct _NAModulePrivate       NAModulePrivate;
 
diff --git a/src/core/na-pivot.c b/src/core/na-pivot.c
index ab85b68..fdc931b 100644
--- a/src/core/na-pivot.c
+++ b/src/core/na-pivot.c
@@ -186,7 +186,7 @@ class_init( NAPivotClass *klass )
 	 */
 	st_signals[ ITEMS_CHANGED ] = g_signal_new(
 				PIVOT_SIGNAL_ITEMS_CHANGED,
-				NA_PIVOT_TYPE,
+				NA_TYPE_PIVOT,
 				G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 				0,									/* class offset */
 				NULL,								/* accumulator */
@@ -392,7 +392,7 @@ na_pivot_new( void )
 
 	g_debug( "%s", thisfn );
 
-	pivot = g_object_new( NA_PIVOT_TYPE, NULL );
+	pivot = g_object_new( NA_TYPE_PIVOT, NULL );
 
 	return( pivot );
 }
diff --git a/src/core/na-pivot.h b/src/core/na-pivot.h
index 5608e60..ce08bea 100644
--- a/src/core/na-pivot.h
+++ b/src/core/na-pivot.h
@@ -80,12 +80,12 @@
 
 G_BEGIN_DECLS
 
-#define NA_PIVOT_TYPE                ( na_pivot_get_type())
-#define NA_PIVOT( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_PIVOT_TYPE, NAPivot ))
-#define NA_PIVOT_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_PIVOT_TYPE, NAPivotClass ))
-#define NA_IS_PIVOT( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_PIVOT_TYPE ))
-#define NA_IS_PIVOT_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_PIVOT_TYPE ))
-#define NA_PIVOT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_PIVOT_TYPE, NAPivotClass ))
+#define NA_TYPE_PIVOT                ( na_pivot_get_type())
+#define NA_PIVOT( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_PIVOT, NAPivot ))
+#define NA_PIVOT_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_PIVOT, NAPivotClass ))
+#define NA_IS_PIVOT( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_PIVOT ))
+#define NA_IS_PIVOT_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_PIVOT ))
+#define NA_PIVOT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_PIVOT, NAPivotClass ))
 
 typedef struct _NAPivotPrivate       NAPivotPrivate;
 
diff --git a/src/core/na-selected-info.c b/src/core/na-selected-info.c
index 16f4a41..4dbdfc1 100644
--- a/src/core/na-selected-info.c
+++ b/src/core/na-selected-info.c
@@ -788,7 +788,7 @@ new_from_uri( const gchar *uri, const gchar *mimetype, gchar **errmsg )
 	GFile *location;
 	NAGnomeVFSURI *vfs;
 
-	NASelectedInfo *info = g_object_new( NA_SELECTED_INFO_TYPE, NULL );
+	NASelectedInfo *info = g_object_new( NA_TYPE_SELECTED_INFO, NULL );
 
 	info->private->uri = g_strdup( uri );
 	if( mimetype ){
diff --git a/src/core/na-selected-info.h b/src/core/na-selected-info.h
index 90f52fb..9056a7d 100644
--- a/src/core/na-selected-info.h
+++ b/src/core/na-selected-info.h
@@ -48,12 +48,12 @@
 
 G_BEGIN_DECLS
 
-#define NA_SELECTED_INFO_TYPE                ( na_selected_info_get_type())
-#define NA_SELECTED_INFO( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_SELECTED_INFO_TYPE, NASelectedInfo ))
-#define NA_SELECTED_INFO_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_SELECTED_INFO_TYPE, NASelectedInfoClass ))
-#define NA_IS_SELECTED_INFO( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_SELECTED_INFO_TYPE ))
-#define NA_IS_SELECTED_INFO_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_SELECTED_INFO_TYPE ))
-#define NA_SELECTED_INFO_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_SELECTED_INFO_TYPE, NASelectedInfoClass ))
+#define NA_TYPE_SELECTED_INFO                ( na_selected_info_get_type())
+#define NA_SELECTED_INFO( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_SELECTED_INFO, NASelectedInfo ))
+#define NA_SELECTED_INFO_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_SELECTED_INFO, NASelectedInfoClass ))
+#define NA_IS_SELECTED_INFO( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_SELECTED_INFO ))
+#define NA_IS_SELECTED_INFO_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_SELECTED_INFO ))
+#define NA_SELECTED_INFO_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_SELECTED_INFO, NASelectedInfoClass ))
 
 typedef struct _NASelectedInfoPrivate        NASelectedInfoPrivate;
 
diff --git a/src/core/na-tokens.c b/src/core/na-tokens.c
index df6e804..def7cac 100644
--- a/src/core/na-tokens.c
+++ b/src/core/na-tokens.c
@@ -260,7 +260,7 @@ na_tokens_new_for_example( void )
 	GSList *is;
 	gboolean first;
 
-	tokens = g_object_new( NA_TOKENS_TYPE, NULL );
+	tokens = g_object_new( NA_TYPE_TOKENS, NULL );
 	first = TRUE;
 	tokens->private->count = 2;
 
@@ -316,7 +316,7 @@ na_tokens_new_from_selection( GList *selection )
 	g_debug( "%s: selection=%p (count=%d)", thisfn, ( void * ) selection, g_list_length( selection ));
 
 	first = TRUE;
-	tokens = g_object_new( NA_TOKENS_TYPE, NULL );
+	tokens = g_object_new( NA_TYPE_TOKENS, NULL );
 
 	tokens->private->count = g_list_length( selection );
 
diff --git a/src/core/na-tokens.h b/src/core/na-tokens.h
index 48c59e6..4639b61 100644
--- a/src/core/na-tokens.h
+++ b/src/core/na-tokens.h
@@ -84,12 +84,12 @@
 
 G_BEGIN_DECLS
 
-#define NA_TOKENS_TYPE                ( na_tokens_get_type())
-#define NA_TOKENS( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TOKENS_TYPE, NATokens ))
-#define NA_TOKENS_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TOKENS_TYPE, NATokensClass ))
-#define NA_IS_TOKENS( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TOKENS_TYPE ))
-#define NA_IS_TOKENS_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TOKENS_TYPE ))
-#define NA_TOKENS_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TOKENS_TYPE, NATokensClass ))
+#define NA_TYPE_TOKENS                ( na_tokens_get_type())
+#define NA_TOKENS( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_TOKENS, NATokens ))
+#define NA_TOKENS_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_TOKENS, NATokensClass ))
+#define NA_IS_TOKENS( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_TOKENS ))
+#define NA_IS_TOKENS_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_TOKENS ))
+#define NA_TOKENS_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_TOKENS, NATokensClass ))
 
 typedef struct _NATokensPrivate       NATokensPrivate;
 
diff --git a/src/core/na-updater.c b/src/core/na-updater.c
index ccf3ad7..50d9b0d 100644
--- a/src/core/na-updater.c
+++ b/src/core/na-updater.c
@@ -98,7 +98,7 @@ register_type( void )
 
 	g_debug( "%s", thisfn );
 
-	type = g_type_register_static( NA_PIVOT_TYPE, "NAUpdater", &info, 0 );
+	type = g_type_register_static( NA_TYPE_PIVOT, "NAUpdater", &info, 0 );
 
 	return( type );
 }
@@ -194,7 +194,7 @@ na_updater_new( void )
 
 	g_debug( "%s", thisfn );
 
-	updater = g_object_new( NA_UPDATER_TYPE, NULL );
+	updater = g_object_new( NA_TYPE_UPDATER, NULL );
 
 	updater->private->are_preferences_locked = are_preferences_locked( updater );
 	updater->private->is_level_zero_writable = is_level_zero_writable( updater );
diff --git a/src/core/na-updater.h b/src/core/na-updater.h
index 0ea9950..00008bb 100644
--- a/src/core/na-updater.h
+++ b/src/core/na-updater.h
@@ -43,12 +43,12 @@
 
 G_BEGIN_DECLS
 
-#define NA_UPDATER_TYPE                ( na_updater_get_type())
-#define NA_UPDATER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_UPDATER_TYPE, NAUpdater ))
-#define NA_UPDATER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_UPDATER_TYPE, NAUpdaterClass ))
-#define NA_IS_UPDATER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_UPDATER_TYPE ))
-#define NA_IS_UPDATER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_UPDATER_TYPE ))
-#define NA_UPDATER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_UPDATER_TYPE, NAUpdaterClass ))
+#define NA_TYPE_UPDATER                ( na_updater_get_type())
+#define NA_UPDATER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_UPDATER, NAUpdater ))
+#define NA_UPDATER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_UPDATER, NAUpdaterClass ))
+#define NA_IS_UPDATER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_UPDATER ))
+#define NA_IS_UPDATER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_UPDATER ))
+#define NA_UPDATER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_UPDATER, NAUpdaterClass ))
 
 typedef struct _NAUpdaterPrivate       NAUpdaterPrivate;
 
diff --git a/src/test/test-module.c b/src/test/test-module.c
index 63d3bc0..c1c8d2e 100755
--- a/src/test/test-module.c
+++ b/src/test/test-module.c
@@ -165,12 +165,12 @@ unload_plugin( GModule *module )
  * in the same process).
  */
 
-#define NA_MODULE_TYPE                  ( na_module_get_type())
-#define NA_MODULE( object )             ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_MODULE_TYPE, NAModule ))
-#define NA_MODULE_CLASS( klass )        ( G_TYPE_CHECK_CLASS_CAST( klass, NA_MODULE_TYPE, NAModuleClass ))
-#define NA_IS_MODULE( object )          ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_MODULE_TYPE ))
-#define NA_IS_MODULE_CLASS( klass )     ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_MODULE_TYPE ))
-#define NA_MODULE_GET_CLASS( object )   ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_MODULE_TYPE, NAModuleClass ))
+#define NA_TYPE_MODULE                  ( na_module_get_type())
+#define NA_MODULE( object )             ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_TYPE_MODULE, NAModule ))
+#define NA_MODULE_CLASS( klass )        ( G_TYPE_CHECK_CLASS_CAST( klass, NA_TYPE_MODULE, NAModuleClass ))
+#define NA_IS_MODULE( object )          ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_TYPE_MODULE ))
+#define NA_IS_MODULE_CLASS( klass )     ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_TYPE_MODULE ))
+#define NA_MODULE_GET_CLASS( object )   ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_TYPE_MODULE, NAModuleClass ))
 
 typedef struct _NAModulePrivate         NAModulePrivate;
 typedef struct _NAModuleClassPrivate    NAModuleClassPrivate;
@@ -384,7 +384,7 @@ load_plugin( void )
 
 	if( g_module_supported()){
 
-		module = g_object_new( NA_MODULE_TYPE, NULL );
+		module = g_object_new( NA_TYPE_MODULE, NULL );
 		g_debug( "test_module_load_plugin: module=%p", ( void * ) module );
 
 		if( !g_type_module_use( G_TYPE_MODULE( module ))){
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]