GNOME.org
 

[nautilus-actions] Cosmetic changes in src/core headers

commit 320591f96fc261e6bde400d733072fc9f88f8100
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Jan 20 19:24:21 2011 +0100

    Cosmetic changes in src/core headers
    
    + src/core/na-export-format.h
    + src/core/na-iabout.h
    + src/core/na-importer-ask.h
    + src/core/na-io-provider.h
    + src/core/na-ipivot-consumer.h
    + src/core/na-module.h
    + src/core/na-pivot.h
    + src/core/na-selected-info.h
    + src/core/na-settings.h
    + src/core/na-tokens.h
    + src/core/na-updater.h

 ChangeLog                     |   14 +++++++++++++-
 src/core/na-export-format.h   |   16 ++++++++--------
 src/core/na-iabout.h          |   13 ++++++-------
 src/core/na-importer-ask.h    |   17 +++++++++--------
 src/core/na-io-provider.h     |   17 +++++++++--------
 src/core/na-ipivot-consumer.h |   13 ++++++-------
 src/core/na-module.h          |   16 ++++++++--------
 src/core/na-pivot.h           |   16 ++++++++--------
 src/core/na-selected-info.h   |   16 ++++++++--------
 src/core/na-settings.h        |   17 +++++++++--------
 src/core/na-tokens.h          |   16 ++++++++--------
 src/core/na-updater.h         |   16 ++++++++--------
 12 files changed, 100 insertions(+), 87 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c82dd04..b2c49c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2011-01-20 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/na-export-format.h:
+	* src/core/na-iabout.h:
+	* src/core/na-importer-ask.h:
+	* src/core/na-io-provider.h:
+	* src/core/na-ipivot-consumer.h:
+	* src/core/na-module.h:
+	* src/core/na-pivot.h:
+	* src/core/na-selected-info.h:
+	* src/core/na-settings.h:
+	* src/core/na-tokens.h:
+	* src/core/na-updater.h: Cosmetic changes in src/core headers.
+
 	* src/api/na-data-boxed.h:
 	* src/api/na-data-types.h:
 	* src/api/na-gconf-monitor.h:
@@ -16,7 +28,7 @@
 	* src/api/na-object-item.h:
 	* src/api/na-object-menu.h:
 	* src/api/na-object-profile.h:
-	* src/core/na-data-boxed.c: Cosmetic changes in src/api.
+	* src/core/na-data-boxed.c: Cosmetic changes in src/api headers.
 
 	* src/utils/na-gconf2key.sh.in:
 	* tools/check-headers.sh:
diff --git a/src/core/na-export-format.h b/src/core/na-export-format.h
index 43e4f1e..257435c 100644
--- a/src/core/na-export-format.h
+++ b/src/core/na-export-format.h
@@ -40,14 +40,14 @@
 
 G_BEGIN_DECLS
 
-#define NA_EXPORT_FORMAT_TYPE                   ( na_export_format_get_type())
-#define NA_EXPORT_FORMAT( object )              ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_EXPORT_FORMAT_TYPE, NAExportFormat ))
-#define NA_EXPORT_FORMAT_CLASS( klass )         ( G_TYPE_CHECK_CLASS_CAST( klass, NA_EXPORT_FORMAT_TYPE, NAExportFormatClass ))
-#define NA_IS_EXPORT_FORMAT( object )           ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_EXPORT_FORMAT_TYPE ))
-#define NA_IS_EXPORT_FORMAT_CLASS( klass )      ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_EXPORT_FORMAT_TYPE ))
-#define NA_EXPORT_FORMAT_GET_CLASS( object )    ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_EXPORT_FORMAT_TYPE, NAExportFormatClass ))
+#define NA_EXPORT_FORMAT_TYPE                ( na_export_format_get_type())
+#define NA_EXPORT_FORMAT( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_EXPORT_FORMAT_TYPE, NAExportFormat ))
+#define NA_EXPORT_FORMAT_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_EXPORT_FORMAT_TYPE, NAExportFormatClass ))
+#define NA_IS_EXPORT_FORMAT( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_EXPORT_FORMAT_TYPE ))
+#define NA_IS_EXPORT_FORMAT_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_EXPORT_FORMAT_TYPE ))
+#define NA_EXPORT_FORMAT_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_EXPORT_FORMAT_TYPE, NAExportFormatClass ))
 
