GNOME.org
 

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

commit a5aad6a53afcf7b911822ec3f900c91a6f2529d1
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jan 13 11:17:13 2012 +0100

    NADP: rename GType macros according to GObject usages

 ChangeLog                              |   15 +++++++++++++++
 src/api/na-extension.h                 |    4 ++--
 src/io-desktop/nadp-desktop-file.c     |    4 ++--
 src/io-desktop/nadp-desktop-file.h     |   12 ++++++------
 src/io-desktop/nadp-desktop-provider.h |   12 ++++++------
 src/io-desktop/nadp-module.c           |    2 +-
 src/io-desktop/nadp-monitor.c          |    2 +-
 src/io-desktop/nadp-monitor.h          |   12 ++++++------
 src/io-desktop/nadp-xdg-dirs.h         |    4 ++--
 9 files changed, 41 insertions(+), 26 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dcdc569..02af3fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2012-01-13 Pierre Wieser <pwieser trychlos org>
 
+	* src/io-desktop/nadp-desktop-file.c:
+	* src/io-desktop/nadp-desktop-file.h:
+	NADP_DESKTOP_FILE_TYPE GType macro renamed as NADP_TYPE_DESKTOP_FILE.
+
+	* src/io-desktop/nadp-desktop-provider.h:
+	* src/api/na-extension.h:
+	* src/io-desktop/nadp-module.c:
+	NADP_DESKTOP_PROVIDER_TYPE GType macro renamed as NADP_TYPE_DESKTOP_PROVIDER.
+
+	* src/io-desktop/nadp-monitor.c:
+	* src/io-desktop/nadp-monitor.h:
+	NADP_MONITOR_TYPE GType macro renamed as NADP_TYPE_MONITOR.
+
+	* src/io-desktop/nadp-xdg-dirs.h: Fix documentation.
+
 	* src/core/na-import-mode.c:
 	* src/core/na-import-mode.h:
 	NA_IMPORT_MODE_TYPE GType macro renamed as NA_TYPE_IMPORT_MODE.
diff --git a/src/api/na-extension.h b/src/api/na-extension.h
index 0d489b9..040a397 100644
--- a/src/api/na-extension.h
+++ b/src/api/na-extension.h
@@ -253,10 +253,10 @@ guint    na_extension_get_version( void );
  *     {
  *          static GType types_list [1+NADP_TYPES_COUNT];
  *
- *          &lcomment; NADP_DESKTOP_PROVIDER_TYPE has been previously
+ *          &lcomment; NADP_TYPE_DESKTOP_PROVIDER has been previously
  *           * registered in na_extension_startup function
  *           &rcomment;
- *          types_list[0] = NADP_DESKTOP_PROVIDER_TYPE;
+ *          types_list[0] = NADP_TYPE_DESKTOP_PROVIDER;
  *
  *          types_list[NADP_TYPES_COUNT] = 0;
  *          *types = types_list;
diff --git a/src/io-desktop/nadp-desktop-file.c b/src/io-desktop/nadp-desktop-file.c
index a0d5c2d..923b36c 100644
--- a/src/io-desktop/nadp-desktop-file.c
+++ b/src/io-desktop/nadp-desktop-file.c
@@ -203,7 +203,7 @@ nadp_desktop_file_new( void )
 {
 	NadpDesktopFile *ndf;
 
-	ndf = g_object_new( NADP_DESKTOP_FILE_TYPE, NULL );
+	ndf = g_object_new( NADP_TYPE_DESKTOP_FILE, NULL );
 
 	return( ndf );
 }
@@ -402,7 +402,7 @@ ndf_new( const gchar *uri )
 {
 	NadpDesktopFile *ndf;
 
-	ndf = g_object_new( NADP_DESKTOP_FILE_TYPE, NULL );
+	ndf = g_object_new( NADP_TYPE_DESKTOP_FILE, NULL );
 
 	ndf->private->id = uri2id( uri );
 	ndf->private->uri = g_strdup( uri );
diff --git a/src/io-desktop/nadp-desktop-file.h b/src/io-desktop/nadp-desktop-file.h
index 705bf35..8a46f70 100644
--- a/src/io-desktop/nadp-desktop-file.h
+++ b/src/io-desktop/nadp-desktop-file.h
@@ -45,12 +45,12 @@
 
 G_BEGIN_DECLS
 
-#define NADP_DESKTOP_FILE_TYPE                ( nadp_desktop_file_get_type())
-#define NADP_DESKTOP_FILE( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_DESKTOP_FILE_TYPE, NadpDesktopFile ))
-#define NADP_DESKTOP_FILE_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NADP_DESKTOP_FILE_TYPE, NadpDesktopFileClass ))
-#define NADP_IS_DESKTOP_FILE( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_DESKTOP_FILE_TYPE ))
-#define NADP_IS_DESKTOP_FILE_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_DESKTOP_FILE_TYPE ))
-#define NADP_DESKTOP_FILE_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_DESKTOP_FILE_TYPE, NadpDesktopFileClass ))
+#define NADP_TYPE_DESKTOP_FILE                ( nadp_desktop_file_get_type())
+#define NADP_DESKTOP_FILE( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_TYPE_DESKTOP_FILE, NadpDesktopFile ))
+#define NADP_DESKTOP_FILE_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NADP_TYPE_DESKTOP_FILE, NadpDesktopFileClass ))
+#define NADP_IS_DESKTOP_FILE( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_TYPE_DESKTOP_FILE ))
+#define NADP_IS_DESKTOP_FILE_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_TYPE_DESKTOP_FILE ))
+#define NADP_DESKTOP_FILE_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_TYPE_DESKTOP_FILE, NadpDesktopFileClass ))
 
 typedef struct _NadpDesktopFilePrivate        NadpDesktopFilePrivate;
 
diff --git a/src/io-desktop/nadp-desktop-provider.h b/src/io-desktop/nadp-desktop-provider.h
index abf0843..411282f 100644
--- a/src/io-desktop/nadp-desktop-provider.h
+++ b/src/io-desktop/nadp-desktop-provider.h
@@ -48,12 +48,12 @@
 
 G_BEGIN_DECLS
 
-#define NADP_DESKTOP_PROVIDER_TYPE                ( nadp_desktop_provider_get_type())
-#define NADP_DESKTOP_PROVIDER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_DESKTOP_PROVIDER_TYPE, NadpDesktopProvider ))
-#define NADP_DESKTOP_PROVIDER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NADP_DESKTOP_PROVIDER_TYPE, NadpDesktopProviderClass ))
-#define NADP_IS_DESKTOP_PROVIDER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_DESKTOP_PROVIDER_TYPE ))
-#define NADP_IS_DESKTOP_PROVIDER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_DESKTOP_PROVIDER_TYPE ))
-#define NADP_DESKTOP_PROVIDER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_DESKTOP_PROVIDER_TYPE, NadpDesktopProviderClass ))
+#define NADP_TYPE_DESKTOP_PROVIDER                ( nadp_desktop_provider_get_type())
+#define NADP_DESKTOP_PROVIDER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_TYPE_DESKTOP_PROVIDER, NadpDesktopProvider ))
+#define NADP_DESKTOP_PROVIDER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NADP_TYPE_DESKTOP_PROVIDER, NadpDesktopProviderClass ))
+#define NADP_IS_DESKTOP_PROVIDER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_TYPE_DESKTOP_PROVIDER ))
+#define NADP_IS_DESKTOP_PROVIDER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_TYPE_DESKTOP_PROVIDER ))
+#define NADP_DESKTOP_PROVIDER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_TYPE_DESKTOP_PROVIDER, NadpDesktopProviderClass ))
 
 /* private instance data
  */
diff --git a/src/io-desktop/nadp-module.c b/src/io-desktop/nadp-module.c
index 812a26c..378299f 100644
--- a/src/io-desktop/nadp-module.c
+++ b/src/io-desktop/nadp-module.c
@@ -91,7 +91,7 @@ na_extension_list_types( const GType **types )
 
 	g_debug( "%s: types=%p", thisfn, ( void * ) types );
 
-	types_list[0] = NADP_DESKTOP_PROVIDER_TYPE;
+	types_list[0] = NADP_TYPE_DESKTOP_PROVIDER;
 
 	types_list[NADP_TYPES_COUNT] = 0;
 	*types = types_list;
diff --git a/src/io-desktop/nadp-monitor.c b/src/io-desktop/nadp-monitor.c
index 66ba7eb..0e29b3c 100644
--- a/src/io-desktop/nadp-monitor.c
+++ b/src/io-desktop/nadp-monitor.c
@@ -209,7 +209,7 @@ nadp_monitor_new( const NadpDesktopProvider *provider, const gchar *path )
 	GFileMonitorFlags flags;
 	GError *error;
 
-	monitor = g_object_new( NADP_MONITOR_TYPE, NULL );
+	monitor = g_object_new( NADP_TYPE_MONITOR, NULL );
 
 	monitor->private->provider = NADP_DESKTOP_PROVIDER( provider );
 	monitor->private->name = g_strdup( path );
diff --git a/src/io-desktop/nadp-monitor.h b/src/io-desktop/nadp-monitor.h
index 03af230..80e73ab 100644
--- a/src/io-desktop/nadp-monitor.h
+++ b/src/io-desktop/nadp-monitor.h
@@ -51,12 +51,12 @@
 
 G_BEGIN_DECLS
 
-#define NADP_MONITOR_TYPE                ( nadp_monitor_get_type())
-#define NADP_MONITOR( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_MONITOR_TYPE, NadpMonitor ))
-#define NADP_MONITOR_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NADP_MONITOR_TYPE, NadpMonitorClass ))
-#define NADP_IS_MONITOR( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_MONITOR_TYPE ))
-#define NADP_IS_MONITOR_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_MONITOR_TYPE ))
-#define NADP_MONITOR_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_MONITOR_TYPE, NadpMonitorClass ))
+#define NADP_TYPE_MONITOR                ( nadp_monitor_get_type())
+#define NADP_MONITOR( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NADP_TYPE_MONITOR, NadpMonitor ))
+#define NADP_MONITOR_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NADP_TYPE_MONITOR, NadpMonitorClass ))
+#define NADP_IS_MONITOR( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NADP_TYPE_MONITOR ))
+#define NADP_IS_MONITOR_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NADP_TYPE_MONITOR ))
+#define NADP_MONITOR_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NADP_TYPE_MONITOR, NadpMonitorClass ))
 
 typedef struct _NadpMonitorPrivate       NadpMonitorPrivate;
 
diff --git a/src/io-desktop/nadp-xdg-dirs.h b/src/io-desktop/nadp-xdg-dirs.h
index 72d6b1f..f10d7bd 100644
--- a/src/io-desktop/nadp-xdg-dirs.h
+++ b/src/io-desktop/nadp-xdg-dirs.h
@@ -35,9 +35,9 @@
 
 G_BEGIN_DECLS
 
-GSList *nadp_xdg_dirs_get_data_dirs( void );
+GSList *nadp_xdg_dirs_get_data_dirs       ( void );
 
-gchar  *nadp_xdg_dirs_get_user_data_dir( void );
+gchar  *nadp_xdg_dirs_get_user_data_dir   ( void );
 
 GSList *nadp_xdg_dirs_get_system_data_dirs( void );
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]