-typedef struct _NAExportFormatPrivate      NAExportFormatPrivate;
+typedef struct _NAExportFormatPrivate        NAExportFormatPrivate;
 
 typedef struct {
 	GObject                parent;
@@ -55,7 +55,7 @@ typedef struct {
 }
 	NAExportFormat;
 
-typedef struct _NAExportFormatClassPrivate NAExportFormatClassPrivate;
+typedef struct _NAExportFormatClassPrivate   NAExportFormatClassPrivate;
 
 typedef struct {
 	GObjectClass                parent;
diff --git a/src/core/na-iabout.h b/src/core/na-iabout.h
index db19f10..71b0ae1 100644
--- a/src/core/na-iabout.h
+++ b/src/core/na-iabout.h
@@ -44,14 +44,13 @@
 
 G_BEGIN_DECLS
 
-#define NA_IABOUT_TYPE                        ( na_iabout_get_type())
-#define NA_IABOUT( object )                   ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_IABOUT_TYPE, NAIAbout ))
-#define NA_IS_IABOUT( object )                ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_IABOUT_TYPE ))
-#define NA_IABOUT_GET_INTERFACE( instance )   ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IABOUT_TYPE, NAIAboutInterface ))
+#define NA_IABOUT_TYPE                      ( na_iabout_get_type())
+#define NA_IABOUT( object )                 ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_IABOUT_TYPE, NAIAbout ))
+#define NA_IS_IABOUT( object )              ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_IABOUT_TYPE ))
+#define NA_IABOUT_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IABOUT_TYPE, NAIAboutInterface ))
 
-typedef struct _NAIAbout                 NAIAbout;
-
-typedef struct _NAIAboutInterfacePrivate NAIAboutInterfacePrivate;
+typedef struct _NAIAbout                    NAIAbout;
+typedef struct _NAIAboutInterfacePrivate    NAIAboutInterfacePrivate;
 
 typedef struct {
 	/*< private >*/
diff --git a/src/core/na-importer-ask.h b/src/core/na-importer-ask.h
index cb26b76..ba6fac9 100644
--- a/src/core/na-importer-ask.h
+++ b/src/core/na-importer-ask.h
@@ -48,15 +48,14 @@
 
 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_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 ))
 
-typedef struct _NAImporterAskPrivate         NAImporterAskPrivate;
-typedef struct _NAImporterAskClassPrivate    NAImporterAskClassPrivate;
+typedef struct _NAImporterAskPrivate        NAImporterAskPrivate;
 
 typedef struct {
 	/*< private >*/
@@ -65,6 +64,8 @@ typedef struct {
 }
 	NAImporterAsk;
 
+typedef struct _NAImporterAskClassPrivate   NAImporterAskClassPrivate;
+
 typedef struct {
 	/*< private >*/
 	GtkDialogClass             parent;
diff --git a/src/core/na-io-provider.h b/src/core/na-io-provider.h
index 6ea69ce..cf48d8c 100644
--- a/src/core/na-io-provider.h
+++ b/src/core/na-io-provider.h
@@ -64,15 +64,14 @@
 
 G_BEGIN_DECLS
 
-#define NA_IO_PROVIDER_TYPE                 ( na_io_provider_get_type())
-#define NA_IO_PROVIDER( object )            ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_IO_PROVIDER_TYPE, NAIOProvider ))
-#define NA_IO_PROVIDER_CLASS( klass )       ( G_TYPE_CHECK_CLASS_CAST( klass, NA_IO_PROVIDER_TYPE, NAIOProviderClass ))
-#define NA_IS_IO_PROVIDER( object )         ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_IO_PROVIDER_TYPE ))
-#define NA_IS_IO_PROVIDER_CLASS( klass )    ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_IO_PROVIDER_TYPE ))
-#define NA_IO_PROVIDER_GET_CLASS( object )  ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_IO_PROVIDER_TYPE, NAIOProviderClass ))
+#define NA_IO_PROVIDER_TYPE                ( na_io_provider_get_type())
+#define NA_IO_PROVIDER( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_IO_PROVIDER_TYPE, NAIOProvider ))
+#define NA_IO_PROVIDER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_IO_PROVIDER_TYPE, NAIOProviderClass ))
+#define NA_IS_IO_PROVIDER( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_IO_PROVIDER_TYPE ))
+#define NA_IS_IO_PROVIDER_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_IO_PROVIDER_TYPE ))
+#define NA_IO_PROVIDER_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_IO_PROVIDER_TYPE, NAIOProviderClass ))
 
-typedef struct _NAIOProviderPrivate         NAIOProviderPrivate;
-typedef struct _NAIOProviderClassPrivate    NAIOProviderClassPrivate;
+typedef struct _NAIOProviderPrivate        NAIOProviderPrivate;
 
 typedef struct {
 	/*< private >*/
@@ -81,6 +80,8 @@ typedef struct {
 }
 	NAIOProvider;
 
+typedef struct _NAIOProviderClassPrivate   NAIOProviderClassPrivate;
+
 typedef struct {
 	/*< private >*/
 	GObjectClass              parent;
diff --git a/src/core/na-ipivot-consumer.h b/src/core/na-ipivot-consumer.h
index 75a232e..4235235 100644
--- a/src/core/na-ipivot-consumer.h
+++ b/src/core/na-ipivot-consumer.h
@@ -44,14 +44,13 @@
 
 G_BEGIN_DECLS
 
-#define NA_IPIVOT_CONSUMER_TYPE                        ( na_ipivot_consumer_get_type())
-#define NA_IPIVOT_CONSUMER( object )                   ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_IPIVOT_CONSUMER_TYPE, NAIPivotConsumer ))
-#define NA_IS_IPIVOT_CONSUMER( object )                ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_IPIVOT_CONSUMER_TYPE ))
-#define NA_IPIVOT_CONSUMER_GET_INTERFACE( instance )   ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IPIVOT_CONSUMER_TYPE, NAIPivotConsumerInterface ))
+#define NA_IPIVOT_CONSUMER_TYPE                      ( na_ipivot_consumer_get_type())
+#define NA_IPIVOT_CONSUMER( object )                 ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_IPIVOT_CONSUMER_TYPE, NAIPivotConsumer ))
+#define NA_IS_IPIVOT_CONSUMER( object )              ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_IPIVOT_CONSUMER_TYPE ))
+#define NA_IPIVOT_CONSUMER_GET_INTERFACE( instance ) ( G_TYPE_INSTANCE_GET_INTERFACE(( instance ), NA_IPIVOT_CONSUMER_TYPE, NAIPivotConsumerInterface ))
 
-typedef struct _NAIPivotConsumer                 NAIPivotConsumer;
-
-typedef struct _NAIPivotConsumerInterfacePrivate NAIPivotConsumerInterfacePrivate;
+typedef struct _NAIPivotConsumer                     NAIPivotConsumer;
+typedef struct _NAIPivotConsumerInterfacePrivate     NAIPivotConsumerInterfacePrivate;
 
 typedef struct {
 	/*< private >*/
diff --git a/src/core/na-module.h b/src/core/na-module.h
index 884d392..50648eb 100644
--- a/src/core/na-module.h
+++ b/src/core/na-module.h
@@ -68,14 +68,14 @@
 
 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_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 ))
 
-typedef struct _NAModulePrivate      NAModulePrivate;
+typedef struct _NAModulePrivate       NAModulePrivate;
 
 typedef struct {
 	/*< private >*/
@@ -84,7 +84,7 @@ typedef struct {
 }
 	NAModule;
 
-typedef struct _NAModuleClassPrivate NAModuleClassPrivate;
+typedef struct _NAModuleClassPrivate  NAModuleClassPrivate;
 
 typedef struct {
 	/*< private >*/
diff --git a/src/core/na-pivot.h b/src/core/na-pivot.h
index aa43b4a..39d2b48 100644
--- a/src/core/na-pivot.h
+++ b/src/core/na-pivot.h
@@ -87,14 +87,14 @@
 
 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_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 ))
 
-typedef struct _NAPivotPrivate      NAPivotPrivate;
+typedef struct _NAPivotPrivate       NAPivotPrivate;
 
 typedef struct {
 	/*< private >*/
@@ -103,7 +103,7 @@ typedef struct {
 }
 	NAPivot;
 
-typedef struct _NAPivotClassPrivate NAPivotClassPrivate;
+typedef struct _NAPivotClassPrivate  NAPivotClassPrivate;
 
 typedef struct {
 	/*< private >*/
diff --git a/src/core/na-selected-info.h b/src/core/na-selected-info.h
index 06c1790..558b342 100644
--- a/src/core/na-selected-info.h
+++ b/src/core/na-selected-info.h
@@ -48,14 +48,14 @@
 
 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_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 ))
 
-typedef struct _NASelectedInfoPrivate      NASelectedInfoPrivate;
+typedef struct _NASelectedInfoPrivate        NASelectedInfoPrivate;
 
 typedef struct {
 	/*< private >*/
@@ -64,7 +64,7 @@ typedef struct {
 }
 	NASelectedInfo;
 
-typedef struct _NASelectedInfoClassPrivate NASelectedInfoClassPrivate;
+typedef struct _NASelectedInfoClassPrivate   NASelectedInfoClassPrivate;
 
 typedef struct {
 	/*< private >*/
diff --git a/src/core/na-settings.h b/src/core/na-settings.h
index ac0fe1b..96b66d9 100644
--- a/src/core/na-settings.h
+++ b/src/core/na-settings.h
@@ -55,15 +55,14 @@
 
 G_BEGIN_DECLS
 
-#define NA_SETTINGS_TYPE                  ( na_settings_get_type())
-#define NA_SETTINGS( object )             ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_SETTINGS_TYPE, NASettings ))
-#define NA_SETTINGS_CLASS( klass )        ( G_TYPE_CHECK_CLASS_CAST( klass, NA_SETTINGS_TYPE, NASettingsClass ))
-#define NA_IS_SETTINGS( object )          ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_SETTINGS_TYPE ))
-#define NA_IS_SETTINGS_CLASS( klass )     ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_SETTINGS_TYPE ))
-#define NA_SETTINGS_GET_CLASS( object )   ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_SETTINGS_TYPE, NASettingsClass ))
+#define NA_SETTINGS_TYPE                ( na_settings_get_type())
+#define NA_SETTINGS( object )           ( G_TYPE_CHECK_INSTANCE_CAST( object, NA_SETTINGS_TYPE, NASettings ))
+#define NA_SETTINGS_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( klass, NA_SETTINGS_TYPE, NASettingsClass ))
+#define NA_IS_SETTINGS( object )        ( G_TYPE_CHECK_INSTANCE_TYPE( object, NA_SETTINGS_TYPE ))
+#define NA_IS_SETTINGS_CLASS( klass )   ( G_TYPE_CHECK_CLASS_TYPE(( klass ), NA_SETTINGS_TYPE ))
+#define NA_SETTINGS_GET_CLASS( object ) ( G_TYPE_INSTANCE_GET_CLASS(( object ), NA_SETTINGS_TYPE, NASettingsClass ))
 
-typedef struct _NASettingsPrivate         NASettingsPrivate;
-typedef struct _NASettingsClassPrivate    NASettingsClassPrivate;
+typedef struct _NASettingsPrivate       NASettingsPrivate;
 
 typedef struct {
 	/*< private >*/
@@ -72,6 +71,8 @@ typedef struct {
 }
 	NASettings;
 
+typedef struct _NASettingsClassPrivate  NASettingsClassPrivate;
+
 typedef struct {
 	/*< private >*/
 	GObjectClass            parent;
diff --git a/src/core/na-tokens.h b/src/core/na-tokens.h
index 8ba29ce..90f6015 100644
--- a/src/core/na-tokens.h
+++ b/src/core/na-tokens.h
@@ -84,14 +84,14 @@
 
 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_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 ))
 
-typedef struct _NATokensPrivate      NATokensPrivate;
+typedef struct _NATokensPrivate       NATokensPrivate;
 
 typedef struct {
 	/*< private >*/
@@ -100,7 +100,7 @@ typedef struct {
 }
 	NATokens;
 
-typedef struct _NATokensClassPrivate NATokensClassPrivate;
+typedef struct _NATokensClassPrivate  NATokensClassPrivate;
 
 typedef struct {
 	/*< private >*/
diff --git a/src/core/na-updater.h b/src/core/na-updater.h
index c48b475..b61b6db 100644
--- a/src/core/na-updater.h
+++ b/src/core/na-updater.h
@@ -43,14 +43,14 @@
 
 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_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 ))
 
-typedef struct _NAUpdaterPrivate      NAUpdaterPrivate;
+typedef struct _NAUpdaterPrivate       NAUpdaterPrivate;
 
 typedef struct {
 	/*< private >*/
@@ -59,7 +59,7 @@ typedef struct {
 }
 	NAUpdater;
 
-typedef struct _NAUpdaterClassPrivate NAUpdaterClassPrivate;
+typedef struct _NAUpdaterClassPrivate  NAUpdaterClassPrivate;
 
 typedef struct {
 	/*< private >*/
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]